diff --git a/Ink Canvas/Helpers/FullScreenHelper.cs b/Ink Canvas/Helpers/FullScreenHelper.cs index a1dced48..35368d88 100644 --- a/Ink Canvas/Helpers/FullScreenHelper.cs +++ b/Ink Canvas/Helpers/FullScreenHelper.cs @@ -1,5 +1,4 @@ using System; -using System.Runtime.ExceptionServices; using System.Runtime.InteropServices; using System.Windows; using System.Windows.Interop; @@ -189,9 +188,7 @@ namespace Ink_Canvas.Helpers /// /// 确保窗口全屏的Hook - /// 使用HandleProcessCorruptedStateExceptions,防止访问内存过程中因为一些致命异常导致程序崩溃 /// - [HandleProcessCorruptedStateExceptions] private static IntPtr KeepFullScreenHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled) { //处理WM_WINDOWPOSCHANGING消息 diff --git a/Ink Canvas/InkCanvasForClass.csproj b/Ink Canvas/InkCanvasForClass.csproj index fd79492b..6dc1f47a 100644 --- a/Ink Canvas/InkCanvasForClass.csproj +++ b/Ink Canvas/InkCanvasForClass.csproj @@ -1,4 +1,4 @@ - + win-x86;win-x64;win-arm64 WinExe @@ -32,7 +32,10 @@ Debug;Release AnyCPU;x86;x64 10 - CA1416 + $(NoWarn);CA1416;NU1701;MSB3270;CS8012;NETSDK1138 + true + None + PerMonitorV2 embedded diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index 9f0b4e06..313c5153 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -1162,7 +1162,6 @@ namespace Ink_Canvas public string _lastAppliedProfileName; private bool isLoaded; - private bool _suppressChickenSoupSourceSelectionChanged; private bool forcePointEraser; private bool _pendingStartupAutoUpdateCheck; private bool _sliderTouchSupportInitialized; diff --git a/Ink Canvas/MainWindow_cs/MW_Settings.cs b/Ink Canvas/MainWindow_cs/MW_Settings.cs index 05e97147..4851f7c4 100644 --- a/Ink Canvas/MainWindow_cs/MW_Settings.cs +++ b/Ink Canvas/MainWindow_cs/MW_Settings.cs @@ -20,13 +20,6 @@ namespace Ink_Canvas { #region Behavior - /// - /// 内部标记:是否正在内部更改更新通道 - /// - private bool _isChangingUpdateChannelInternally; - /// 内部标记:是否正在内部更改「更新包架构」(32/64 位 ZIP) - private bool _isChangingUpdatePackageArchInternally; - /// /// 处理PowerPoint支持开关状态更改事件 @@ -1299,7 +1292,6 @@ namespace Ink_Canvas private void UpdatePackageArchitectureSelector_Checked(object sender, RoutedEventArgs e) { if (!isLoaded) return; - if (_isChangingUpdatePackageArchInternally) return; if (!(sender is RadioButton radioButton) || radioButton.Tag == null) return; var newArch = string.Equals(radioButton.Tag.ToString(), "X64", StringComparison.OrdinalIgnoreCase) diff --git a/Ink Canvas/Properties/Strings.resx b/Ink Canvas/Properties/Strings.resx index 35004b2e..0de63ead 100644 --- a/Ink Canvas/Properties/Strings.resx +++ b/Ink Canvas/Properties/Strings.resx @@ -585,12 +585,6 @@ 自动:64 位进程使用 WinRT(Windows 10+),32 位使用 IACore。可强制指定 IACore 或 WinRT。 - - 手写体纠正 - - - # 开启后,将对手写笔画进行更平滑、更工整的纠正处理(基于 WinRT)。 - 自动 diff --git a/Ink Canvas/app.manifest b/Ink Canvas/app.manifest index 89e4303d..3de1f1f2 100644 --- a/Ink Canvas/app.manifest +++ b/Ink Canvas/app.manifest @@ -45,35 +45,6 @@ - - - - - - PerMonitorV2,PerMonitor - - true - - - - -