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

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

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index daf5c125..bee9774a 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -13,6 +13,7 @@
         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 bd52a3b6..5feb84e5 100644
--- a/Ink Canvas/MainWindow.xaml.cs	
+++ b/Ink Canvas/MainWindow.xaml.cs	
@@ -254,10 +254,8 @@ namespace Ink_Canvas
             };
             // 初始化无焦点模式开关
             ToggleSwitchNoFocusMode.IsOn = Settings.Advanced.IsNoFocusMode;
-            ApplyNoFocusMode();
             // 初始化窗口置顶开关
             ToggleSwitchAlwaysOnTop.IsOn = Settings.Advanced.IsAlwaysOnTop;
-            ApplyAlwaysOnTop();
 
             // 添加窗口激活事件处理，确保置顶状态在窗口重新激活时得到保持
             Activated += Window_Activated;
@@ -397,6 +395,12 @@ 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();
@@ -561,9 +565,7 @@ namespace Ink_Canvas
             InitializePluginSystem();
             // 确保开关和设置同步
             ToggleSwitchNoFocusMode.IsOn = Settings.Advanced.IsNoFocusMode;
-            ApplyNoFocusMode();
             ToggleSwitchAlwaysOnTop.IsOn = Settings.Advanced.IsAlwaysOnTop;
-            ApplyAlwaysOnTop();
 
             // 初始化UIA置顶开关
             ToggleSwitchUIAccessTopMost.IsOn = Settings.Advanced.EnableUIAccessTopMost;