From 6659db651d7ec0ad6116de3e73cc979dd960e746 Mon Sep 17 00:00:00 2001 From: CJKmkp <2564608840@qq.com> Date: Sat, 18 Apr 2026 16:50:44 +0800 Subject: [PATCH] =?UTF-8?q?add:=E7=A6=81=E7=94=A8=E7=A1=AC=E4=BB=B6?= =?UTF-8?q?=E5=8A=A0=E9=80=9F=20&=20improve:UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/MainWindow.xaml | 9 ++++ Ink Canvas/MainWindow_cs/MW_Settings.cs | 49 ++----------------- Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs | 17 +------ Ink Canvas/Properties/Strings.en-US.resx | 12 +++++ Ink Canvas/Properties/Strings.resx | 12 +++++ 5 files changed, 39 insertions(+), 60 deletions(-) diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml index cf129f5f..56644230 100644 --- a/Ink Canvas/MainWindow.xaml +++ b/Ink Canvas/MainWindow.xaml @@ -803,6 +803,15 @@ FontSize="26" /> + + + + + + diff --git a/Ink Canvas/MainWindow_cs/MW_Settings.cs b/Ink Canvas/MainWindow_cs/MW_Settings.cs index acacfedc..82411fee 100644 --- a/Ink Canvas/MainWindow_cs/MW_Settings.cs +++ b/Ink Canvas/MainWindow_cs/MW_Settings.cs @@ -3331,55 +3331,16 @@ namespace Ink_Canvas SaveSettingsToFile(); } - // 注释掉这些方法，因为对应的UI控件还没有在XAML中定义 - /* - private void ToggleSwitchAsyncInkSmoothing_Toggled(object sender, RoutedEventArgs e) { + private void ToggleSwitchDisableHardwareAcceleration_Toggled(object sender, RoutedEventArgs e) + { if (!isLoaded) return; - Settings.Canvas.UseAsyncInkSmoothing = ToggleSwitchAsyncInkSmoothing.IsOn; + + Settings.Canvas.UseHardwareAcceleration = !ToggleSwitchDisableHardwareAcceleration.IsOn; + _inkSmoothingManager?.UpdateConfig(); SaveSettingsToFile(); } - private void ToggleSwitchHardwareAcceleration_Toggled(object sender, RoutedEventArgs e) { - if (!isLoaded) return; - Settings.Canvas.UseHardwareAcceleration = ToggleSwitchHardwareAcceleration.IsOn; - _inkSmoothingManager?.UpdateConfig(); - SaveSettingsToFile(); - } - - private void ComboBoxInkSmoothingQuality_SelectionChanged(object sender, SelectionChangedEventArgs e) { - if (!isLoaded) return; - Settings.Canvas.InkSmoothingQuality = ComboBoxInkSmoothingQuality.SelectedIndex; - _inkSmoothingManager?.UpdateConfig(); - SaveSettingsToFile(); - } - - private void SliderMaxConcurrentTasks_ValueChanged(object sender, RoutedPropertyChangedEventArgs e) { - if (!isLoaded) return; - Settings.Canvas.MaxConcurrentSmoothingTasks = (int)SliderMaxConcurrentTasks.Value; - _inkSmoothingManager?.UpdateConfig(); - SaveSettingsToFile(); - } - - private void ButtonApplyRecommendedSettings_Click(object sender, RoutedEventArgs e) { - // 应用推荐的性能设置 - Helpers.InkSmoothingManager.ApplyRecommendedSettings(); - LoadSettings(false); - _inkSmoothingManager?.UpdateConfig(); - SaveSettingsToFile(); - - ShowNotification("已应用推荐的性能设置"); - } - - private void ButtonShowPerformanceStats_Click(object sender, RoutedEventArgs e) { - if (_inkSmoothingManager != null) - { - var stats = _inkSmoothingManager.GetPerformanceStats(); - ShowNotification($"性能统计: {stats}"); - } - } - */ - private void ToggleSwitchAutoSaveStrokesInPowerPoint_Toggled(object sender, RoutedEventArgs e) { if (!isLoaded) return; diff --git a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs index 9fbca2bc..4fa98b2e 100644 --- a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs +++ b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs @@ -954,22 +954,7 @@ namespace Ink_Canvas drawingAttributes.FitToCurve = false; } - // 注释掉新的墨迹平滑性能设置，因为UI控件还没有定义 - /* - // 初始化新的墨迹平滑性能设置 - ToggleSwitchAsyncInkSmoothing.IsOn = Settings.Canvas.UseAsyncInkSmoothing; - ToggleSwitchHardwareAcceleration.IsOn = Settings.Canvas.UseHardwareAcceleration; - ComboBoxInkSmoothingQuality.SelectedIndex = Settings.Canvas.InkSmoothingQuality; - SliderMaxConcurrentTasks.Value = Settings.Canvas.MaxConcurrentSmoothingTasks > 0 ? - Settings.Canvas.MaxConcurrentSmoothingTasks : Environment.ProcessorCount; - - // 检查硬件加速支持 - if (!Helpers.InkSmoothingManager.IsHardwareAccelerationSupported()) - { - ToggleSwitchHardwareAcceleration.IsEnabled = false; - // 可以添加提示文本说明硬件加速不可用 - } - */ + ToggleSwitchDisableHardwareAcceleration.IsOn = !Settings.Canvas.UseHardwareAcceleration; // 初始化直线自动拉直相关设置 ToggleSwitchAutoStraightenLine.IsOn = Settings.Canvas.AutoStraightenLine; diff --git a/Ink Canvas/Properties/Strings.en-US.resx b/Ink Canvas/Properties/Strings.en-US.resx index 36ee52db..19b28751 100644 --- a/Ink Canvas/Properties/Strings.en-US.resx +++ b/Ink Canvas/Properties/Strings.en-US.resx @@ -528,6 +528,12 @@ Enable ink recognition + + Handwriting correction + + + # When enabled, strokes will be corrected to look smoother and neater (WinRT-based). + Block fake pressure on corrected rectangles @@ -957,6 +963,12 @@ Canvas and ink + + Disable hardware acceleration + + + # Improves compatibility but may reduce performance; some effects may require an app restart to fully apply. + Show pen cursor diff --git a/Ink Canvas/Properties/Strings.resx b/Ink Canvas/Properties/Strings.resx index 483d13e0..00aecd0a 100644 --- a/Ink Canvas/Properties/Strings.resx +++ b/Ink Canvas/Properties/Strings.resx @@ -549,6 +549,12 @@ 自动：64 位进程使用 WinRT（Windows 10+），32 位使用 IACore。可强制指定 IACore 或 WinRT。 + + 手写体纠正 + + + # 开启后，将对手写笔画进行更平滑、更工整的纠正处理（基于 WinRT）。 + 自动 @@ -999,6 +1005,12 @@ 画板和墨迹 + + 关闭硬件加速 + + + # 关闭后可提升兼容性，但可能降低性能；部分效果可能需要重启程序后完全生效。 + 显示画笔光标