From 2c45c839b19663df20b0d1b9b1d0f6f30ec5b39a Mon Sep 17 00:00:00 2001
From: CJK_mkp <113243675+CJKmkp@users.noreply.github.com>
Date: Sat, 8 Nov 2025 23:09:04 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"improve:=E6=97=A0=E7=84=A6=E7=82=B9?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 83f5fc58d179d63d61b2c02c8d848a7adad3af91.
---
 Ink Canvas/MainWindow.xaml    |  1 -
 Ink Canvas/MainWindow.xaml.cs | 10 ++++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index bee9774a..daf5c125 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -13,7 +13,6 @@
         ResizeMode="NoResize"
         WindowState="Maximized"
         Loaded="Window_Loaded"
-        SourceInitialized="Window_SourceInitialized"
         Background="Transparent"
         ShowInTaskbar="False"
         Title="InkCanvasforClass"
diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index 5feb84e5..bd52a3b6 100644
--- a/Ink Canvas/MainWindow.xaml.cs	
+++ b/Ink Canvas/MainWindow.xaml.cs	
@@ -254,8 +254,10 @@ namespace Ink_Canvas
             };
             // 初始化无焦点模式开关
             ToggleSwitchNoFocusMode.IsOn = Settings.Advanced.IsNoFocusMode;
+            ApplyNoFocusMode();
             // 初始化窗口置顶开关
             ToggleSwitchAlwaysOnTop.IsOn = Settings.Advanced.IsAlwaysOnTop;
+            ApplyAlwaysOnTop();
 
             // 添加窗口激活事件处理，确保置顶状态在窗口重新激活时得到保持
             Activated += Window_Activated;
@@ -395,12 +397,6 @@ namespace Ink_Canvas
         private bool isLoaded;
         private bool forcePointEraser;
 
-        private void Window_SourceInitialized(object sender, EventArgs e)
-        {
-            ApplyNoFocusMode();
-            ApplyAlwaysOnTop();
-        }
-
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
             loadPenCanvas();
@@ -565,7 +561,9 @@ namespace Ink_Canvas
             InitializePluginSystem();
             // 确保开关和设置同步
             ToggleSwitchNoFocusMode.IsOn = Settings.Advanced.IsNoFocusMode;
+            ApplyNoFocusMode();
             ToggleSwitchAlwaysOnTop.IsOn = Settings.Advanced.IsAlwaysOnTop;
+            ApplyAlwaysOnTop();
 
             // 初始化UIA置顶开关
             ToggleSwitchUIAccessTopMost.IsOn = Settings.Advanced.EnableUIAccessTopMost;