From 2c0b09a9ad6b31bebd1ce51dbc2a1760adfdb3c4 Mon Sep 17 00:00:00 2001 From: PrefacedCorg <1876568293@qq.com> Date: Fri, 1 May 2026 00:36:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(UI):=20=E7=BB=9F=E4=B8=80=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2=E6=BB=91=E5=9D=97?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E5=B8=83=E5=B1=80=E5=92=8C=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 调整多个设置页面的滑块控件布局,统一使用SimpleStackPanel水平排列滑块和数值显示文本,增加数值显示的Consolas字体样式,并统一滑块宽度为200像素 --- .../SettingsViews/Pages/AdvancedPage.xaml | 44 ++++++---- .../SettingsViews/Pages/AppearancePage.xaml | 12 +-- .../SettingsViews/Pages/CanvasPage.xaml | 28 +++---- .../Pages/InkRecognitionPage.xaml | 24 +++--- .../SettingsViews/Pages/PowerPointPage.xaml | 48 +++++++++-- .../SettingsViews/Pages/RandomDrawPage.xaml | 84 ++++++++++++------- 6 files changed, 154 insertions(+), 86 deletions(-) diff --git a/Ink Canvas/Windows/SettingsViews/Pages/AdvancedPage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/AdvancedPage.xaml index d031cce9..c6a73cb8 100644 --- a/Ink Canvas/Windows/SettingsViews/Pages/AdvancedPage.xaml +++ b/Ink Canvas/Windows/SettingsViews/Pages/AdvancedPage.xaml @@ -51,12 +51,16 @@ - + + + + @@ -81,19 +85,27 @@ Toggled="ToggleSwitchEraserBindTouchMultiplier_Toggled"/> - + + + + - + + + + @@ -140,7 +140,7 @@ @@ -153,13 +153,13 @@ + - @@ -177,7 +177,7 @@ diff --git a/Ink Canvas/Windows/SettingsViews/Pages/CanvasPage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/CanvasPage.xaml index ad7daee9..18999ddf 100644 --- a/Ink Canvas/Windows/SettingsViews/Pages/CanvasPage.xaml +++ b/Ink Canvas/Windows/SettingsViews/Pages/CanvasPage.xaml @@ -146,12 +146,12 @@ Toggled="ToggleSwitchEnableInkFade_Toggled" /> - - + + - @@ -195,21 +195,21 @@ - + + - - + + - @@ -229,12 +229,12 @@ - - + + - diff --git a/Ink Canvas/Windows/SettingsViews/Pages/InkRecognitionPage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/InkRecognitionPage.xaml index ba137b31..e93eba09 100644 --- a/Ink Canvas/Windows/SettingsViews/Pages/InkRecognitionPage.xaml +++ b/Ink Canvas/Windows/SettingsViews/Pages/InkRecognitionPage.xaml @@ -112,21 +112,21 @@ Toggled="ToggleSwitchAutoStraightenLine_Toggled" /> - - + + - - - + + - - - + + - diff --git a/Ink Canvas/Windows/SettingsViews/Pages/PowerPointPage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/PowerPointPage.xaml index 14a763a5..5c975dab 100644 --- a/Ink Canvas/Windows/SettingsViews/Pages/PowerPointPage.xaml +++ b/Ink Canvas/Windows/SettingsViews/Pages/PowerPointPage.xaml @@ -82,10 +82,18 @@ - + + + + - + + + + @@ -101,10 +109,18 @@ - + + + + - + + + + @@ -120,10 +136,18 @@ - + + + + - + + + + @@ -139,10 +163,18 @@ - + + + + - + + + + diff --git a/Ink Canvas/Windows/SettingsViews/Pages/RandomDrawPage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/RandomDrawPage.xaml index c145d223..f33a83b9 100644 --- a/Ink Canvas/Windows/SettingsViews/Pages/RandomDrawPage.xaml +++ b/Ink Canvas/Windows/SettingsViews/Pages/RandomDrawPage.xaml @@ -64,19 +64,27 @@ - + + + + - + + + + - + + + + - + + + + - + + + + @@ -172,11 +192,15 @@ Toggled="ToggleSwitchEnableProgressiveReminder_Toggled"/> - + + + + From 1cb77b4f48ddd0a4c24e8b4c6af7338f2e9b12cd Mon Sep 17 00:00:00 2001 From: PrefacedCorg <1876568293@qq.com> Date: Fri, 1 May 2026 00:47:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor(=E8=AE=BE=E7=BD=AE=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2):=20=E7=A7=BB=E9=99=A4=E7=8B=AC=E7=AB=8B=E7=9A=84?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2=E5=B9=B6?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=88=B0=E8=B0=83=E8=AF=95=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将图标设置功能从独立的 IconographyPage 迁移到 DebugPage 中,简化页面结构 删除不再使用的 IconographyPage.xaml 和 IconographyPage.xaml.cs 文件 --- .../SettingsViews/Pages/DebugPage.xaml | 25 ++++++++++- .../SettingsViews/Pages/IconographyPage.xaml | 41 ------------------- .../Pages/IconographyPage.xaml.cs | 10 ----- 3 files changed, 24 insertions(+), 52 deletions(-) delete mode 100644 Ink Canvas/Windows/SettingsViews/Pages/IconographyPage.xaml delete mode 100644 Ink Canvas/Windows/SettingsViews/Pages/IconographyPage.xaml.cs diff --git a/Ink Canvas/Windows/SettingsViews/Pages/DebugPage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/DebugPage.xaml index 22ee9807..92319451 100644 --- a/Ink Canvas/Windows/SettingsViews/Pages/DebugPage.xaml +++ b/Ink Canvas/Windows/SettingsViews/Pages/DebugPage.xaml @@ -33,10 +33,33 @@ + + + + + + + + + + + + + + + 0 + + + + diff --git a/Ink Canvas/Windows/SettingsViews/Pages/IconographyPage.xaml b/Ink Canvas/Windows/SettingsViews/Pages/IconographyPage.xaml deleted file mode 100644 index 6c243eb0..00000000 --- a/Ink Canvas/Windows/SettingsViews/Pages/IconographyPage.xaml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - 0 - - - - - - - \ No newline at end of file diff --git a/Ink Canvas/Windows/SettingsViews/Pages/IconographyPage.xaml.cs b/Ink Canvas/Windows/SettingsViews/Pages/IconographyPage.xaml.cs deleted file mode 100644 index 49a015df..00000000 --- a/Ink Canvas/Windows/SettingsViews/Pages/IconographyPage.xaml.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Ink_Canvas.Windows.SettingsViews.Pages -{ - public partial class IconographyPage : iNKORE.UI.WPF.Modern.Controls.Page - { - public IconographyPage() - { - InitializeComponent(); - } - } -} \ No newline at end of file