From 245a29f797247c5e6768661f8db323ec6a50a0f1 Mon Sep 17 00:00:00 2001
From: PrefacedCorg <1876568293@qq.com>
Date: Sun, 19 Apr 2026 15:13:13 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=E8=BF=81=E7=A7=BB=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow.xaml                    |  2 +-
 Ink Canvas/Properties/Strings.en-US.resx      |  6 +++
 Ink Canvas/Properties/Strings.resx            |  6 +++
 .../SettingsViews/Pages/CanvasPage.xaml       | 22 +++++-----
 .../SettingsViews/Pages/CanvasPage.xaml.cs    | 40 ++++++++++---------
 5 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index b21a9a6c..b3ec97a1 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -26,7 +26,7 @@
         Closing="Window_Closing"
         Closed="Window_Closed"
         PreviewKeyDown="Main_Grid_PreviewKeyDown"
-        Height="16000" Width="1440"
+        Height="11080" Width="1440"
         FontFamily="Microsoft YaHei UI"
         MouseWheel="Window_MouseWheel"
         Foreground="{DynamicResource FloatBarForeground}"
diff --git a/Ink Canvas/Properties/Strings.en-US.resx b/Ink Canvas/Properties/Strings.en-US.resx
index e9b085ce..48f4b36c 100644
--- a/Ink Canvas/Properties/Strings.en-US.resx	
+++ b/Ink Canvas/Properties/Strings.en-US.resx	
@@ -1032,6 +1032,12 @@
   <data name="Canvas_AdvancedBezierSmoothing" xml:space="preserve">
     <value>Use advanced curve smoothing (recommended)</value>
   </data>
+  <data name="Canvas_CurveSmoothingMode" xml:space="preserve">
+    <value>Curve smoothing mode</value>
+  </data>
+  <data name="Canvas_CurveSmoothing_Off" xml:space="preserve">
+    <value>Off</value>
+  </data>
   <data name="Canvas_EnableInkFade" xml:space="preserve">
     <value>Enable ink fade</value>
   </data>
diff --git a/Ink Canvas/Properties/Strings.resx b/Ink Canvas/Properties/Strings.resx
index 60b4234f..5f3e61b3 100644
--- a/Ink Canvas/Properties/Strings.resx	
+++ b/Ink Canvas/Properties/Strings.resx	
@@ -1074,6 +1074,12 @@
   <data name="Canvas_AdvancedBezierSmoothing" xml:space="preserve">
     <value>使用高级曲线平滑（推荐）</value>
   </data>
+  <data name="Canvas_CurveSmoothingMode" xml:space="preserve">
+    <value>曲线平滑模式</value>
+  </data>
+  <data name="Canvas_CurveSmoothing_Off" xml:space="preserve">
+    <value>关闭</value>
+  </data>
   <data name="Canvas_EnableInkFade" xml:space="preserve">
     <value>启用墨迹渐隐功能</value>
   </data>
diff --git a/Ink Canvas/Windows/SettingsViews/Pages/CanvasPage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/CanvasPage.xaml
index a5360d41..7e746db2 100644
--- a/Ink Canvas/Windows/SettingsViews/Pages/CanvasPage.xaml	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/CanvasPage.xaml	
@@ -123,17 +123,17 @@
                             SwitchName="ToggleSwitchShowCircleCenter"
                             Toggled="ToggleSwitchShowCircleCenter_Toggled" />
 
-                    <controls:LabeledSettingsCard x:Name="CardFitToCurve"
-                            Header="{i18n:I18n Key=Canvas_WPFBezierSmoothing}"
-                            Icon="{x:Static ui:SegoeFluentIcons.InkingTool}"
-                            SwitchName="ToggleSwitchFitToCurve"
-                            Toggled="ToggleSwitchFitToCurve_Toggled" />
-
-                    <controls:LabeledSettingsCard x:Name="CardAdvancedBezierSmoothing"
-                            Header="{i18n:I18n Key=Canvas_AdvancedBezierSmoothing}"
-                            Icon="{x:Static ui:SegoeFluentIcons.InkingTool}"
-                            SwitchName="ToggleSwitchAdvancedBezierSmoothing"
-                            Toggled="ToggleSwitchAdvancedBezierSmoothing_Toggled" />
+                    <ui:SettingsCard Header="{i18n:I18n Key=Canvas_CurveSmoothingMode}">
+                        <ui:SettingsCard.HeaderIcon>
+                            <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.InkingTool}" />
+                        </ui:SettingsCard.HeaderIcon>
+                        <ComboBox x:Name="ComboBoxCurveSmoothingMode"
+                                  SelectionChanged="ComboBoxCurveSmoothingMode_SelectionChanged">
+                            <ComboBoxItem Content="{i18n:I18n Key=Canvas_AdvancedBezierSmoothing}" Tag="2" />
+                            <ComboBoxItem Content="{i18n:I18n Key=Canvas_WPFBezierSmoothing}" Tag="1" />
+                            <ComboBoxItem Content="{i18n:I18n Key=Canvas_CurveSmoothing_Off}" Tag="0" />
+                        </ComboBox>
+                    </ui:SettingsCard>
 
                     <controls:LabeledSettingsCard x:Name="CardEnableInkFade"
                             Header="{i18n:I18n Key=Canvas_EnableInkFade}"
diff --git a/Ink Canvas/Windows/SettingsViews/Pages/CanvasPage.xaml.cs b/Ink Canvas/Windows/SettingsViews/Pages/CanvasPage.xaml.cs
index 158cce8c..fa4e1be8 100644
--- a/Ink Canvas/Windows/SettingsViews/Pages/CanvasPage.xaml.cs	
+++ b/Ink Canvas/Windows/SettingsViews/Pages/CanvasPage.xaml.cs	
@@ -43,8 +43,10 @@ namespace Ink_Canvas.Windows.SettingsViews.Pages
                     CardLaunchSeewoVideoShowcaseForWhiteboardBooth.IsOn = settings.Canvas.LaunchSeewoVideoShowcaseForWhiteboardBooth;
                     ComboBoxHyperbolaAsymptoteOption.SelectedIndex = (int)settings.Canvas.HyperbolaAsymptoteOption;
                     CardShowCircleCenter.IsOn = settings.Canvas.ShowCircleCenter;
-                    CardFitToCurve.IsOn = settings.Canvas.FitToCurve;
-                    CardAdvancedBezierSmoothing.IsOn = settings.Canvas.UseAdvancedBezierSmoothing;
+                    int curveMode = 0;
+                    if (settings.Canvas.UseAdvancedBezierSmoothing) curveMode = 2;
+                    else if (settings.Canvas.FitToCurve) curveMode = 1;
+                    ComboBoxCurveSmoothingMode.SelectedIndex = curveMode;
                     CardEnableInkFade.IsOn = settings.Canvas.EnableInkFade;
                     InkFadeTimeSlider.Value = settings.Canvas.InkFadeTime;
                     CardHideInkFadeControlInPenMenu.IsOn = settings.Canvas.HideInkFadeControlInPenMenu;
@@ -195,26 +197,26 @@ namespace Ink_Canvas.Windows.SettingsViews.Pages
             SettingsManager.SaveSettingsToFile();
         }
 
-        private void ToggleSwitchFitToCurve_Toggled(object sender, RoutedEventArgs e)
+        private void ComboBoxCurveSmoothingMode_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (!_isLoaded) return;
-            SettingsManager.Settings.Canvas.FitToCurve = CardFitToCurve.IsOn;
-            if (CardFitToCurve.IsOn)
+            var item = ComboBoxCurveSmoothingMode?.SelectedItem as ComboBoxItem;
+            if (item == null) return;
+            var tag = item.Tag?.ToString() ?? "0";
+            switch (tag)
             {
-                SettingsManager.Settings.Canvas.UseAdvancedBezierSmoothing = false;
-                CardAdvancedBezierSmoothing.IsOn = false;
-            }
-            SettingsManager.SaveSettingsToFile();
-        }
-
-        private void ToggleSwitchAdvancedBezierSmoothing_Toggled(object sender, RoutedEventArgs e)
-        {
-            if (!_isLoaded) return;
-            SettingsManager.Settings.Canvas.UseAdvancedBezierSmoothing = CardAdvancedBezierSmoothing.IsOn;
-            if (CardAdvancedBezierSmoothing.IsOn)
-            {
-                SettingsManager.Settings.Canvas.FitToCurve = false;
-                CardFitToCurve.IsOn = false;
+                case "1":
+                    SettingsManager.Settings.Canvas.FitToCurve = true;
+                    SettingsManager.Settings.Canvas.UseAdvancedBezierSmoothing = false;
+                    break;
+                case "2":
+                    SettingsManager.Settings.Canvas.FitToCurve = false;
+                    SettingsManager.Settings.Canvas.UseAdvancedBezierSmoothing = true;
+                    break;
+                default:
+                    SettingsManager.Settings.Canvas.FitToCurve = false;
+                    SettingsManager.Settings.Canvas.UseAdvancedBezierSmoothing = false;
+                    break;
             }
             SettingsManager.SaveSettingsToFile();
         }