From 287d31a3a92f16468382c712670be46ea8112c07 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Sat, 13 Dec 2025 17:03:58 +0800
Subject: [PATCH] =?UTF-8?q?improve:=E7=AA=97=E5=8F=A3=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow.xaml                    |  8 +++++++-
 Ink Canvas/MainWindow.xaml.cs                 | 19 +++++++++++++++++++
 Ink Canvas/MainWindow_cs/MW_Settings.cs       |  8 ++++++++
 Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs |  1 +
 Ink Canvas/Resources/Settings.cs              |  3 +++
 5 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 3a6ecac9..cf26ee0d 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -12,7 +12,6 @@
         AllowsTransparency="True"
         WindowStyle="None"
         ResizeMode="NoResize"
-        WindowState="Maximized"
         Loaded="Window_Loaded"
         Background="Transparent"
         ShowInTaskbar="False"
@@ -605,6 +604,13 @@
                                                          IsOn="False" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
                                                          Toggled="ToggleSwitchNoFocusMode_Toggled" />
                                     </ui:SimpleStackPanel>
+                                    <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
+                                        <TextBlock Foreground="#fafafa" Text="无边框窗口模式" VerticalAlignment="Center"
+                                                   FontSize="14" Margin="0,0,16,0" />
+                                        <ui:ToggleSwitch OnContent="" OffContent="" Name="ToggleSwitchWindowMode"
+                                                         IsOn="True" FontFamily="Microsoft YaHei UI" FontWeight="Bold"
+                                                         Toggled="ToggleSwitchWindowMode_Toggled" />
+                                    </ui:SimpleStackPanel>
                                     <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Left">
                                         <TextBlock Foreground="#fafafa" Text="窗口置顶" VerticalAlignment="Center"
                                                    FontSize="14" Margin="0,0,16,0" />
diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index 13e4676d..5a2ac649 100644
--- a/Ink Canvas/MainWindow.xaml.cs	
+++ b/Ink Canvas/MainWindow.xaml.cs	
@@ -514,6 +514,9 @@ namespace Ink_Canvas
             // 加载自定义背景颜色
             LoadCustomBackgroundColor();
 
+            // 设置窗口模式
+            SetWindowMode();
+
             // 注册设置面板滚动事件
             if (SettingsPanelScrollViewer != null)
             {
@@ -769,6 +772,22 @@ namespace Ink_Canvas
             }
         }
 
+        private void SetWindowMode()
+        {
+            if (Settings.Advanced.WindowMode)
+            {
+                WindowState = WindowState.Normal;
+                Left = 0.0;
+                Top = 0.0;
+                Height = SystemParameters.PrimaryScreenHeight;
+                Width = SystemParameters.PrimaryScreenWidth;
+            }
+            else // 全屏
+            {
+                WindowState = WindowState.Maximized;
+            }
+        }
+
         private void Window_Closing(object sender, CancelEventArgs e)
         {
             LogHelper.WriteLogToFile("Ink Canvas closing", LogHelper.LogType.Event);
diff --git a/Ink Canvas/MainWindow_cs/MW_Settings.cs b/Ink Canvas/MainWindow_cs/MW_Settings.cs
index 0c29fcfe..033d48f3 100644
--- a/Ink Canvas/MainWindow_cs/MW_Settings.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_Settings.cs	
@@ -2532,6 +2532,14 @@ namespace Ink_Canvas
             SaveSettingsToFile();
         }
 
+        private void ToggleSwitchWindowMode_Toggled(object sender, RoutedEventArgs e)
+        {
+            if (!isLoaded) return;
+            Settings.Advanced.WindowMode = ToggleSwitchWindowMode.IsOn;
+            SaveSettingsToFile();
+            SetWindowMode();
+        }
+
         private void ToggleSwitchIsAutoBackupBeforeUpdate_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 bde4b36b..76c46951 100644
--- a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs	
@@ -795,6 +795,7 @@ namespace Ink_Canvas
                 ToggleSwitchIsLogEnabled.IsOn = Settings.Advanced.IsLogEnabled;
                 ToggleSwitchIsSaveLogByDate.IsOn = Settings.Advanced.IsSaveLogByDate;
                 ToggleSwitchIsSecondConfimeWhenShutdownApp.IsOn = Settings.Advanced.IsSecondConfirmWhenShutdownApp;
+                ToggleSwitchWindowMode.IsOn = Settings.Advanced.WindowMode;
                 ToggleSwitchIsSpecialScreen.IsOn = Settings.Advanced.IsSpecialScreen;
                 ToggleSwitchIsQuadIR.IsOn = Settings.Advanced.IsQuadIR;
                 ToggleSwitchEraserBindTouchMultiplier.IsOn = Settings.Advanced.EraserBindTouchMultiplier;
diff --git a/Ink Canvas/Resources/Settings.cs b/Ink Canvas/Resources/Settings.cs
index 5ef12f77..27a54c41 100644
--- a/Ink Canvas/Resources/Settings.cs	
+++ b/Ink Canvas/Resources/Settings.cs	
@@ -602,6 +602,9 @@ namespace Ink_Canvas
 
         [JsonProperty("enableUIAccessTopMost")]
         public bool EnableUIAccessTopMost { get; set; } = false;
+
+        [JsonProperty("windowMode")]
+        public bool WindowMode { get; set; } = true; 
     }
 
     public class InkToShape