improve:自动更新

重构动画帮助类以支持自定义动画目标
简化颜色滑块更新逻辑
调整浮动工具栏显示逻辑
新增BoardMenuFrame自定义控件

.all-contributorsrc

@@ -1,4 +1,5 @@
 {
+  "$schema": "https://www.schemastore.org/all-contributors.json",
   "projectName": "community",
   "projectOwner": "InkCanvasForClass",
   "files": [
@@ -6,7 +7,7 @@
   ],
   "commitType": "docs",
   "commitConvention": "angular",
-  "contributorsPerLine": 7,
+  "contributorsPerLine": 5,
   "contributors": [
     {
       "login": "CJKmkp",
@@ -100,7 +101,8 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/156585442?v=4",
       "profile": "https://github.com/Tayasui-rainnya",
       "contributions": [
-        "design"
+        "design",
+        "code"
       ]
     },
     {
@@ -110,7 +112,8 @@
       "profile": "https://github.com/doudou0720",
       "contributions": [
         "code",
-        "blog"
+        "blog",
+        "infra"
       ]
     },
     {
@@ -140,6 +143,16 @@
         "infra",
         "blog"
       ]
+    },
+    {
+      "login": "Hao3288",
+      "name": "NoobHao",
+      "avatar_url": "https://avatars.githubusercontent.com/u/119276078?v=4",
+      "profile": "https://github.com/Hao3288",
+      "contributions": [
+        "code"
+      ]
     }
-  ]
+  ],
+  "repoType": "github"
 }

.github/workflows/dotnet-desktop.yml

@@ -2,7 +2,7 @@ name: .NET Build & Package
 
 on:
   push:
-    branches: [ main, beta ]
+    branches: [ net6 ]
   workflow_dispatch:
 
 concurrency:
@@ -46,7 +46,7 @@ jobs:
       - name: Check if exe file is generated
         id: check-exe
         run: |
-          $exePath = "Ink Canvas\bin\Debug\${{ matrix.architecture }}\net472\InkCanvasForClass.exe"
+          $exePath = "Ink Canvas\bin\Debug\${{ matrix.architecture }}\net6.0-windows10.0.19041.0\InkCanvasForClass.exe"
           
           if (Test-Path $exePath) {
             echo "build_success=true" >> $env:GITHUB_OUTPUT
@@ -74,7 +74,7 @@ jobs:
         uses: actions/upload-artifact@v7
         with:
           name: InkCanvasForClass.CE.debug.${{ matrix.architecture }}
-          path: "Ink Canvas/bin/Debug/${{ matrix.architecture }}/net472/*"
+          path: "Ink Canvas/bin/Debug/${{ matrix.architecture }}/net6.0-windows10.0.19041.0/*"
 
       - name: Create Summary
         if: always()

.github/workflows/prcheck.yml

@@ -3,7 +3,7 @@ name: PR Check
 on:
   pull_request:
     types: [opened, synchronize]
-    branches: [ main, beta ]
+    branches: [ main, net6 ]
     paths-ignore:
       - '**/*.md'
 
@@ -43,7 +43,7 @@ jobs:
       - name: Check if exe file is generated
         id: check-exe
         run: |
-          $exePath = "Ink Canvas\bin\Debug\${{ matrix.architecture }}\net472\InkCanvasForClass.exe"
+          $exePath = "Ink Canvas\bin\Debug\${{ matrix.architecture }}\net6.0-windows10.0.19041.0\InkCanvasForClass.exe"
           
           if (Test-Path $exePath) {
             echo "build_success=true" >> $env:GITHUB_OUTPUT
@@ -71,7 +71,7 @@ jobs:
         uses: actions/upload-artifact@v7
         with:
           name: InkCanvasForClass.CE.debug.${{ matrix.architecture }}
-          path: "Ink Canvas/bin/Debug/${{ matrix.architecture }}/net472/*"
+          path: "Ink Canvas/bin/Debug/${{ matrix.architecture }}/net6.0-windows10.0.19041.0/*"
         
 
       - name: Create Summary

.github/workflows/prerelease.yml

@@ -236,7 +236,7 @@ jobs:
       - name: Check if exe file is generated
         id: check-exe
         run: |
-          $exePath = "Ink Canvas\bin\Release\${{ matrix.architecture }}\net472\InkCanvasForClass.exe"
+          $exePath = "Ink Canvas\bin\Release\${{ matrix.architecture }}\net6.0-windows10.0.19041.0\InkCanvasForClass.exe"
           
           if (Test-Path $exePath) {
             echo "build_success=true" >> $env:GITHUB_OUTPUT
@@ -284,7 +284,7 @@ jobs:
           New-Item -ItemType Directory -Path "release" -Force
           
           # 复制发布文件（使用架构特定的路径）
-          Copy-Item "Ink Canvas\bin\Release\$architecture\net472\*" "release/" -Recurse -Force
+          Copy-Item "Ink Canvas\bin\Release\$architecture\net6.0-windows10.0.19041.0\*" "release/" -Recurse -Force
           
           # 创建压缩包
           Compress-Archive -Path "release/*" -DestinationPath $archiveName -Force
@@ -750,5 +750,5 @@ jobs:
             /repos/InkCanvasForClass/community/contents/AutomaticUpdateVersionControl.txt \
             -f message="Update AutomaticUpdateVersionControl.txt" \
             -f content="$CONTENT" \
-            -f branch="beta" \
+            -f branch="net6" \
             ${SHA:+-f sha="$SHA"}

.gitignore

@@ -429,4 +429,5 @@ FodyWeavers.xsd
 
 # Telemetry DSN configuration file (contains sensitive information)
 telemetry_dsn.txt
-**/telemetry_dsn.txt
+**/telemetry_dsn.txt
+.trae/skills/migrate-toggle-switch/SKILL.md

Ink Canvas.sln

@@ -1,9 +1,14 @@
+
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.5.33530.505
+# Visual Studio Version 18
+VisualStudioVersion = 18.4.11626.88 stable
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InkCanvasForClass", "Ink Canvas\InkCanvasForClass.csproj", "{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InkCanvas.PluginSdk", "InkCanvas.PluginSdk\InkCanvas.PluginSdk.csproj", "{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InkCanvas.Controls", "InkCanvas.Controls\InkCanvas.Controls.csproj", "{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -38,6 +43,46 @@ Global
 		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|x64.Build.0 = Release|Any CPU
 		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|x86.ActiveCfg = Release|Any CPU
 		{8D0EDFC7-F974-4571-BC49-6F3A6653FE81}.Release|x86.Build.0 = Release|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Debug|ARM.Build.0 = Debug|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Debug|x64.Build.0 = Debug|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Debug|x86.Build.0 = Debug|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Release|ARM.ActiveCfg = Release|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Release|ARM.Build.0 = Release|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Release|ARM64.Build.0 = Release|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Release|x64.ActiveCfg = Release|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Release|x64.Build.0 = Release|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Release|x86.ActiveCfg = Release|Any CPU
+		{6A0B1FE5-5D4A-EB5D-8C4F-A1F107FD7556}.Release|x86.Build.0 = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|ARM.Build.0 = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|x64.Build.0 = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|x86.Build.0 = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|ARM.ActiveCfg = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|ARM.Build.0 = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|ARM64.Build.0 = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|x64.ActiveCfg = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|x64.Build.0 = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|x86.ActiveCfg = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Ink Canvas/App.xaml

@@ -1,8 +1,9 @@
-<Application x:Class="Ink_Canvas.App"
+<Application x:Class="Ink_Canvas.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:Ink_Canvas"
-             xmlns:tb="http://www.hardcodet.net/taskbar"
+             xmlns:props="clr-namespace:Ink_Canvas.Properties"
+             xmlns:tb="clr-namespace:H.NotifyIcon;assembly=H.NotifyIcon.Wpf"
              xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
              xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
 >
@@ -32,10 +33,30 @@
                         </Image>
                     </MenuItem.Icon>
                 </MenuItem>
+                <MenuItem Name="TempShowMainWindowTrayIconMenuItem" Click="TempShowMainWindowTrayIconMenuItem_Clicked">
+                    <MenuItem.Header>
+                        <ikw:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
+                            <TextBlock FontSize="14" VerticalAlignment="Center" Foreground="#18181b" Text="{x:Static props:Strings.Tray_TempShowMainWindow}" />
+                        </ikw:SimpleStackPanel>
+                    </MenuItem.Header>
+                    <MenuItem.Icon>
+                        <Image Width="28" Height="28" Margin="-2">
+                            <Image.Source>
+                                <DrawingImage>
+                                    <DrawingImage.Drawing>
+                                        <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                                            <GeometryDrawing Brush="#27272a" Geometry="F0 M24,24z M0,0z M5,6C4.73478,6 4.48043,6.10536 4.29289,6.29289 4.10536,6.48043 4,6.73478 4,7L4,17C4,17.2652 4.10536,17.5196 4.29289,17.7071 4.48043,17.8946 4.73478,18 5,18L19,18C19.2652,18 19.5196,17.8946 19.7071,17.7071 19.8946,17.5196 20,17.2652 20,17L20,7C20,6.73478 19.8946,6.48043 19.7071,6.29289 19.5196,6.10536 19.2652,6 19,6L5,6z M2.87868,4.87868C3.44129,4.31607,4.20435,4,5,4L19,4C19.7957,4 20.5587,4.31607 21.1213,4.87868 21.6839,5.44129 22,6.20435 22,7L22,17C22,17.7957 21.6839,18.5587 21.1213,19.1213 20.5587,19.6839 19.7957,20 19,20L5,20C4.20435,20 3.44129,19.6839 2.87868,19.1213 2.31607,18.5587 2,17.7956 2,17L2,7C2,6.20435,2.31607,5.44129,2.87868,4.87868z M5,8C5,7.44772,5.44772,7,6,7L6.01,7C6.56228,7 7.01,7.44772 7.01,8 7.01,8.55228 6.56228,9 6.01,9L6,9C5.44772,9,5,8.55228,5,8z M9,7C8.44772,7 8,7.44772 8,8 8,8.55228 8.44772,9 9,9L9.01,9C9.56228,9 10.01,8.55228 10.01,8 10.01,7.44772 9.56228,7 9.01,7L9,7z" />
+                                        </DrawingGroup>
+                                    </DrawingImage.Drawing>
+                                </DrawingImage>
+                            </Image.Source>
+                        </Image>
+                    </MenuItem.Icon>
+                </MenuItem>
                 <MenuItem Name="OpenSettingsTrayIconMenuItem" Click="OpenSettingsTrayIconMenuItem_Clicked">
                     <MenuItem.Header>
                         <ikw:SimpleStackPanel Orientation="Horizontal" Margin="-4,0,0,0">
-                            <TextBlock FontSize="14" VerticalAlignment="Center" Foreground="#18181b" Text="打开设置" />
+                            <TextBlock FontSize="14" VerticalAlignment="Center" Foreground="#18181b" Text="{x:Static props:Strings.Tray_OpenSettings}" />
                         </ikw:SimpleStackPanel>
                     </MenuItem.Header>
                     <MenuItem.Icon>
@@ -242,7 +263,7 @@
                             ToolTipText="InkCanvasForClass"
                             ContextMenu="{StaticResource SysTrayMenu}"
                             IconSource="/Resources/icc.ico"/>
-                <ResourceDictionary.MergedDictionaries>
+            <ResourceDictionary.MergedDictionaries>
                 <ui:ThemeResources/>
                 <ui:XamlControlsResources />
                 <ResourceDictionary Source="Resources/SeewoImageDictionary.xaml"/>

Ink Canvas/App.xaml.cs

@@ -1,5 +1,6 @@
-using Hardcodet.Wpf.TaskbarNotification;
+using H.NotifyIcon;
 using Ink_Canvas.Helpers;
+using Ink_Canvas.Plugins;
 using Ink_Canvas.Properties;
 using iNKORE.UI.WPF.Modern.Controls;
 using Microsoft.Win32;
@@ -7,6 +8,7 @@ using Newtonsoft.Json;
 using Sentry;
 using System;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Net;
@@ -17,6 +19,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Forms;
 using System.Windows.Input;
+using System.Windows.Interop;
 using System.Windows.Threading;
 using Application = System.Windows.Application;
 using MessageBox = System.Windows.MessageBox;
@@ -32,6 +35,20 @@ namespace Ink_Canvas
     {
         Mutex mutex;
 
+        public void ReleaseMutexForRestart()
+        {
+            try
+            {
+                if (mutex != null)
+                {
+                    mutex.ReleaseMutex();
+                    mutex.Dispose();
+                    mutex = null;
+                }
+            }
+            catch { }
+        }
+
         public static string[] StartArgs;
         public static string RootPath = AppDomain.CurrentDomain.SetupInformation.ApplicationBase;
 
@@ -61,9 +78,16 @@ namespace Ink_Canvas
         private static string lastErrorMessage = string.Empty;
         // 新增：是否已初始化崩溃监听器
         private static bool crashListenersInitialized;
+        private IntPtr processDestroyHook = IntPtr.Zero;
+        private IntPtr monitoredMainWindowHandle = IntPtr.Zero;
+        private bool mainWindowDestroyedLogged;
+        private WinEventDelegate processDestroyHookCallback;
         // 新增：启动画面相关
         private static SplashScreen _splashScreen;
         private static bool _isSplashScreenShown = false;
+        private static System.Resources.ResourceSet _pendingLocalizedResourceSet;
+        private static readonly Stopwatch startupStopwatch = new Stopwatch();
+        private static readonly Stopwatch splashStopwatch = new Stopwatch();
 
         [DllImport("shell32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
         private static extern int SetCurrentProcessExplicitAppUserModelID(string appId);
@@ -192,15 +216,13 @@ namespace Ink_Canvas
                 // 尝试注册Windows关闭消息监听
                 SetConsoleCtrlHandler(ConsoleCtrlHandler, true);
 
-                // 如果系统支持，添加Windows Management Instrumentation监听器
                 try
                 {
-                    // 使用反射动态加载和调用WMI
-                    TrySetupWmiMonitoring();
+                    TrySetupTerminationMonitoring();
                 }
-                catch (Exception wmiEx)
+                catch (Exception monitorEx)
                 {
-                    LogHelper.WriteLogToFile($"设置WMI进程监控失败: {wmiEx.Message}", LogHelper.LogType.Warning);
+                    LogHelper.WriteLogToFile($"设置终止监控失败: {monitorEx.Message}", LogHelper.LogType.Warning);
                 }
 
                 crashListenersInitialized = true;
@@ -212,80 +234,114 @@ namespace Ink_Canvas
             }
         }
 
-        // 动态加载WMI监控
-        private void TrySetupWmiMonitoring()
+        private void TrySetupTerminationMonitoring()
         {
             try
             {
-                // 检查System.Management程序集是否可用
-                var assemblyName = "System.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
-                var assembly = Assembly.Load(assemblyName);
-                if (assembly == null)
-                {
-                    LogHelper.WriteLogToFile("未找到System.Management程序集，跳过WMI监控", LogHelper.LogType.Warning);
-                    return;
-                }
+                processDestroyHookCallback = OnWinEventMainWindowDestroyed;
 
-                // 使用反射创建WMI查询
-                var watcherType = assembly.GetType("System.Management.ManagementEventWatcher");
-                if (watcherType == null)
-                {
-                    LogHelper.WriteLogToFile("未找到ManagementEventWatcher类型，跳过WMI监控", LogHelper.LogType.Warning);
-                    return;
-                }
-
-                // 构建WMI查询字符串
-                string queryString = $"SELECT * FROM __InstanceDeletionEvent WITHIN 1 WHERE TargetInstance ISA 'Win32_Process' AND TargetInstance.ProcessId = {currentProcessId}";
-
-                // 创建ManagementEventWatcher实例
-                object watcher = Activator.CreateInstance(watcherType, queryString);
-
-                // 获取EventArrived事件信息
-                var eventInfo = watcherType.GetEvent("EventArrived");
-                if (eventInfo == null)
-                {
-                    LogHelper.WriteLogToFile("未找到EventArrived事件，跳过WMI监控", LogHelper.LogType.Warning);
-                    return;
-                }
-
-                // 创建委托并订阅事件
-                Type delegateType = eventInfo.EventHandlerType;
-                var handler = Delegate.CreateDelegate(delegateType, this, GetType().GetMethod("WmiEventHandler", BindingFlags.NonPublic | BindingFlags.Instance));
-                eventInfo.AddEventHandler(watcher, handler);
-
-                // 启动监听
-                var startMethod = watcherType.GetMethod("Start");
-                startMethod.Invoke(watcher, null);
-
-                LogHelper.WriteLogToFile("已成功启动WMI进程监控");
+                // 等主窗口句柄可用后再开始监听
+                Dispatcher.BeginInvoke(new Action(BindMainWindowLifecycle), DispatcherPriority.ApplicationIdle);
             }
             catch (Exception ex)
             {
-                LogHelper.WriteLogToFile($"动态加载WMI监控失败: {ex.Message}", LogHelper.LogType.Warning);
+                LogHelper.WriteLogToFile($"初始化终止监控失败: {ex.GetType().FullName}: {ex.Message}", LogHelper.LogType.Warning);
             }
         }
 
-        // WMI事件处理方法
-        private void WmiEventHandler(object sender, EventArgs e)
+        private void BindMainWindowLifecycle()
         {
             try
             {
-                // 尝试从事件参数中提取信息
-                dynamic eventArgs = e;
-                dynamic newEvent = eventArgs.NewEvent;
-                if (newEvent != null)
+                if (Current?.MainWindow == null)
                 {
-                    dynamic targetInstance = newEvent["TargetInstance"];
-                    if (targetInstance != null)
-                    {
-                        string processName = targetInstance["Name"]?.ToString() ?? "未知进程";
-                        WriteCrashLog($"WMI检测到进程{processName}(ID:{currentProcessId})已终止");
-                    }
+                    return;
+                }
+
+                Current.MainWindow.SourceInitialized -= MainWindow_SourceInitialized;
+                Current.MainWindow.SourceInitialized += MainWindow_SourceInitialized;
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+        private void MainWindow_SourceInitialized(object sender, EventArgs e)
+        {
+            try
+            {
+                if (!(sender is Window window))
+                {
+                    return;
+                }
+
+                monitoredMainWindowHandle = new WindowInteropHelper(window).Handle;
+                if (monitoredMainWindowHandle == IntPtr.Zero)
+                {
+                    return;
+                }
+
+                RegisterMainWindowDestroyHook();
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+        private void RegisterMainWindowDestroyHook()
+        {
+            if (processDestroyHook != IntPtr.Zero || monitoredMainWindowHandle == IntPtr.Zero)
+            {
+                return;
+            }
+
+            processDestroyHook = SetWinEventHook(
+                EVENT_OBJECT_DESTROY,
+                EVENT_OBJECT_DESTROY,
+                IntPtr.Zero,
+                processDestroyHookCallback,
+                (uint)currentProcessId,
+                0,
+                WINEVENT_OUTOFCONTEXT);
+
+            if (processDestroyHook == IntPtr.Zero)
+            {
+                return;
+            }
+        }
+
+        private void OnWinEventMainWindowDestroyed(IntPtr hWinEventHook, uint eventType, IntPtr hwnd, int idObject, int idChild, uint dwEventThread, uint dwmsEventTime)
+        {
+            if (eventType != EVENT_OBJECT_DESTROY || mainWindowDestroyedLogged)
+            {
+                return;
+            }
+
+            if (idObject != OBJID_WINDOW || idChild != CHILDID_SELF)
+            {
+                return;
+            }
+
+            if (hwnd != monitoredMainWindowHandle || hwnd == IntPtr.Zero)
+            {
+                return;
+            }
+
+            mainWindowDestroyedLogged = true;
+        }
+
+        private void CleanupTerminationMonitoring()
+        {
+            try
+            {
+                if (processDestroyHook != IntPtr.Zero)
+                {
+                    UnhookWinEvent(processDestroyHook);
+                    processDestroyHook = IntPtr.Zero;
                 }
             }
-            catch (Exception ex)
+            catch
             {
-                LogHelper.WriteLogToFile($"处理WMI事件时出错: {ex.Message}", LogHelper.LogType.Warning);
             }
         }
 
@@ -294,6 +350,19 @@ namespace Ink_Canvas
         private static extern bool SetConsoleCtrlHandler(ConsoleCtrlDelegate handler, bool add);
 
         private delegate bool ConsoleCtrlDelegate(int ctrlType);
+        private delegate void WinEventDelegate(IntPtr hWinEventHook, uint eventType, IntPtr hwnd, int idObject, int idChild, uint dwEventThread, uint dwmsEventTime);
+
+        private const uint EVENT_OBJECT_DESTROY = 0x8001;
+        private const uint WINEVENT_OUTOFCONTEXT = 0x0000;
+        private const int OBJID_WINDOW = 0;
+        private const int CHILDID_SELF = 0;
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr SetWinEventHook(uint eventMin, uint eventMax, IntPtr hmodWinEventProc, WinEventDelegate lpfnWinEventProc, uint idProcess, uint idThread, uint dwFlags);
+
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool UnhookWinEvent(IntPtr hWinEventHook);
 
         private static bool ConsoleCtrlHandler(int ctrlType)
         {
@@ -428,6 +497,7 @@ namespace Ink_Canvas
         // 处理进程退出事件
         private void CurrentDomain_ProcessExit(object sender, EventArgs e)
         {
+            CleanupTerminationMonitoring();
             TimeSpan runDuration = DateTime.Now - appStartTime;
             string durationText = FormatTimeSpan(runDuration);
             WriteCrashLog($"应用程序退出，运行时长: {durationText}");
@@ -476,6 +546,7 @@ namespace Ink_Canvas
                 _splashScreen.Show();
                 _isSplashScreenShown = true;
                 splashScreenStartTime = DateTime.Now;
+                splashStopwatch.Restart();
                 LogHelper.WriteLogToFile("启动画面已显示");
             }
             catch (Exception ex)
@@ -695,20 +766,25 @@ namespace Ink_Canvas
         {
             appStartTime = DateTime.Now;
             appStartupStartTime = DateTime.Now;
+            startupStopwatch.Restart();
+
+            TryApplyPreferredLanguageFromSettings();
+
+            _pendingLocalizedResourceSet = Strings.ResourceManager.GetResourceSet(CultureInfo.CurrentUICulture, true, true);
 
             // 根据设置决定是否显示启动画面
             if (ShouldShowSplashScreen() && !IsLaunchByFileOrUri(e.Args))
             {
+                await Task.Delay(100);
                 ShowSplashScreen();
                 SetSplashMessage(Strings.GetString("Splash_Starting"));
                 SetSplashProgress(20);
-                await Task.Delay(500);
 
                 // 强制刷新UI，确保启动画面显示
                 Application.Current.Dispatcher.Invoke(() => { }, DispatcherPriority.Render);
             }
 
-            await Task.Delay(500);
+            await Task.Delay(100);
             RootPath = AppDomain.CurrentDomain.SetupInformation.ApplicationBase;
 
             LogHelper.NewLog(string.Format("Ink Canvas Starting (Version: {0})", Assembly.GetExecutingAssembly().GetName().Version));
@@ -744,15 +820,6 @@ namespace Ink_Canvas
             {
                 SetSplashMessage("正在初始化组件...");
                 SetSplashProgress(40);
-                await Task.Delay(500);
-            }
-            try
-            {
-                IACoreDllExtractor.ExtractIACoreDlls();
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"释放IACore DLL时出错: {ex.Message}", LogHelper.LogType.Error);
             }
 
             // 释放UIAccess DLL
@@ -760,43 +827,13 @@ namespace Ink_Canvas
             {
                 SetSplashMessage("正在初始化组件...");
                 SetSplashProgress(50);
-                await Task.Delay(300);
-            }
-            try
-            {
-                UIAccessDllExtractor.ExtractUIAccessDlls();
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"释放UIAccess DLL时出错: {ex.Message}", LogHelper.LogType.Error);
             }
 
-            // 记录应用启动（设备标识符）
             if (_isSplashScreenShown)
             {
                 SetSplashMessage("正在加载配置...");
                 SetSplashProgress(60);
-                await Task.Delay(500);
             }
-            DeviceIdentifier.RecordAppLaunch();
-            try
-            {
-                var systemVersion = DeviceIdentifier.GetSystemVersion();
-                if (!string.IsNullOrWhiteSpace(systemVersion))
-                {
-                    SentrySdk.ConfigureScope(scope =>
-                    {
-                        scope.SetTag("system_version", systemVersion);
-                    });
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"App | 初始化系统版本遥测标签失败: {ex.Message}", LogHelper.LogType.Warning);
-            }
-            LogHelper.WriteLogToFile($"App | 设备ID: {DeviceIdentifier.GetDeviceId()}");
-            LogHelper.WriteLogToFile($"App | 使用频率: {DeviceIdentifier.GetUsageFrequency()}");
-            LogHelper.WriteLogToFile($"App | 更新优先级: {DeviceIdentifier.GetUpdatePriority()}");
 
             // 处理更新模式启动
             bool isUpdateMode = AutoUpdateHelper.HandleUpdateModeStartup(e.Args);
@@ -1069,25 +1106,47 @@ namespace Ink_Canvas
             {
                 SetSplashMessage("正在初始化主界面...");
                 SetSplashProgress(80);
-                await Task.Delay(500);
             }
             var mainWindow = new MainWindow();
             MainWindow = mainWindow;
 
+            // 注册 InkCanvas 服务供插件使用
+            try
+            {
+                var inkCanvasService = new Plugins.InkCanvasService(mainWindow);
+                Plugins.PluginManager.Instance.RegisterService<Plugins.IInkCanvasService>(inkCanvasService);
+                LogHelper.WriteLogToFile("InkCanvasService registered for plugins");
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"Failed to register InkCanvasService: {ex.Message}", LogHelper.LogType.Error);
+            }
+
+            try
+            {
+                var appRestartService = new Plugins.AppRestartService();
+                Plugins.PluginManager.Instance.RegisterService<Plugins.IAppRestartService>(appRestartService);
+                LogHelper.WriteLogToFile("AppRestartService registered for plugins");
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"Failed to register AppRestartService: {ex.Message}", LogHelper.LogType.Error);
+            }
+
             // 主窗口加载完成后关闭启动画面
             mainWindow.Loaded += (s, args) =>
             {
                 isStartupComplete = true;
                 startupCompleteHeartbeat = DateTime.Now;
-                if (_isSplashScreenShown && splashScreenStartTime != DateTime.MinValue)
+                if (_isSplashScreenShown && splashStopwatch.IsRunning)
                 {
-                    LogHelper.WriteLogToFile($"启动完成心跳已记录，启动画面显示时长: {(startupCompleteHeartbeat - splashScreenStartTime).TotalSeconds:F2}秒");
+                    LogHelper.WriteLogToFile($"启动完成心跳已记录，启动画面显示时长: {splashStopwatch.Elapsed.TotalSeconds:F2}秒");
                 }
                 else
                 {
                     LogHelper.WriteLogToFile($"启动完成心跳已记录");
                 }
-                LogHelper.WriteLogToFile($"启动时长: {(startupCompleteHeartbeat - appStartupStartTime).TotalSeconds:F2}秒");
+                LogHelper.WriteLogToFile($"启动时长: {startupStopwatch.Elapsed.TotalSeconds:F2}秒");
 
                 if (_isSplashScreenShown)
                 {
@@ -1110,6 +1169,19 @@ namespace Ink_Canvas
             };
 
             mainWindow.Show();
+            _ = Task.Run(async () =>
+            {
+                await Task.Delay(600);
+                Dispatcher.Invoke(() => _taskbar?.ForceCreate());
+            });
+            Dispatcher.BeginInvoke(new Action(() =>
+            {
+                if (_pendingLocalizedResourceSet != null)
+                {
+                    LoadLocalizedResources(_pendingLocalizedResourceSet);
+                    _pendingLocalizedResourceSet = null;
+                }
+            }), DispatcherPriority.ApplicationIdle);
 
             // 处理启动时的URI参数
             string startupUriArg = e.Args.FirstOrDefault(a => a.StartsWith("icc:", StringComparison.OrdinalIgnoreCase));
@@ -1126,40 +1198,123 @@ namespace Ink_Canvas
                 });
             }
 
-            // 注册.icstk文件关联
+            _ = RunDeferredStartupTasksAsync();
+
+        }
+
+        private async Task RunDeferredStartupTasksAsync()
+        {
             try
             {
-                LogHelper.WriteLogToFile("开始注册.icstk文件关联");
-                FileAssociationManager.RegisterFileAssociation();
-                FileAssociationManager.ShowFileAssociationStatus();
+                await Task.Delay(1200);
+
+                try
+                {
+                    IACoreDllExtractor.ExtractIACoreDlls();
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"释放IACore DLL时出错: {ex.Message}", LogHelper.LogType.Error);
+                }
+
+                try
+                {
+                    LogHelper.WriteLogToFile("开始注册.icstk文件关联");
+                    FileAssociationManager.RegisterFileAssociation();
+                    FileAssociationManager.ShowFileAssociationStatus();
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"注册文件关联时出错: {ex.Message}", LogHelper.LogType.Error);
+                }
+
+                try
+                {
+                    LogHelper.WriteLogToFile("启动IPC监听器");
+                    FileAssociationManager.StartIpcListener();
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"启动IPC监听器时出错: {ex.Message}", LogHelper.LogType.Error);
+                }
+
+                try
+                {
+                    LogHelper.WriteLogToFile("初始化上传帮助类");
+                    Helpers.UploadHelper.Initialize();
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"初始化上传帮助类时出错: {ex.Message}", LogHelper.LogType.Error);
+                }
+
+                try
+                {
+                    LogHelper.WriteLogToFile("开始加载插件");
+                    await PluginManager.Instance.LoadAllAsync();
+                    LogHelper.WriteLogToFile(string.Format("插件加载完成，共加载 {0} 个插件", PluginManager.Instance.Plugins.Count));
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile(string.Format("加载插件时出错: {0}", ex.Message), LogHelper.LogType.Error);
+                }
+
+                try
+                {
+                    await Task.Delay(1500);
+                    DeviceIdentifier.RecordAppLaunch();
+                    var systemVersion = DeviceIdentifier.GetSystemVersion();
+                    if (!string.IsNullOrWhiteSpace(systemVersion))
+                    {
+                        SentrySdk.ConfigureScope(scope =>
+                        {
+                            scope.SetTag("system_version", systemVersion);
+                        });
+                    }
+
+                    LogHelper.WriteLogToFile($"App | 设备ID: {DeviceIdentifier.GetDeviceId()}");
+                    LogHelper.WriteLogToFile($"App | 使用频率: {DeviceIdentifier.GetUsageFrequency()}");
+                    LogHelper.WriteLogToFile($"App | 更新优先级: {DeviceIdentifier.GetUpdatePriority()}");
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"App | 初始化设备统计与遥测标签失败: {ex.Message}", LogHelper.LogType.Warning);
+                }
             }
             catch (Exception ex)
             {
-                LogHelper.WriteLogToFile($"注册文件关联时出错: {ex.Message}", LogHelper.LogType.Error);
+                LogHelper.WriteLogToFile($"启动阶段任务执行失败: {ex.Message}", LogHelper.LogType.Error);
             }
+        }
 
-            // 启动IPC监听器
+        private void TryApplyPreferredLanguageFromSettings()
+        {
             try
             {
-                LogHelper.WriteLogToFile("启动IPC监听器");
-                FileAssociationManager.StartIpcListener();
+                var settingsPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Configs", "Settings.json");
+                if (!File.Exists(settingsPath)) return;
+
+                var json = File.ReadAllText(settingsPath);
+                dynamic obj = JsonConvert.DeserializeObject(json);
+                string preferredLanguage = obj?["appearance"]?["language"]?.ToString();
+                if (!string.IsNullOrWhiteSpace(preferredLanguage))
+                {
+                    LocalizationHelper.TrySetCulture(preferredLanguage);
+                }
             }
             catch (Exception ex)
             {
-                LogHelper.WriteLogToFile($"启动IPC监听器时出错: {ex.Message}", LogHelper.LogType.Error);
+                LogHelper.WriteLogToFile($"启动时预加载语言失败: {ex.Message}", LogHelper.LogType.Error);
             }
+        }
 
-            // 初始化上传帮助类
-            try
+        private void LoadLocalizedResources(System.Resources.ResourceSet resourceSet)
+        {
+            foreach (System.Collections.DictionaryEntry entry in resourceSet)
             {
-                LogHelper.WriteLogToFile("初始化上传帮助类");
-                Helpers.UploadHelper.Initialize();
+                if (entry.Key is string key && entry.Value is string value)
+                    Current.Resources[key] = value;
             }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"初始化上传帮助类时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-
         }
 
         private void ScrollViewer_PreviewMouseWheel(object sender, MouseWheelEventArgs e)
@@ -1436,6 +1591,19 @@ namespace Ink_Canvas
 
         private void App_Exit(object sender, ExitEventArgs e)
         {
+            CleanupTerminationMonitoring();
+            // 卸载所有插件
+            try
+            {
+                LogHelper.WriteLogToFile("正在卸载插件...");
+                PluginManager.Instance.UnloadAll();
+                LogHelper.WriteLogToFile("插件卸载完成");
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"卸载插件时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+
             // 仅在软件内主动退出时关闭看门狗，并写入退出信号
             try
             {

Ink Canvas/AssemblyInfo.cs

@@ -2,6 +2,7 @@ using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows;
 
+[assembly: System.Runtime.Versioning.SupportedOSPlatform("windows")]
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
@@ -43,5 +44,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.18.9")]
-[assembly: AssemblyFileVersion("1.7.18.9")]
+[assembly: AssemblyVersion("1.7.18.10")]
+[assembly: AssemblyFileVersion("1.7.18.10")]

Ink Canvas/Controls/BoardMenuFrame.cs

@@ -0,0 +1,141 @@
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+using System.Windows.Media;
+
+namespace Ink_Canvas.Controls
+{
+    [TemplatePart(Name = PartCloseImage, Type = typeof(UIElement))]
+    [TemplatePart(Name = PartAnimationRoot, Type = typeof(UIElement))]
+    public class BoardMenuFrame : ContentControl
+    {
+        private const string PartCloseImage = "PART_CloseImage";
+        private const string PartAnimationRoot = "PART_AnimationRoot";
+
+        public static readonly DependencyProperty TitleProperty =
+            DependencyProperty.Register(nameof(Title), typeof(object), typeof(BoardMenuFrame), new PropertyMetadata(null));
+
+        public static readonly DependencyProperty TitleFontSizeProperty =
+            DependencyProperty.Register(nameof(TitleFontSize), typeof(double), typeof(BoardMenuFrame), new PropertyMetadata(11d));
+
+        public static readonly DependencyProperty HeaderHeightProperty =
+            DependencyProperty.Register(nameof(HeaderHeight), typeof(double), typeof(BoardMenuFrame), new PropertyMetadata(48d));
+
+        public static readonly DependencyProperty PanelCornerRadiusProperty =
+            DependencyProperty.Register(nameof(PanelCornerRadius), typeof(CornerRadius), typeof(BoardMenuFrame), new PropertyMetadata(new CornerRadius(5)));
+
+        public static readonly DependencyProperty HeaderCornerRadiusProperty =
+            DependencyProperty.Register(nameof(HeaderCornerRadius), typeof(CornerRadius), typeof(BoardMenuFrame), new PropertyMetadata(new CornerRadius(6, 6, 0, 0)));
+
+        public static readonly DependencyProperty PanelBackgroundProperty =
+            DependencyProperty.Register(nameof(PanelBackground), typeof(Brush), typeof(BoardMenuFrame), new PropertyMetadata(null));
+
+        public static readonly DependencyProperty HeaderBackgroundProperty =
+            DependencyProperty.Register(nameof(HeaderBackground), typeof(Brush), typeof(BoardMenuFrame),
+                new PropertyMetadata(new SolidColorBrush((Color)ColorConverter.ConvertFromString("#2563eb"))));
+
+        public static readonly DependencyProperty HeaderBorderBrushProperty =
+            DependencyProperty.Register(nameof(HeaderBorderBrush), typeof(Brush), typeof(BoardMenuFrame),
+                new PropertyMetadata(new SolidColorBrush((Color)ColorConverter.ConvertFromString("#1e3a8a"))));
+
+        public static readonly DependencyProperty IsOpenProperty =
+            DependencyProperty.Register(nameof(IsOpen), typeof(bool), typeof(BoardMenuFrame), new PropertyMetadata(false));
+
+        public static readonly DependencyProperty PlacementTargetProperty =
+            DependencyProperty.Register(nameof(PlacementTarget), typeof(UIElement), typeof(BoardMenuFrame), new PropertyMetadata(null));
+
+        public static readonly DependencyProperty PlacementProperty =
+            DependencyProperty.Register(nameof(Placement), typeof(PlacementMode), typeof(BoardMenuFrame), new PropertyMetadata(PlacementMode.Custom));
+
+        public static readonly DependencyProperty CustomPopupPlacementCallbackProperty =
+            DependencyProperty.Register(nameof(CustomPopupPlacementCallback), typeof(CustomPopupPlacementCallback), typeof(BoardMenuFrame),
+                new PropertyMetadata((CustomPopupPlacementCallback)PlaceCenteredAbove));
+
+        private static CustomPopupPlacement[] PlaceCenteredAbove(Size popupSize, Size targetSize, Point offset)
+        {
+            return new[]
+            {
+                new CustomPopupPlacement(
+                    new Point((targetSize.Width - popupSize.Width) / 2 + offset.X,
+                              -popupSize.Height + offset.Y),
+                    PopupPrimaryAxis.Horizontal),
+                new CustomPopupPlacement(
+                    new Point((targetSize.Width - popupSize.Width) / 2 + offset.X,
+                              targetSize.Height - offset.Y),
+                    PopupPrimaryAxis.Horizontal)
+            };
+        }
+
+        public static readonly DependencyProperty PopupHorizontalOffsetProperty =
+            DependencyProperty.Register(nameof(PopupHorizontalOffset), typeof(double), typeof(BoardMenuFrame), new PropertyMetadata(0d));
+
+        public static readonly DependencyProperty PopupVerticalOffsetProperty =
+            DependencyProperty.Register(nameof(PopupVerticalOffset), typeof(double), typeof(BoardMenuFrame), new PropertyMetadata(-4d));
+
+        public object Title { get => GetValue(TitleProperty); set => SetValue(TitleProperty, value); }
+        public double TitleFontSize { get => (double)GetValue(TitleFontSizeProperty); set => SetValue(TitleFontSizeProperty, value); }
+        public double HeaderHeight { get => (double)GetValue(HeaderHeightProperty); set => SetValue(HeaderHeightProperty, value); }
+        public CornerRadius PanelCornerRadius { get => (CornerRadius)GetValue(PanelCornerRadiusProperty); set => SetValue(PanelCornerRadiusProperty, value); }
+        public CornerRadius HeaderCornerRadius { get => (CornerRadius)GetValue(HeaderCornerRadiusProperty); set => SetValue(HeaderCornerRadiusProperty, value); }
+        public Brush PanelBackground { get => (Brush)GetValue(PanelBackgroundProperty); set => SetValue(PanelBackgroundProperty, value); }
+        public Brush HeaderBackground { get => (Brush)GetValue(HeaderBackgroundProperty); set => SetValue(HeaderBackgroundProperty, value); }
+        public Brush HeaderBorderBrush { get => (Brush)GetValue(HeaderBorderBrushProperty); set => SetValue(HeaderBorderBrushProperty, value); }
+        public bool IsOpen { get => (bool)GetValue(IsOpenProperty); set => SetValue(IsOpenProperty, value); }
+        public UIElement PlacementTarget { get => (UIElement)GetValue(PlacementTargetProperty); set => SetValue(PlacementTargetProperty, value); }
+        public PlacementMode Placement { get => (PlacementMode)GetValue(PlacementProperty); set => SetValue(PlacementProperty, value); }
+        public CustomPopupPlacementCallback CustomPopupPlacementCallback
+        {
+            get => (CustomPopupPlacementCallback)GetValue(CustomPopupPlacementCallbackProperty);
+            set => SetValue(CustomPopupPlacementCallbackProperty, value);
+        }
+        public double PopupHorizontalOffset { get => (double)GetValue(PopupHorizontalOffsetProperty); set => SetValue(PopupHorizontalOffsetProperty, value); }
+        public double PopupVerticalOffset { get => (double)GetValue(PopupVerticalOffsetProperty); set => SetValue(PopupVerticalOffsetProperty, value); }
+
+        public event MouseButtonEventHandler CloseMouseDown;
+        public event MouseButtonEventHandler CloseMouseUp;
+
+        public UIElement AnimationTarget { get; private set; }
+
+        private UIElement _closeImage;
+
+        static BoardMenuFrame()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(BoardMenuFrame), new FrameworkPropertyMetadata(typeof(BoardMenuFrame)));
+            VisibilityProperty.OverrideMetadata(typeof(BoardMenuFrame),
+                new FrameworkPropertyMetadata(Visibility.Collapsed, OnVisibilityChanged));
+        }
+
+        private static void OnVisibilityChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((BoardMenuFrame)d).IsOpen = (Visibility)e.NewValue == Visibility.Visible;
+        }
+
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+            if (_closeImage != null)
+            {
+                _closeImage.MouseDown -= CloseImage_MouseDown;
+                _closeImage.MouseUp -= CloseImage_MouseUp;
+            }
+            _closeImage = GetTemplateChild(PartCloseImage) as UIElement;
+            if (_closeImage != null)
+            {
+                _closeImage.MouseDown += CloseImage_MouseDown;
+                _closeImage.MouseUp += CloseImage_MouseUp;
+            }
+            AnimationTarget = GetTemplateChild(PartAnimationRoot) as UIElement;
+        }
+
+        private void CloseImage_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            CloseMouseDown?.Invoke(sender, e);
+        }
+
+        private void CloseImage_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            CloseMouseUp?.Invoke(sender, e);
+        }
+    }
+}

Ink Canvas/Controls/PdfEmbeddedView.cs

@@ -0,0 +1,145 @@
+using Ink_Canvas.Helpers;
+using System;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+
+namespace Ink_Canvas.Controls
+{
+    /// <summary>
+    /// 画布上的多页 PDF：仅显示当前页；翻页与页码由主窗口 PDF 侧栏控制（无 XAML 文件）。
+    /// </summary>
+    public class PdfEmbeddedView : UserControl
+    {
+        private readonly Image _pageImage;
+
+        private string _pdfPath;
+        private uint _pageCount;
+        private uint _currentIndex;
+        private bool _compressLargePictures;
+        private bool _isPagingBusy;
+        private bool _layoutSizeCommitted;
+
+        /// <summary>页码或可翻页状态变化（用于更新侧栏）。</summary>
+        public event EventHandler PageNavigationStateChanged;
+
+        public PdfEmbeddedView()
+        {
+            MinWidth = 80;
+            MinHeight = 60;
+
+            var grid = new Grid { ClipToBounds = true };
+            _pageImage = new Image
+            {
+                Stretch = Stretch.Uniform,
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center
+            };
+            grid.Children.Add(_pageImage);
+            Content = grid;
+        }
+
+        /// <summary>
+        /// 初始化并显示指定页；由 MainWindow 在 UI 线程创建后调用。
+        /// </summary>
+        /// <param name="initialPageIndex">从 0 开始的页码，超出范围时夹紧到合法区间。</param>
+        public async Task InitializeAsync(string pdfFilePath, uint pageCount, bool compressLargePictures, uint initialPageIndex = 0)
+        {
+            _pdfPath = pdfFilePath ?? throw new ArgumentNullException(nameof(pdfFilePath));
+            _pageCount = pageCount;
+            _compressLargePictures = compressLargePictures;
+            if (_pageCount == 0)
+                _currentIndex = 0;
+            else
+                _currentIndex = initialPageIndex >= _pageCount ? _pageCount - 1 : initialPageIndex;
+
+            await ShowPageAsync(_currentIndex);
+        }
+
+        public string PdfPath => _pdfPath;
+
+        public uint PageCount => _pageCount;
+
+        public uint CurrentPageIndex => _currentIndex;
+
+        public string PageLabelText => _pageCount == 0 ? "" : $"{_currentIndex + 1} / {_pageCount}";
+
+        public bool CanGoPrevious => !_isPagingBusy && _pageCount > 1 && _currentIndex > 0;
+
+        public bool CanGoNext => !_isPagingBusy && _pageCount > 1 && _currentIndex < _pageCount - 1;
+
+        public async Task GoToPreviousPageAsync()
+        {
+            await GoRelativeAsync(-1);
+        }
+
+        public async Task GoToNextPageAsync()
+        {
+            await GoRelativeAsync(1);
+        }
+
+        private void NotifyPageNavigationStateChanged()
+        {
+            PageNavigationStateChanged?.Invoke(this, EventArgs.Empty);
+        }
+
+        private async Task GoRelativeAsync(int delta)
+        {
+            if (_isPagingBusy || _pageCount <= 1)
+                return;
+            int next = (int)_currentIndex + delta;
+            if (next < 0 || next >= _pageCount)
+                return;
+            _currentIndex = (uint)next;
+            await ShowPageAsync(_currentIndex);
+        }
+
+        private async Task ShowPageAsync(uint pageIndex)
+        {
+            _isPagingBusy = true;
+            NotifyPageNavigationStateChanged();
+            try
+            {
+                BitmapSource raw = await PdfWinRtHelper.RenderPageToBitmapSourceAsync(_pdfPath, pageIndex);
+                if (raw == null)
+                    return;
+
+                BitmapSource display = ApplyCompressionIfNeeded(raw);
+                _pageImage.Source = display;
+                if (!_layoutSizeCommitted)
+                {
+                    bool callerSized = !double.IsNaN(Width) && Width > 0 && !double.IsNaN(Height) && Height > 0;
+                    if (!callerSized)
+                    {
+                        Width = display.PixelWidth;
+                        Height = display.PixelHeight;
+                    }
+
+                    _layoutSizeCommitted = true;
+                }
+            }
+            finally
+            {
+                _isPagingBusy = false;
+                NotifyPageNavigationStateChanged();
+            }
+        }
+
+        private BitmapSource ApplyCompressionIfNeeded(BitmapSource rendered)
+        {
+            int width = rendered.PixelWidth;
+            int height = rendered.PixelHeight;
+            if (_compressLargePictures && (width > 1920 || height > 1080))
+            {
+                double scaleX = 1920.0 / width;
+                double scaleY = 1080.0 / height;
+                double scale = Math.Min(scaleX, scaleY);
+                return new TransformedBitmap(rendered, new ScaleTransform(scale, scale));
+            }
+
+            return rendered;
+        }
+    }
+}

Ink Canvas/Controls/PptNavBar.xaml

@@ -0,0 +1,136 @@
+<UserControl x:Class="Ink_Canvas.Controls.PptNavBar"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
+             xmlns:local="clr-namespace:Ink_Canvas.Controls"
+             mc:Ignorable="d"
+             d:DesignHeight="50" d:DesignWidth="200">
+    <UserControl.Resources>
+        <SolidColorBrush x:Key="PptNavBarItemForeground" Color="#71717a"/>
+        <DataTemplate x:Key="PptPreviewItemTemplate">
+            <Grid Margin="2,4">
+                <Border CornerRadius="8" Background="Transparent" Padding="6">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="28"/>
+                            <ColumnDefinition Width="*"/>
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Center"
+                                   FontSize="12" FontWeight="SemiBold"
+                                   Foreground="{DynamicResource PptNavBarItemForeground}"
+                                   Text="{Binding SlideNumber}"/>
+                        <Image Grid.Column="1" Source="{Binding Thumbnail}" Stretch="Uniform"/>
+                    </Grid>
+                </Border>
+            </Grid>
+        </DataTemplate>
+        <Style x:Key="PptPreviewItemContainerStyle" TargetType="ListBoxItem">
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="Padding" Value="0"/>
+            <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="ListBoxItem">
+                        <Border x:Name="Bd" CornerRadius="8" Background="Transparent"
+                                BorderBrush="Transparent" BorderThickness="2">
+                            <ContentPresenter/>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="Bd" Property="Background" Value="#1affffff"/>
+                            </Trigger>
+                            <Trigger Property="IsSelected" Value="True">
+                                <Setter TargetName="Bd" Property="BorderBrush" Value="#66CCFF"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </UserControl.Resources>
+
+    <Border x:Name="RootBorder" BorderThickness="1" BorderBrush="#a1a1aa"
+            Background="#f4f4f5" Opacity="1" CornerRadius="6">
+        <Border.Effect>
+            <DropShadowEffect Color="#000000" BlurRadius="14" ShadowDepth="2" Opacity="0.16"/>
+        </Border.Effect>
+        <DockPanel x:Name="LayoutRoot" LastChildFill="True">
+            <ListBox x:Name="PreviewList"
+                     Visibility="Collapsed"
+                     Background="Transparent" BorderThickness="0"
+                     Padding="6,8,6,4"
+                     HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
+                     ScrollViewer.VerticalScrollBarVisibility="Auto"
+                     ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                     ItemTemplate="{StaticResource PptPreviewItemTemplate}"
+                     ItemContainerStyle="{StaticResource PptPreviewItemContainerStyle}"
+                     MouseUp="PreviewList_MouseUp"/>
+            <ikw:SimpleStackPanel x:Name="ButtonRow" Orientation="Horizontal"
+                                  HorizontalAlignment="Center" VerticalAlignment="Center">
+                <Border x:Name="PreviousButtonBorder" Width="50" Height="50"
+                        MouseDown="PreviousButton_MouseDown"
+                        MouseUp="PreviousButton_MouseUp"
+                        MouseLeave="PreviousButton_MouseLeave"
+                        CornerRadius="5 5 0 0" Background="Transparent">
+                    <Grid>
+                        <Border x:Name="PreviousButtonFeedbackBorder" Margin="3" CornerRadius="5"
+                                Background="#18181b" Opacity="0"/>
+                        <Image Height="28" Width="28">
+                            <Image.Source>
+                                <DrawingImage>
+                                    <DrawingImage.Drawing>
+                                        <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                                            <GeometryDrawing x:Name="PreviousButtonGeometry" Brush="#27272a"/>
+                                        </DrawingGroup>
+                                    </DrawingImage.Drawing>
+                                </DrawingImage>
+                            </Image.Source>
+                        </Image>
+                    </Grid>
+                </Border>
+                <Border x:Name="PageButtonBorder" Visibility="Visible" TextBlock.Foreground="#171717"
+                        MouseDown="PageButton_MouseDown"
+                        MouseUp="PageButton_MouseUp"
+                        MouseLeave="PageButton_MouseLeave"
+                        MinWidth="50" MinHeight="50" Background="Transparent">
+                    <Grid>
+                        <Border x:Name="PageButtonFeedbackBorder" Margin="0,3" CornerRadius="5"
+                                Background="#18181b" Opacity="0"/>
+                        <ikw:SimpleStackPanel VerticalAlignment="Center" Orientation="Vertical"
+                                             Spacing="0.5" Margin="12,0">
+                            <TextBlock x:Name="PageNowText" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                       FontSize="17" FontWeight="Bold" Text="?"/>
+                            <TextBlock x:Name="PageTotalText" HorizontalAlignment="Center" VerticalAlignment="Center"
+                                       FontSize="10" Text="/ ?"/>
+                        </ikw:SimpleStackPanel>
+                    </Grid>
+                </Border>
+                <Border x:Name="NextButtonBorder" Width="50" Height="50"
+                        MouseDown="NextButton_MouseDown"
+                        MouseUp="NextButton_MouseUp"
+                        MouseLeave="NextButton_MouseLeave"
+                        CornerRadius="0 0 5 5" Background="Transparent">
+                    <Grid>
+                        <Border x:Name="NextButtonFeedbackBorder" Margin="3" CornerRadius="5"
+                                Background="#18181b" Opacity="0"/>
+                        <Image VerticalAlignment="Center" HorizontalAlignment="Center" Height="28" Width="28">
+                            <Image.Source>
+                                <DrawingImage>
+                                    <DrawingImage.Drawing>
+                                        <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                                            <GeometryDrawing x:Name="NextButtonGeometry" Brush="#27272a"/>
+                                        </DrawingGroup>
+                                    </DrawingImage.Drawing>
+                                </DrawingImage>
+                            </Image.Source>
+                        </Image>
+                    </Grid>
+                </Border>
+            </ikw:SimpleStackPanel>
+        </DockPanel>
+    </Border>
+</UserControl>

Ink Canvas/Controls/PptNavBar.xaml.cs

@@ -0,0 +1,393 @@
+using System;
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Threading;
+
+namespace Ink_Canvas.Controls
+{
+    /// <summary>
+    /// PPT 翻页 + 增强预览一体化控件。
+    /// 通过 <see cref="Direction"/> 切换底部条 (LB/RB) 与侧边条 (LS/RS) 布局,
+    /// 预览列表内嵌于同一个 Border,展开时占据按钮组之外的剩余空间。
+    /// </summary>
+    public partial class PptNavBar : UserControl
+    {
+        public sealed class PreviewItem
+        {
+            public int SlideNumber { get; set; }
+            public BitmapImage Thumbnail { get; set; }
+        }
+
+        public enum NavDirection
+        {
+            LeftBottom,
+            RightBottom,
+            LeftSide,
+            RightSide
+        }
+
+        public static readonly DependencyProperty DirectionProperty = DependencyProperty.Register(
+            nameof(Direction), typeof(NavDirection), typeof(PptNavBar),
+            new PropertyMetadata(NavDirection.LeftBottom, OnDirectionChanged));
+
+        public static readonly DependencyProperty CurrentSlideProperty = DependencyProperty.Register(
+            nameof(CurrentSlide), typeof(int), typeof(PptNavBar),
+            new PropertyMetadata(0, OnPageChanged));
+
+        public static readonly DependencyProperty TotalSlidesProperty = DependencyProperty.Register(
+            nameof(TotalSlides), typeof(int), typeof(PptNavBar),
+            new PropertyMetadata(0, OnPageChanged));
+
+        public static readonly DependencyProperty PreviewItemsProperty = DependencyProperty.Register(
+            nameof(PreviewItems), typeof(IList<PreviewItem>), typeof(PptNavBar),
+            new PropertyMetadata(null, OnPreviewItemsChanged));
+
+        public static readonly DependencyProperty IsPreviewExpandedProperty = DependencyProperty.Register(
+            nameof(IsPreviewExpanded), typeof(bool), typeof(PptNavBar),
+            new PropertyMetadata(false, OnIsPreviewExpandedChanged));
+
+        public NavDirection Direction
+        {
+            get => (NavDirection)GetValue(DirectionProperty);
+            set => SetValue(DirectionProperty, value);
+        }
+
+        public int CurrentSlide
+        {
+            get => (int)GetValue(CurrentSlideProperty);
+            set => SetValue(CurrentSlideProperty, value);
+        }
+
+        public int TotalSlides
+        {
+            get => (int)GetValue(TotalSlidesProperty);
+            set => SetValue(TotalSlidesProperty, value);
+        }
+
+        public IList<PreviewItem> PreviewItems
+        {
+            get => (IList<PreviewItem>)GetValue(PreviewItemsProperty);
+            set => SetValue(PreviewItemsProperty, value);
+        }
+
+        public bool IsPreviewExpanded
+        {
+            get => (bool)GetValue(IsPreviewExpandedProperty);
+            set => SetValue(IsPreviewExpandedProperty, value);
+        }
+
+        public event EventHandler PreviousClick;
+        public event EventHandler NextClick;
+        public event EventHandler PageClick;
+        public event EventHandler<int> SlideSelected;
+        public event EventHandler PreviousPressedDown;
+        public event EventHandler NextPressedDown;
+        public event EventHandler PressEnded;
+        public event EventHandler<bool> PreviewExpandedChanged;
+
+        // 静态几何（左下/右下：水平箭头；左侧/右侧：垂直箭头）
+        private static readonly Geometry HArrowLeft = Geometry.Parse("F0 M24,24z M0,0z M3.3994,12.9642C2.86687,12.4317,2.86687,11.5683,3.3994,11.0358L9.94485,4.49031C10.4774,3.95777 11.3408,3.95777 11.8733,4.49031 12.4059,5.02284 12.4059,5.88625 11.8733,6.41878L7.65575,10.6364 19.6364,10.6364C20.3895,10.6364 21,11.2469 21,12 21,12.7531 20.3895,13.3636 19.6364,13.3636L7.65575,13.3636 11.8733,17.5812C12.4059,18.1137 12.4059,18.9772 11.8733,19.5097 11.3408,20.0422 10.4774,20.0422 9.94485,19.5097L3.3994,12.9642z");
+        private static readonly Geometry HArrowRight = Geometry.Parse("F0 M24,24z M0,0z M20.6006,12.9642C21.1331,12.4317,21.1331,11.5683,20.6006,11.0358L14.0551,4.49031C13.5226,3.95777 12.6592,3.95777 12.1267,4.49031 11.5941,5.02284 11.5941,5.88625 12.1267,6.41878L16.3443,10.6364 4.36364,10.6364C3.61052,10.6364 3,11.2469 3,12 3,12.7531 3.61052,13.3636 4.36364,13.3636L16.3443,13.3636 12.1267,17.5812C11.5941,18.1137 11.5941,18.9772 12.1267,19.5097 12.6592,20.0422 13.5226,20.0422 14.0551,19.5097L20.6006,12.9642z");
+        private static readonly Geometry VArrowUp = Geometry.Parse("F0 M24,24z M0,0z M11.0357,3.3994C11.5682,2.86687,12.4316,2.86687,12.9641,3.3994L19.5096,9.94485C20.0421,10.4774 20.0421,11.3408 19.5096,11.8733 18.9771,12.4059 18.1137,12.4059 17.5811,11.8733L13.3635,7.65575 13.3635,19.6364C13.3635,20.3895 12.753,21 11.9999,21 11.2468,21 10.6363,20.3895 10.6363,19.6364L10.6363,7.65575 6.41869,11.8733C5.88616,12.4059 5.02275,12.4059 4.49022,11.8733 3.95769,11.3408 3.95769,10.4774 4.49022,9.94485L11.0357,3.3994z");
+        private static readonly Geometry VArrowDown = Geometry.Parse("F0 M24,24z M0,0z M11.0357,20.6006C11.5682,21.1331,12.4316,21.1331,12.9641,20.6006L19.5096,14.0551C20.0421,13.5226 20.0421,12.6592 19.5096,12.1267 18.9771,11.5941 18.1137,11.5941 17.5811,12.1267L13.3635,16.3443 13.3635,4.36364C13.3635,3.61052 12.753,3 11.9999,3 11.2468,3 10.6363,3.61052 10.6363,4.36364L10.6363,16.3443 6.41869,12.1267C5.88616,11.5941 5.02275,11.5941 4.49022,12.1267 3.95769,12.6592 3.95769,13.5226 4.49022,14.0551L11.0357,20.6006z");
+
+        public PptNavBar()
+        {
+            InitializeComponent();
+            ApplyDirection(Direction);
+        }
+
+        private static void OnDirectionChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is PptNavBar bar) bar.ApplyDirection((NavDirection)e.NewValue);
+        }
+
+        private static void OnPageChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is PptNavBar bar) bar.RefreshPageText();
+        }
+
+        private static void OnPreviewItemsChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is PptNavBar bar)
+            {
+                bar.PreviewList.ItemsSource = e.NewValue as IList<PreviewItem>;
+                bar.SyncPreviewSelection();
+            }
+        }
+
+        private static void OnIsPreviewExpandedChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is PptNavBar bar)
+            {
+                bool expanded = (bool)e.NewValue;
+                bar.PreviewList.Visibility = expanded ? Visibility.Visible : Visibility.Collapsed;
+                bar.ApplyLayout();
+                if (expanded)
+                {
+                    bar.SyncPreviewSelection();
+                    bar.HookOutsideClick();
+                }
+                else
+                {
+                    bar.UnhookOutsideClick();
+                }
+                bar.PreviewExpandedChanged?.Invoke(bar, expanded);
+            }
+        }
+
+        private Window _hookedWindow;
+        private void HookOutsideClick()
+        {
+            if (_hookedWindow != null) return;
+            _hookedWindow = Window.GetWindow(this);
+            if (_hookedWindow != null)
+            {
+                _hookedWindow.PreviewMouseDown += OnWindowPreviewMouseDown;
+            }
+        }
+        private void UnhookOutsideClick()
+        {
+            if (_hookedWindow != null)
+            {
+                _hookedWindow.PreviewMouseDown -= OnWindowPreviewMouseDown;
+                _hookedWindow = null;
+            }
+        }
+        private void OnWindowPreviewMouseDown(object sender, MouseButtonEventArgs e)
+        {
+            if (e.OriginalSource is DependencyObject d && !IsDescendantOf(d, this))
+            {
+                IsPreviewExpanded = false;
+            }
+        }
+        private static bool IsDescendantOf(DependencyObject child, DependencyObject ancestor)
+        {
+            while (child != null)
+            {
+                if (ReferenceEquals(child, ancestor)) return true;
+                child = System.Windows.Media.VisualTreeHelper.GetParent(child)
+                        ?? System.Windows.LogicalTreeHelper.GetParent(child);
+            }
+            return false;
+        }
+
+        private void ApplyDirection(NavDirection dir) => ApplyLayout();
+
+        private void ApplyLayout()
+        {
+            var dir = Direction;
+            bool expanded = IsPreviewExpanded;
+
+            // 重置可能在不同状态下被设置的属性
+            ButtonRow.ClearValue(WidthProperty);
+            ButtonRow.ClearValue(HeightProperty);
+            ButtonRow.ClearValue(HorizontalAlignmentProperty);
+            PreviewList.ClearValue(WidthProperty);
+            PreviewList.ClearValue(HeightProperty);
+            PreviewList.ClearValue(MaxHeightProperty);
+            PreviewList.ClearValue(MaxWidthProperty);
+            PreviewList.ClearValue(HorizontalAlignmentProperty);
+            ClearValue(HeightProperty);
+            ClearValue(MaxHeightProperty);
+
+            double availableHeight = ComputeAvailableHeight();
+
+            switch (dir)
+            {
+                case NavDirection.LeftBottom:
+                case NavDirection.RightBottom:
+                    DockPanel.SetDock(PreviewList, Dock.Top);
+                    DockPanel.SetDock(ButtonRow, Dock.Bottom);
+                    ButtonRow.Orientation = Orientation.Horizontal;
+                    ButtonRow.Height = 50;
+                    if (expanded)
+                    {
+                        // 预览面板拉宽到 280,贴向同侧角落
+                        PreviewList.Width = 280;
+                        PreviewList.MaxHeight = Math.Max(200, availableHeight - 50);
+                        PreviewList.HorizontalAlignment = dir == NavDirection.LeftBottom
+                            ? HorizontalAlignment.Left
+                            : HorizontalAlignment.Right;
+                        // 按钮组宽度限制为原始内容宽度,并贴向同侧,保持按钮位置不变
+                        ButtonRow.HorizontalAlignment = dir == NavDirection.LeftBottom
+                            ? HorizontalAlignment.Left
+                            : HorizontalAlignment.Right;
+                    }
+                    else
+                    {
+                        PreviewList.SetBinding(WidthProperty, new System.Windows.Data.Binding(nameof(ButtonRow.ActualWidth)) { Source = ButtonRow });
+                        PreviewList.MaxHeight = 380;
+                    }
+                    PreviousButtonGeometry.Geometry = HArrowLeft;
+                    NextButtonGeometry.Geometry = HArrowRight;
+                    break;
+
+                case NavDirection.LeftSide:
+                    DockPanel.SetDock(PreviewList, Dock.Right);
+                    DockPanel.SetDock(ButtonRow, Dock.Left);
+                    ButtonRow.Orientation = Orientation.Vertical;
+                    ButtonRow.Width = 50;
+                    PreviewList.Width = 240;
+                    PreviewList.MaxHeight = 480;
+                    PreviousButtonGeometry.Geometry = VArrowUp;
+                    NextButtonGeometry.Geometry = VArrowDown;
+                    break;
+                case NavDirection.RightSide:
+                    DockPanel.SetDock(PreviewList, Dock.Left);
+                    DockPanel.SetDock(ButtonRow, Dock.Right);
+                    ButtonRow.Orientation = Orientation.Vertical;
+                    ButtonRow.Width = 50;
+                    PreviewList.Width = 240;
+                    PreviewList.MaxHeight = 480;
+                    PreviousButtonGeometry.Geometry = VArrowUp;
+                    NextButtonGeometry.Geometry = VArrowDown;
+                    break;
+            }
+        }
+
+        private double ComputeAvailableHeight()
+        {
+            var window = Window.GetWindow(this);
+            double h = window != null ? window.ActualHeight : SystemParameters.PrimaryScreenHeight;
+            return Math.Max(240, h - 12);
+        }
+
+        private void RefreshPageText()
+        {
+            if (CurrentSlide > 0 && TotalSlides > 0)
+            {
+                PageNowText.Text = CurrentSlide.ToString();
+                PageTotalText.Text = $"/ {TotalSlides}";
+            }
+            else
+            {
+                PageNowText.Text = "?";
+                PageTotalText.Text = "/ ?";
+            }
+            SyncPreviewSelection();
+        }
+
+        private void SyncPreviewSelection()
+        {
+            if (PreviewItems == null || CurrentSlide <= 0) return;
+            foreach (var item in PreviewItems)
+            {
+                if (item.SlideNumber == CurrentSlide)
+                {
+                    PreviewList.SelectedItem = item;
+                    PreviewList.ScrollIntoView(item);
+                    return;
+                }
+            }
+        }
+
+        private void SetFeedback(Border feedback, double opacity) => feedback.Opacity = opacity;
+
+        private object _lastDown;
+
+        private void PreviousButton_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            _lastDown = sender;
+            SetFeedback(PreviousButtonFeedbackBorder, 0.15);
+            PreviousPressedDown?.Invoke(this, EventArgs.Empty);
+        }
+
+        private void PreviousButton_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            SetFeedback(PreviousButtonFeedbackBorder, 0);
+            PressEnded?.Invoke(this, EventArgs.Empty);
+            if (_lastDown != sender) return;
+            _lastDown = null;
+            PreviousClick?.Invoke(this, EventArgs.Empty);
+        }
+
+        private void PreviousButton_MouseLeave(object sender, MouseEventArgs e)
+        {
+            SetFeedback(PreviousButtonFeedbackBorder, 0);
+            _lastDown = null;
+            PressEnded?.Invoke(this, EventArgs.Empty);
+        }
+
+        private void NextButton_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            _lastDown = sender;
+            SetFeedback(NextButtonFeedbackBorder, 0.15);
+            NextPressedDown?.Invoke(this, EventArgs.Empty);
+        }
+
+        private void NextButton_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            SetFeedback(NextButtonFeedbackBorder, 0);
+            PressEnded?.Invoke(this, EventArgs.Empty);
+            if (_lastDown != sender) return;
+            _lastDown = null;
+            NextClick?.Invoke(this, EventArgs.Empty);
+        }
+
+        private void NextButton_MouseLeave(object sender, MouseEventArgs e)
+        {
+            SetFeedback(NextButtonFeedbackBorder, 0);
+            _lastDown = null;
+            PressEnded?.Invoke(this, EventArgs.Empty);
+        }
+
+        private void PageButton_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            _lastDown = sender;
+            SetFeedback(PageButtonFeedbackBorder, 0.15);
+        }
+
+        private void PageButton_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            SetFeedback(PageButtonFeedbackBorder, 0);
+            if (_lastDown != sender) return;
+            _lastDown = null;
+            PageClick?.Invoke(this, EventArgs.Empty);
+        }
+
+        private void PageButton_MouseLeave(object sender, MouseEventArgs e)
+        {
+            SetFeedback(PageButtonFeedbackBorder, 0);
+            _lastDown = null;
+        }
+
+        private void PreviewList_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            if (PreviewList.SelectedItem is PreviewItem item)
+            {
+                SlideSelected?.Invoke(this, item.SlideNumber);
+            }
+        }
+
+        public void ApplyTheme(bool isDark)
+        {
+            var fgBrush = isDark ? Brushes.White : new SolidColorBrush(Color.FromRgb(39, 39, 42));
+            var feedbackBrush = isDark ? Brushes.White : new SolidColorBrush(Color.FromRgb(24, 24, 27));
+            var bgBrush = isDark
+                ? new SolidColorBrush(Color.FromRgb(39, 39, 42))
+                : new SolidColorBrush(Color.FromRgb(244, 244, 245));
+            var borderBrush = isDark
+                ? new SolidColorBrush(Color.FromRgb(82, 82, 91))
+                : new SolidColorBrush(Color.FromRgb(161, 161, 170));
+
+            PreviousButtonGeometry.Brush = fgBrush;
+            NextButtonGeometry.Brush = fgBrush;
+            PreviousButtonFeedbackBorder.Background = feedbackBrush;
+            NextButtonFeedbackBorder.Background = feedbackBrush;
+            PageButtonFeedbackBorder.Background = feedbackBrush;
+            PageNowText.Foreground = fgBrush;
+            PageTotalText.Foreground = fgBrush;
+            RootBorder.Background = bgBrush;
+            RootBorder.BorderBrush = borderBrush;
+            Resources["PptNavBarItemForeground"] = fgBrush;
+        }
+
+        public void SetPageButtonVisibility(Visibility v) => PageButtonBorder.Visibility = v;
+        public void SetBarOpacity(double opacity) => RootBorder.Opacity = opacity;
+    }
+}

Ink Canvas/Controls/Toolbar/IToolbarHost.cs

@@ -0,0 +1,18 @@
+using System.Windows;
+
+namespace Ink_Canvas.Controls.Toolbar
+{
+    /// <summary>
+    /// 工具栏按钮插件与宿主之间的桥梁。Phase 1 粗粒度暴露 MainWindow，后续收窄。
+    /// </summary>
+    public interface IToolbarHost
+    {
+        MainWindow Window { get; }
+
+        /// <summary>按 id 登记按钮的 view 实例（供 MainWindow 字段回填和互相查找）。</summary>
+        void RegisterView(string id, FrameworkElement view);
+
+        /// <summary>按 id 获取之前注册的 view。不存在返回 null。</summary>
+        FrameworkElement FindView(string id);
+    }
+}

Ink Canvas/Controls/Toolbar/IToolbarItem.cs

@@ -0,0 +1,29 @@
+using System.Windows;
+
+namespace Ink_Canvas.Controls.Toolbar
+{
+    /// <summary>
+    /// 一个工具栏按钮（或任意浮动栏/白板栏条目）的插件化契约。
+    /// 实现类必须有无参构造函数，启动时会被 ToolbarRegistry 反射实例化。
+    /// </summary>
+    public interface IToolbarItem
+    {
+        /// <summary>稳定、唯一的 id，用于持久化用户配置。不要随便改。</summary>
+        string Id { get; }
+
+        ToolbarSlot DefaultSlot { get; }
+
+        /// <summary>同一 slot 内的默认顺序，小的在前。</summary>
+        int DefaultOrder { get; }
+
+        bool DefaultVisible { get; }
+
+        ToolbarInsertPosition DefaultPosition { get; }
+
+        /// <summary>仅当 Position 为 BeforeAnchor/AfterAnchor 时有意义，对应 XAML 里 x:Name。</summary>
+        string DefaultAnchorName { get; }
+
+        /// <summary>构造 UI 元素并接线所有行为。</summary>
+        FrameworkElement BuildView(IToolbarHost host);
+    }
+}

Ink Canvas/Controls/Toolbar/Items/ClearToolItem.cs

@@ -0,0 +1,26 @@
+using System.Windows.Input;
+
+namespace Ink_Canvas.Controls.Toolbar.Items
+{
+    /// <summary>
+    /// 清空按钮。位置：夹在颜色面板与 StackPanelCanvasControls 之间，
+    /// 所以用 BeforeAnchor 锚到 StackPanelCanvasControls。
+    /// </summary>
+    internal sealed class ClearToolItem : ToolbarImageButtonItemBase
+    {
+        public override string Id => "builtin.clear";
+        public override string LocalizationKey => "FloatingBar_Clear";
+        public override ToolbarSlot DefaultSlot => ToolbarSlot.FloatingBarMain;
+        public override int DefaultOrder => 0;
+        public override ToolbarInsertPosition DefaultPosition => ToolbarInsertPosition.BeforeAnchor;
+        public override string DefaultAnchorName => "StackPanelCanvasControls";
+
+        protected override string IconBrushResourceKey => "RedBrush";
+
+        protected override void OnClick(IToolbarHost host, object sender, MouseButtonEventArgs e)
+            => host.Window.SymbolIconDelete_MouseUp(sender, e);
+
+        protected override void AfterBuild(IToolbarHost host, ToolbarImageButton view)
+            => host.Window.AttachSymbolIconDelete(view);
+    }
+}

Ink Canvas/Controls/Toolbar/Items/CursorToolItem.cs

@@ -0,0 +1,18 @@
+using System.Windows.Input;
+
+namespace Ink_Canvas.Controls.Toolbar.Items
+{
+    internal sealed class CursorToolItem : ToolbarImageButtonItemBase
+    {
+        public override string Id => "builtin.cursor";
+        public override string LocalizationKey => "FloatingBar_Mouse";
+        public override ToolbarSlot DefaultSlot => ToolbarSlot.FloatingBarMain;
+        public override int DefaultOrder => 100;
+
+        protected override void OnClick(IToolbarHost host, object sender, MouseButtonEventArgs e)
+            => host.Window.CursorIcon_Click(sender, e);
+
+        protected override void AfterBuild(IToolbarHost host, ToolbarImageButton view)
+            => host.Window.AttachCursorIconView(view);
+    }
+}

Ink Canvas/Controls/Toolbar/Items/CursorWithDelToolItem.cs

@@ -0,0 +1,19 @@
+using System.Windows.Input;
+
+namespace Ink_Canvas.Controls.Toolbar.Items
+{
+    internal sealed class CursorWithDelToolItem : ToolbarImageButtonItemBase
+    {
+        public override string Id => "builtin.cursorWithDel";
+        public override string LocalizationKey => "FloatingBar_ClearAndMouse";
+        public override ToolbarSlot DefaultSlot => ToolbarSlot.FloatingBarCanvasControls;
+        public override int DefaultOrder => 320;
+        public override ToolbarInsertPosition DefaultPosition => ToolbarInsertPosition.Append;
+
+        protected override void OnClick(IToolbarHost host, object sender, MouseButtonEventArgs e)
+            => host.Window.CursorWithDelIcon_Click(sender, e);
+
+        protected override void AfterBuild(IToolbarHost host, ToolbarImageButton view)
+            => host.Window.AttachCursorWithDelBtn(view);
+    }
+}

Ink Canvas/Controls/Toolbar/Items/EraserByStrokesToolItem.cs

@@ -0,0 +1,18 @@
+using System.Windows.Input;
+
+namespace Ink_Canvas.Controls.Toolbar.Items
+{
+    internal sealed class EraserByStrokesToolItem : ToolbarImageButtonItemBase
+    {
+        public override string Id => "builtin.eraserByStrokes";
+        public override string LocalizationKey => "FloatingBar_StrokeEraser";
+        public override ToolbarSlot DefaultSlot => ToolbarSlot.FloatingBarCanvasControls;
+        public override int DefaultOrder => 110;
+
+        protected override void OnClick(IToolbarHost host, object sender, MouseButtonEventArgs e)
+            => host.Window.EraserIconByStrokes_Click(sender, e);
+
+        protected override void AfterBuild(IToolbarHost host, ToolbarImageButton view)
+            => host.Window.AttachEraserByStrokesIcon(view);
+    }
+}

Ink Canvas/Controls/Toolbar/Items/EraserToolItem.cs

@@ -0,0 +1,18 @@
+using System.Windows.Input;
+
+namespace Ink_Canvas.Controls.Toolbar.Items
+{
+    internal sealed class EraserToolItem : ToolbarImageButtonItemBase
+    {
+        public override string Id => "builtin.eraser";
+        public override string LocalizationKey => "FloatingBar_AreaEraser";
+        public override ToolbarSlot DefaultSlot => ToolbarSlot.FloatingBarCanvasControls;
+        public override int DefaultOrder => 100;
+
+        protected override void OnClick(IToolbarHost host, object sender, MouseButtonEventArgs e)
+            => host.Window.EraserIcon_Click(sender, e);
+
+        protected override void AfterBuild(IToolbarHost host, ToolbarImageButton view)
+            => host.Window.AttachEraserIcon(view);
+    }
+}

Ink Canvas/Controls/Toolbar/Items/FoldToolItem.cs

@@ -0,0 +1,20 @@
+using System.Windows.Input;
+
+namespace Ink_Canvas.Controls.Toolbar.Items
+{
+    internal sealed class FoldToolItem : ToolbarImageButtonItemBase
+    {
+        public override string Id => "builtin.fold";
+        public override string LocalizationKey => "FloatingBar_Hide";
+        public override ToolbarSlot DefaultSlot => ToolbarSlot.FloatingBarEnd;
+        public override int DefaultOrder => 120;
+        public override ToolbarInsertPosition DefaultPosition => ToolbarInsertPosition.AfterAnchor;
+        public override string DefaultAnchorName => "FloatingBarEndSeparator";
+
+        protected override void OnClick(IToolbarHost host, object sender, MouseButtonEventArgs e)
+            => host.Window.FoldFloatingBar_MouseUp(sender, e);
+
+        protected override void AfterBuild(IToolbarHost host, ToolbarImageButton view)
+            => host.Window.AttachFoldIcon(view);
+    }
+}

Ink Canvas/Controls/Toolbar/Items/PenToolItem.cs

@@ -0,0 +1,18 @@
+using System.Windows.Input;
+
+namespace Ink_Canvas.Controls.Toolbar.Items
+{
+    internal sealed class PenToolItem : ToolbarImageButtonItemBase
+    {
+        public override string Id => "builtin.pen";
+        public override string LocalizationKey => "FloatingBar_Annotate";
+        public override ToolbarSlot DefaultSlot => ToolbarSlot.FloatingBarMain;
+        public override int DefaultOrder => 110;
+
+        protected override void OnClick(IToolbarHost host, object sender, MouseButtonEventArgs e)
+            => host.Window.PenIcon_Click(sender, e);
+
+        protected override void AfterBuild(IToolbarHost host, ToolbarImageButton view)
+            => host.Window.AttachPenIconView(view);
+    }
+}

Ink Canvas/Controls/Toolbar/Items/RedoToolItem.cs

@@ -0,0 +1,23 @@
+using System.Windows.Input;
+
+namespace Ink_Canvas.Controls.Toolbar.Items
+{
+    internal sealed class RedoToolItem : ToolbarImageButtonItemBase
+    {
+        public override string Id => "builtin.redo";
+        public override string LocalizationKey => "Board_Redo";
+        public override ToolbarSlot DefaultSlot => ToolbarSlot.FloatingBarCanvasControls;
+        public override int DefaultOrder => 310;
+        public override ToolbarInsertPosition DefaultPosition => ToolbarInsertPosition.Append;
+
+        protected override void OnClick(IToolbarHost host, object sender, MouseButtonEventArgs e)
+            => host.Window.SymbolIconRedo_MouseUp(sender, e);
+
+        protected override void AfterBuild(IToolbarHost host, ToolbarImageButton view)
+        {
+            host.Window.AttachSymbolIconRedo(view);
+            view.SetBinding(System.Windows.UIElement.IsEnabledProperty,
+                new System.Windows.Data.Binding("IsEnabled") { ElementName = "BtnRedo" });
+        }
+    }
+}

Ink Canvas/Controls/Toolbar/Items/SelectToolItem.cs

@@ -0,0 +1,18 @@
+using System.Windows.Input;
+
+namespace Ink_Canvas.Controls.Toolbar.Items
+{
+    internal sealed class SelectToolItem : ToolbarImageButtonItemBase
+    {
+        public override string Id => "builtin.select";
+        public override string LocalizationKey => "FloatingBar_LassoSelect";
+        public override ToolbarSlot DefaultSlot => ToolbarSlot.FloatingBarCanvasControls;
+        public override int DefaultOrder => 120;
+
+        protected override void OnClick(IToolbarHost host, object sender, MouseButtonEventArgs e)
+            => host.Window.SymbolIconSelect_MouseUp(sender, e);
+
+        protected override void AfterBuild(IToolbarHost host, ToolbarImageButton view)
+            => host.Window.AttachSymbolIconSelect(view);
+    }
+}

Ink Canvas/Controls/Toolbar/Items/ShapeDrawToolItem.cs

@@ -0,0 +1,18 @@
+using System.Windows.Input;
+
+namespace Ink_Canvas.Controls.Toolbar.Items
+{
+    internal sealed class ShapeDrawToolItem : ToolbarImageButtonItemBase
+    {
+        public override string Id => "builtin.shapeDraw";
+        public override string LocalizationKey => "FloatingBar_Geometry";
+        public override ToolbarSlot DefaultSlot => ToolbarSlot.FloatingBarCanvasControls;
+        public override int DefaultOrder => 130;
+
+        protected override void OnClick(IToolbarHost host, object sender, MouseButtonEventArgs e)
+            => host.Window.ImageDrawShape_MouseUp(sender, e);
+
+        protected override void AfterBuild(IToolbarHost host, ToolbarImageButton view)
+            => host.Window.AttachShapeDrawBtn(view);
+    }
+}

Ink Canvas/Controls/Toolbar/Items/ToolbarImageButtonItemBase.cs

@@ -0,0 +1,47 @@
+using Ink_Canvas.Properties;
+using System;
+using System.Windows;
+using System.Windows.Input;
+using System.Windows.Media;
+
+namespace Ink_Canvas.Controls.Toolbar.Items
+{
+    /// <summary>
+    /// 通用 ToolbarImageButton 工具栏条目基类——大幅减少每个按钮的样板代码。
+    /// 派生类通常只需给 Id / 本地化键 / Slot / Order / 点击处理 / Attach 回填。
+    /// </summary>
+    internal abstract class ToolbarImageButtonItemBase : IToolbarItem
+    {
+        public abstract string Id { get; }
+        public abstract string LocalizationKey { get; }
+        public abstract ToolbarSlot DefaultSlot { get; }
+        public abstract int DefaultOrder { get; }
+        public virtual bool DefaultVisible => true;
+        public virtual ToolbarInsertPosition DefaultPosition => ToolbarInsertPosition.Prepend;
+        public virtual string DefaultAnchorName => null;
+
+        /// <summary>DynamicResource 名称，用于 IconBrush。默认为 null（使用控件自带前景色）。</summary>
+        protected virtual string IconBrushResourceKey => null;
+
+        protected abstract void OnClick(IToolbarHost host, object sender, MouseButtonEventArgs e);
+
+        /// <summary>构建后调用，用于回填 MainWindow 的原命名属性（partial 扩展里的 Attach*）。可选。</summary>
+        protected virtual void AfterBuild(IToolbarHost host, ToolbarImageButton view) { }
+
+        public FrameworkElement BuildView(IToolbarHost host)
+        {
+            var btn = new ToolbarImageButton
+            {
+                Label = Strings.GetString(LocalizationKey) ?? LocalizationKey
+            };
+            if (!string.IsNullOrEmpty(IconBrushResourceKey))
+            {
+                if (btn.TryFindResource(IconBrushResourceKey) is Brush brush) btn.IconBrush = brush;
+                else btn.SetResourceReference(ToolbarImageButton.IconBrushProperty, IconBrushResourceKey);
+            }
+            btn.ButtonMouseUp += (s, e) => OnClick(host, s, e);
+            AfterBuild(host, btn);
+            return btn;
+        }
+    }
+}

Ink Canvas/Controls/Toolbar/Items/ToolsToolItem.cs

@@ -0,0 +1,20 @@
+using System.Windows.Input;
+
+namespace Ink_Canvas.Controls.Toolbar.Items
+{
+    internal sealed class ToolsToolItem : ToolbarImageButtonItemBase
+    {
+        public override string Id => "builtin.tools";
+        public override string LocalizationKey => "Board_Tools";
+        public override ToolbarSlot DefaultSlot => ToolbarSlot.FloatingBarEnd;
+        public override int DefaultOrder => 110;
+        public override ToolbarInsertPosition DefaultPosition => ToolbarInsertPosition.AfterAnchor;
+        public override string DefaultAnchorName => "FloatingBarEndSeparator";
+
+        protected override void OnClick(IToolbarHost host, object sender, MouseButtonEventArgs e)
+            => host.Window.SymbolIconTools_MouseUp(sender, e);
+
+        protected override void AfterBuild(IToolbarHost host, ToolbarImageButton view)
+            => host.Window.AttachToolsBtn(view);
+    }
+}

Ink Canvas/Controls/Toolbar/Items/UndoToolItem.cs

@@ -0,0 +1,23 @@
+using System.Windows.Input;
+
+namespace Ink_Canvas.Controls.Toolbar.Items
+{
+    internal sealed class UndoToolItem : ToolbarImageButtonItemBase
+    {
+        public override string Id => "builtin.undo";
+        public override string LocalizationKey => "Board_Undo";
+        public override ToolbarSlot DefaultSlot => ToolbarSlot.FloatingBarCanvasControls;
+        public override int DefaultOrder => 300;
+        public override ToolbarInsertPosition DefaultPosition => ToolbarInsertPosition.Append;
+
+        protected override void OnClick(IToolbarHost host, object sender, MouseButtonEventArgs e)
+            => host.Window.SymbolIconUndo_MouseUp(sender, e);
+
+        protected override void AfterBuild(IToolbarHost host, ToolbarImageButton view)
+        {
+            host.Window.AttachSymbolIconUndo(view);
+            view.SetBinding(System.Windows.UIElement.IsEnabledProperty,
+                new System.Windows.Data.Binding("IsEnabled") { ElementName = "BtnUndo" });
+        }
+    }
+}

Ink Canvas/Controls/Toolbar/Items/WhiteboardToolItem.cs

@@ -0,0 +1,20 @@
+using System.Windows.Input;
+
+namespace Ink_Canvas.Controls.Toolbar.Items
+{
+    internal sealed class WhiteboardToolItem : ToolbarImageButtonItemBase
+    {
+        public override string Id => "builtin.whiteboard";
+        public override string LocalizationKey => "FloatingBar_Whiteboard";
+        public override ToolbarSlot DefaultSlot => ToolbarSlot.FloatingBarEnd;
+        public override int DefaultOrder => 100;
+        public override ToolbarInsertPosition DefaultPosition => ToolbarInsertPosition.AfterAnchor;
+        public override string DefaultAnchorName => "FloatingBarEndSeparator";
+
+        protected override void OnClick(IToolbarHost host, object sender, MouseButtonEventArgs e)
+            => host.Window.ImageBlackboard_MouseUp(sender, e);
+
+        protected override void AfterBuild(IToolbarHost host, ToolbarImageButton view)
+            => host.Window.AttachWhiteboardBtn(view);
+    }
+}

Ink Canvas/Controls/Toolbar/ToolbarHost.cs

@@ -0,0 +1,34 @@
+using System.Collections.Generic;
+using System.Windows;
+
+namespace Ink_Canvas.Controls.Toolbar
+{
+    /// <summary>
+    /// MainWindow 版的 IToolbarHost 实现。Phase 1 直接把 MainWindow 引用暴露给插件，
+    /// 插件可通过 host.Window 访问私有/内部成员（partial class 扩展或 internal 字段）。
+    /// 后续阶段逐步把具体行为抽成 Host 上的方法/事件，收窄这个接口。
+    /// </summary>
+    public sealed class ToolbarHost : IToolbarHost
+    {
+        private readonly Dictionary<string, FrameworkElement> _views = new Dictionary<string, FrameworkElement>();
+
+        public ToolbarHost(MainWindow window)
+        {
+            Window = window;
+        }
+
+        public MainWindow Window { get; }
+
+        public void RegisterView(string id, FrameworkElement view)
+        {
+            if (string.IsNullOrEmpty(id) || view == null) return;
+            _views[id] = view;
+        }
+
+        public FrameworkElement FindView(string id)
+        {
+            if (string.IsNullOrEmpty(id)) return null;
+            return _views.TryGetValue(id, out var v) ? v : null;
+        }
+    }
+}

Ink Canvas/Controls/Toolbar/ToolbarInsertPosition.cs

@@ -0,0 +1,14 @@
+namespace Ink_Canvas.Controls.Toolbar
+{
+    public enum ToolbarInsertPosition
+    {
+        /// <summary>从容器头部依次插入；Order 小的在前。</summary>
+        Prepend,
+        /// <summary>追加到容器末尾。</summary>
+        Append,
+        /// <summary>插入到由 AnchorName 指定的已有元素之前。</summary>
+        BeforeAnchor,
+        /// <summary>插入到由 AnchorName 指定的已有元素之后（同一锚点多项按 Order 依次排列）。</summary>
+        AfterAnchor
+    }
+}

Ink Canvas/Controls/Toolbar/ToolbarItemConfig.cs

@@ -0,0 +1,33 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+namespace Ink_Canvas.Controls.Toolbar
+{
+    /// <summary>
+    /// 单个工具栏按钮的用户配置（可见性、顺序、所属 slot、插入位置）。
+    /// 由 Settings.Toolbar 持久化。
+    /// </summary>
+    public class ToolbarItemConfig
+    {
+        [JsonProperty("visible")]
+        public bool Visible { get; set; } = true;
+
+        [JsonProperty("order")]
+        public int Order { get; set; }
+
+        [JsonProperty("slot")]
+        public ToolbarSlot Slot { get; set; } = ToolbarSlot.FloatingBarMain;
+
+        [JsonProperty("position")]
+        public ToolbarInsertPosition Position { get; set; } = ToolbarInsertPosition.Prepend;
+
+        [JsonProperty("anchorName")]
+        public string AnchorName { get; set; }
+    }
+
+    public class ToolbarLayoutSettings
+    {
+        [JsonProperty("items")]
+        public Dictionary<string, ToolbarItemConfig> Items { get; set; } = new Dictionary<string, ToolbarItemConfig>();
+    }
+}

Ink Canvas/Controls/Toolbar/ToolbarRegistry.cs

@@ -0,0 +1,161 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Windows;
+using System.Windows.Controls;
+using Ink_Canvas.Helpers;
+
+namespace Ink_Canvas.Controls.Toolbar
+{
+    /// <summary>
+    /// 扫描当前程序集里的 IToolbarItem 实现，按用户配置（Settings.Toolbar）排序/过滤后注入到目标容器。
+    /// </summary>
+    public static class ToolbarRegistry
+    {
+        private static List<IToolbarItem> _items;
+
+        public static IReadOnlyList<IToolbarItem> Discover()
+        {
+            if (_items != null) return _items;
+
+            var itemType = typeof(IToolbarItem);
+            _items = Assembly.GetExecutingAssembly()
+                .GetTypes()
+                .Where(t => !t.IsAbstract && !t.IsInterface && itemType.IsAssignableFrom(t))
+                .Select(t =>
+                {
+                    try { return (IToolbarItem)Activator.CreateInstance(t); }
+                    catch (Exception ex)
+                    {
+                        LogHelper.WriteLogToFile($"ToolbarRegistry: 实例化 {t.FullName} 失败: {ex.Message}", LogHelper.LogType.Warning);
+                        return null;
+                    }
+                })
+                .Where(i => i != null)
+                .ToList();
+            return _items;
+        }
+
+        /// <summary>按 slot 分配工具栏条目到对应容器。调用者负责清空目标容器里要被接管的旧内容。</summary>
+        public static void Populate(IToolbarHost host, IDictionary<ToolbarSlot, Panel> slots, ToolbarLayoutSettings layout)
+        {
+            if (host == null || slots == null) return;
+            layout = layout ?? new ToolbarLayoutSettings();
+
+            var grouped = new Dictionary<ToolbarSlot, List<(IToolbarItem item, ToolbarItemConfig cfg)>>();
+            foreach (var item in Discover())
+            {
+                if (!layout.Items.TryGetValue(item.Id, out var cfg))
+                {
+                    cfg = new ToolbarItemConfig
+                    {
+                        Visible = item.DefaultVisible,
+                        Order = item.DefaultOrder,
+                        Slot = item.DefaultSlot,
+                        Position = item.DefaultPosition,
+                        AnchorName = item.DefaultAnchorName
+                    };
+                }
+                if (!cfg.Visible) continue;
+                if (!grouped.TryGetValue(cfg.Slot, out var list))
+                {
+                    list = new List<(IToolbarItem, ToolbarItemConfig)>();
+                    grouped[cfg.Slot] = list;
+                }
+                list.Add((item, cfg));
+            }
+
+            foreach (var kv in grouped)
+            {
+                if (!slots.TryGetValue(kv.Key, out var container) || container == null) continue;
+                InjectIntoContainer(host, container, kv.Value);
+            }
+        }
+
+        private static void InjectIntoContainer(IToolbarHost host, Panel container,
+            List<(IToolbarItem item, ToolbarItemConfig cfg)> entries)
+        {
+            // 按 Position 分桶，每桶内按 Order 升序。
+            var prepend = entries.Where(e => e.cfg.Position == ToolbarInsertPosition.Prepend).OrderBy(e => e.cfg.Order).ToList();
+            var append = entries.Where(e => e.cfg.Position == ToolbarInsertPosition.Append).OrderBy(e => e.cfg.Order).ToList();
+            var before = entries.Where(e => e.cfg.Position == ToolbarInsertPosition.BeforeAnchor).ToList();
+            var after = entries.Where(e => e.cfg.Position == ToolbarInsertPosition.AfterAnchor).ToList();
+
+            var prependIndex = 0;
+            foreach (var entry in prepend)
+            {
+                var view = BuildAndRegister(host, entry.item);
+                if (view == null) continue;
+                container.Children.Insert(prependIndex++, view);
+            }
+
+            foreach (var entry in append)
+            {
+                var view = BuildAndRegister(host, entry.item);
+                if (view == null) continue;
+                container.Children.Add(view);
+            }
+
+            foreach (var group in before.GroupBy(e => e.cfg.AnchorName))
+            {
+                var anchor = FindNamedChild(container, group.Key);
+                if (anchor == null)
+                {
+                    LogHelper.WriteLogToFile($"ToolbarRegistry: 未找到锚点 '{group.Key}' (BeforeAnchor)", LogHelper.LogType.Warning);
+                    continue;
+                }
+                var idx = container.Children.IndexOf(anchor);
+                foreach (var entry in group.OrderBy(e => e.cfg.Order))
+                {
+                    var view = BuildAndRegister(host, entry.item);
+                    if (view == null) continue;
+                    container.Children.Insert(idx++, view);
+                }
+            }
+
+            foreach (var group in after.GroupBy(e => e.cfg.AnchorName))
+            {
+                var anchor = FindNamedChild(container, group.Key);
+                if (anchor == null)
+                {
+                    LogHelper.WriteLogToFile($"ToolbarRegistry: 未找到锚点 '{group.Key}' (AfterAnchor)", LogHelper.LogType.Warning);
+                    continue;
+                }
+                var idx = container.Children.IndexOf(anchor) + 1;
+                foreach (var entry in group.OrderBy(e => e.cfg.Order))
+                {
+                    var view = BuildAndRegister(host, entry.item);
+                    if (view == null) continue;
+                    container.Children.Insert(idx++, view);
+                }
+            }
+        }
+
+        private static UIElement FindNamedChild(Panel container, string name)
+        {
+            if (string.IsNullOrEmpty(name)) return null;
+            foreach (UIElement child in container.Children)
+            {
+                if (child is FrameworkElement fe && fe.Name == name) return child;
+            }
+            return null;
+        }
+
+        private static FrameworkElement BuildAndRegister(IToolbarHost host, IToolbarItem item)
+        {
+            try
+            {
+                var view = item.BuildView(host);
+                if (view == null) return null;
+                host.RegisterView(item.Id, view);
+                return view;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"ToolbarRegistry: 构建 {item.Id} 失败: {ex.Message}", LogHelper.LogType.Warning);
+                return null;
+            }
+        }
+    }
+}

Ink Canvas/Controls/Toolbar/ToolbarSlot.cs

@@ -0,0 +1,11 @@
+namespace Ink_Canvas.Controls.Toolbar
+{
+    public enum ToolbarSlot
+    {
+        FloatingBarMain,
+        FloatingBarCanvasControls,
+        FloatingBarEnd,
+        BlackboardLeft,
+        BlackboardRight
+    }
+}

Ink Canvas/Helpers/AnimationsHelper.cs

@@ -2,11 +2,22 @@ using System;
 using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
+using Ink_Canvas.Controls;
 
 namespace Ink_Canvas.Helpers
 {
     internal class AnimationsHelper
     {
+        private static UIElement ResolveAnimationTarget(UIElement element)
+        {
+            if (element is BoardMenuFrame frame)
+            {
+                frame.ApplyTemplate();
+                return frame.AnimationTarget ?? element;
+            }
+            return element;
+        }
+
         public static void ShowWithFadeIn(UIElement element, double duration = 0.15)
         {
             if (element.Visibility == Visibility.Visible) return;
@@ -36,14 +47,17 @@ namespace Ink_Canvas.Helpers
         {
             try
             {
-                if (element.Visibility == Visibility.Visible) return;
-
                 if (element == null)
                     throw new ArgumentNullException(nameof(element));
 
+                if (element.Visibility == Visibility.Visible) return;
+
+                element.Visibility = Visibility.Visible;
+
+                var target = ResolveAnimationTarget(element);
+
                 var sb = new Storyboard();
 
-                // 渐变动画
                 var fadeInAnimation = new DoubleAnimation
                 {
                     From = 0.5,
@@ -54,10 +68,9 @@ namespace Ink_Canvas.Helpers
 
                 Storyboard.SetTargetProperty(fadeInAnimation, new PropertyPath(UIElement.OpacityProperty));
 
-                // 滑动动画
                 var slideAnimation = new DoubleAnimation
                 {
-                    From = element.RenderTransform.Value.OffsetY + 10, // 滑动距离
+                    From = 10,
                     To = 0,
                     Duration = TimeSpan.FromSeconds(duration)
                 };
@@ -68,10 +81,9 @@ namespace Ink_Canvas.Helpers
                 sb.Children.Add(fadeInAnimation);
                 sb.Children.Add(slideAnimation);
 
-                element.Visibility = Visibility.Visible;
-                element.RenderTransform = new TranslateTransform();
+                target.RenderTransform = new TranslateTransform();
 
-                sb.Begin((FrameworkElement)element);
+                sb.Begin((FrameworkElement)target);
             }
             catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
         }
@@ -207,14 +219,15 @@ namespace Ink_Canvas.Helpers
         {
             try
             {
-                if (element.Visibility == Visibility.Collapsed) return;
-
                 if (element == null)
                     throw new ArgumentNullException(nameof(element));
 
+                if (element.Visibility == Visibility.Collapsed) return;
+
+                var target = ResolveAnimationTarget(element);
+
                 var sb = new Storyboard();
 
-                // 渐变动画
                 var fadeOutAnimation = new DoubleAnimation
                 {
                     From = 1,
@@ -224,11 +237,10 @@ namespace Ink_Canvas.Helpers
                 fadeOutAnimation.EasingFunction = new CubicEase();
                 Storyboard.SetTargetProperty(fadeOutAnimation, new PropertyPath(UIElement.OpacityProperty));
 
-                // 滑动动画
                 var slideAnimation = new DoubleAnimation
                 {
                     From = 0,
-                    To = element.RenderTransform.Value.OffsetY + 10, // 滑动距离
+                    To = 10,
                     Duration = TimeSpan.FromSeconds(duration)
                 };
                 slideAnimation.EasingFunction = new CubicEase();
@@ -243,8 +255,8 @@ namespace Ink_Canvas.Helpers
                     element.Visibility = Visibility.Collapsed;
                 };
 
-                element.RenderTransform = new TranslateTransform();
-                sb.Begin((FrameworkElement)element);
+                target.RenderTransform = new TranslateTransform();
+                sb.Begin((FrameworkElement)target);
             }
             catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
         }

Ink Canvas/Helpers/AppRestartHelper.cs

@@ -0,0 +1,113 @@
+using Ink_Canvas.Windows.SettingsViews.Helpers;
+using System;
+using System.Diagnostics;
+using System.Security.Principal;
+using System.Windows;
+
+namespace Ink_Canvas.Helpers
+{
+    public static class AppRestartHelper
+    {
+        public static bool IsRunningAsAdmin()
+        {
+            try
+            {
+                var identity = WindowsIdentity.GetCurrent();
+                var principal = new WindowsPrincipal(identity);
+                return principal.IsInRole(WindowsBuiltInRole.Administrator);
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        public static void RestartApp(bool asAdmin)
+        {
+            try
+            {
+                App.IsAppExitByUser = true;
+
+                (Application.Current as App)?.ReleaseMutexForRestart();
+
+                string exePath = Process.GetCurrentProcess().MainModule.FileName;
+
+                if (asAdmin)
+                {
+                    var psi = new ProcessStartInfo(exePath) { UseShellExecute = true, Verb = "runas" };
+                    Process.Start(psi);
+                }
+                else
+                {
+                    // 当前已是管理员时，直接通过用户令牌降权启动，避免经由 explorer 中转的延迟
+                    if (IsRunningAsAdmin() && UIAccessHelper.RestartAsNormalUser())
+                    {
+                        Application.Current.Shutdown();
+                        return;
+                    }
+
+                    Process.Start("explorer.exe", "\"" + exePath + "\"");
+                }
+
+                Application.Current.Shutdown();
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"重启应用时出错: {ex.Message}");
+            }
+        }
+
+        public static void RestartWithCurrentPrivileges()
+        {
+            RestartApp(IsRunningAsAdmin());
+        }
+
+        public static void RestartAsAdmin()
+        {
+            RestartApp(true);
+        }
+
+        public static void RestartAsNormal()
+        {
+            RestartApp(false);
+        }
+
+        public static void SwitchToUIATopMostAndRestart()
+        {
+            try
+            {
+                SettingsManager.Settings.Advanced.EnableUIAccessTopMost = true;
+
+                if (!SettingsManager.Settings.Advanced.IsAlwaysOnTop)
+                {
+                    SettingsManager.Settings.Advanced.IsAlwaysOnTop = true;
+                }
+
+                SettingsManager.SaveSettingsToFile();
+
+                App.IsUIAccessTopMostEnabled = true;
+                RestartApp(true);
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"切换到UIA置顶模式时出错: {ex.Message}");
+            }
+        }
+
+        public static void SwitchToNormalTopMostAndRestart()
+        {
+            try
+            {
+                SettingsManager.Settings.Advanced.EnableUIAccessTopMost = false;
+                SettingsManager.SaveSettingsToFile();
+
+                App.IsUIAccessTopMostEnabled = false;
+                RestartApp(IsRunningAsAdmin());
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"切换到普通置顶模式时出错: {ex.Message}");
+            }
+        }
+    }
+}

Ink Canvas/Helpers/AutoUpdateHelper.cs

@@ -27,6 +27,37 @@ namespace Ink_Canvas.Helpers
         private static readonly string updatesFolderPath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "AutoUpdate");
         private static string statusFilePath;
 
+        // 全局下载取消令牌；UI 通过 RequestCancelDownload 取消当前下载
+        private static CancellationTokenSource _activeDownloadCts;
+        private static readonly object _activeDownloadLock = new object();
+
+        public static void RequestCancelDownload()
+        {
+            lock (_activeDownloadLock)
+            {
+                try { _activeDownloadCts?.Cancel(); } catch { }
+            }
+        }
+
+        private static CancellationTokenSource BeginDownloadSession()
+        {
+            lock (_activeDownloadLock)
+            {
+                try { _activeDownloadCts?.Cancel(); } catch { }
+                _activeDownloadCts = new CancellationTokenSource();
+                return _activeDownloadCts;
+            }
+        }
+
+        private static void EndDownloadSession(CancellationTokenSource cts)
+        {
+            lock (_activeDownloadLock)
+            {
+                if (ReferenceEquals(_activeDownloadCts, cts)) _activeDownloadCts = null;
+            }
+            try { cts?.Dispose(); } catch { }
+        }
+
         public static bool IsX64UpdatePackageSelected()
         {
             try
@@ -383,6 +414,8 @@ namespace Ink_Canvas.Helpers
         // 获取所有可用线路组，按延迟排序
         public static async Task<List<UpdateLineGroup>> GetAvailableLineGroupsOrdered(UpdateChannel channel)
         {
+            var cached = TryGetCachedOrderedGroups(channel);
+            if (cached != null) return cached;
             var groups = ChannelLineGroups[channel];
             var availableGroups = new List<(UpdateLineGroup group, long delay)>();
 
@@ -468,9 +501,46 @@ namespace Ink_Canvas.Helpers
                 LogHelper.WriteLogToFile("AutoUpdate | 所有线路组均不可用", LogHelper.LogType.Error);
             }
 
+            CacheOrderedGroups(channel, orderedGroups);
             return orderedGroups;
         }
 
+        // 缓存按延迟排序后的线路组，避免短时间内重复测速
+        private static readonly Dictionary<UpdateChannel, (List<UpdateLineGroup> groups, DateTime cachedAt)> _orderedGroupsCache
+            = new Dictionary<UpdateChannel, (List<UpdateLineGroup>, DateTime)>();
+        private static readonly TimeSpan _orderedGroupsCacheTtl = TimeSpan.FromMinutes(15);
+
+        private static List<UpdateLineGroup> TryGetCachedOrderedGroups(UpdateChannel channel)
+        {
+            lock (_orderedGroupsCache)
+            {
+                if (_orderedGroupsCache.TryGetValue(channel, out var entry) &&
+                    entry.groups != null && entry.groups.Count > 0 &&
+                    DateTime.UtcNow - entry.cachedAt < _orderedGroupsCacheTtl)
+                {
+                    LogHelper.WriteLogToFile($"AutoUpdate | 复用线路组延迟检测缓存（{entry.groups.Count} 个）");
+                    return new List<UpdateLineGroup>(entry.groups);
+                }
+                return null;
+            }
+        }
+
+        private static void CacheOrderedGroups(UpdateChannel channel, List<UpdateLineGroup> groups)
+        {
+            lock (_orderedGroupsCache)
+            {
+                _orderedGroupsCache[channel] = (new List<UpdateLineGroup>(groups), DateTime.UtcNow);
+            }
+        }
+
+        public static void InvalidateOrderedGroupsCache()
+        {
+            lock (_orderedGroupsCache)
+            {
+                _orderedGroupsCache.Clear();
+            }
+        }
+
         private static async Task<long> GetDownloadUrlDelay(string url)
         {
             try
@@ -945,6 +1015,7 @@ namespace Ink_Canvas.Helpers
         // 使用多线路组下载新版（支持自动切换）
         public static async Task<bool> DownloadSetupFileWithFallback(string version, List<UpdateLineGroup> groups, Action<double, string> progressCallback = null)
         {
+            var session = BeginDownloadSession();
             try
             {
                 version = NormalizeVersionForUpdate(version);
@@ -979,8 +1050,19 @@ namespace Ink_Canvas.Helpers
                 }
 
                 // 依次尝试每个线路组
+                CancellationToken groupLoopToken;
+                lock (_activeDownloadLock)
+                {
+                    groupLoopToken = _activeDownloadCts?.Token ?? CancellationToken.None;
+                }
                 foreach (var group in groups)
                 {
+                    if (groupLoopToken.IsCancellationRequested)
+                    {
+                        LogHelper.WriteLogToFile("AutoUpdate | 用户已取消，停止尝试后续线路组");
+                        break;
+                    }
+
                     string url = string.Format(group.DownloadUrlFormat, version);
                     url = AppendX64SuffixBeforeZipExtension(url);
                     // 智教联盟需要先获取真实下载地址
@@ -1006,6 +1088,12 @@ namespace Ink_Canvas.Helpers
 
                     bool downloadSuccess = await DownloadFile(url, zipFilePath, progressCallback);
 
+                    if (groupLoopToken.IsCancellationRequested)
+                    {
+                        LogHelper.WriteLogToFile("AutoUpdate | 用户已取消，停止尝试后续线路组");
+                        break;
+                    }
+
                     if (downloadSuccess)
                     {
                         SaveDownloadStatus(true);
@@ -1021,6 +1109,13 @@ namespace Ink_Canvas.Helpers
                 progressCallback?.Invoke(0, "所有线路组下载均失败");
                 return false;
             }
+            catch (OperationCanceledException)
+            {
+                LogHelper.WriteLogToFile("AutoUpdate | 下载已被用户取消", LogHelper.LogType.Warning);
+                SaveDownloadStatus(false);
+                progressCallback?.Invoke(0, "下载已取消");
+                return false;
+            }
             catch (Exception ex)
             {
                 LogHelper.WriteLogToFile($"AutoUpdate | 下载更新时出错: {ex.Message}", LogHelper.LogType.Error);
@@ -1033,6 +1128,10 @@ namespace Ink_Canvas.Helpers
                 progressCallback?.Invoke(0, $"下载异常: {ex.Message}");
                 return false;
             }
+            finally
+            {
+                EndDownloadSession(session);
+            }
         }
 
         // 下载文件的具体实现
@@ -1043,6 +1142,12 @@ namespace Ink_Canvas.Helpers
             // 降低并发数，减少网络压力
             int[] threadOptions = { 32, 16, 8, 4, 1 };
 
+            CancellationToken externalToken;
+            lock (_activeDownloadLock)
+            {
+                externalToken = _activeDownloadCts?.Token ?? CancellationToken.None;
+            }
+
             // 检查服务器是否支持Range分块下载
             bool supportRange = false;
             long totalSize = -1;
@@ -1146,7 +1251,7 @@ namespace Ink_Canvas.Helpers
                                         // 增加连接超时设置
                                         client.Timeout = TimeSpan.FromSeconds(30);
 
-                                        var downloadCts = CancellationTokenSource.CreateLinkedTokenSource(cts.Token);
+                                        var downloadCts = CancellationTokenSource.CreateLinkedTokenSource(cts.Token, externalToken);
                                         var lastReadTime = DateTime.UtcNow;
                                         bool dataReceived = false;
 
@@ -1206,8 +1311,20 @@ namespace Ink_Canvas.Helpers
                                     success = true;
                                     LogHelper.WriteLogToFile($"AutoUpdate | 分块{block.Index}下载成功");
                                 }
-                                catch (Exception ex) when (ex is HttpRequestException || ex is IOException || ex is TaskCanceledException)
+                                catch (Exception ex) when (ex is HttpRequestException || ex is IOException || ex is TaskCanceledException || ex is OperationCanceledException)
                                 {
+                                    // 用户主动取消：不再重试
+                                    if (externalToken.IsCancellationRequested)
+                                    {
+                                        LogHelper.WriteLogToFile($"AutoUpdate | 分块{block.Index}下载已被用户取消", LogHelper.LogType.Warning);
+                                        if (File.Exists(tempPath))
+                                        {
+                                            try { File.Delete(tempPath); } catch { }
+                                        }
+                                        cts.Cancel();
+                                        return;
+                                    }
+
                                     LogHelper.WriteLogToFile($"AutoUpdate | 分块{block.Index}下载失败，第{retry + 1}次: {ex.Message}", LogHelper.LogType.Warning);
                                     progressCallback?.Invoke(0, $"分块{block.Index}下载失败，第{retry + 1}次: {ex.Message}");
 
@@ -1218,7 +1335,8 @@ namespace Ink_Canvas.Helpers
                                     }
 
                                     // 增加重试间隔，避免频繁重试
-                                    await Task.Delay(2000 * (retry + 1));
+                                    try { await Task.Delay(2000 * (retry + 1), externalToken); }
+                                    catch (OperationCanceledException) { cts.Cancel(); return; }
                                 }
                             }
                             if (success)
@@ -1339,12 +1457,18 @@ namespace Ink_Canvas.Helpers
                 LogHelper.WriteLogToFile($"AutoUpdate | 开始单线程下载: {fileUrl}");
                 progressCallback?.Invoke(0, "开始单线程下载");
 
+                CancellationToken token;
+                lock (_activeDownloadLock)
+                {
+                    token = _activeDownloadCts?.Token ?? CancellationToken.None;
+                }
+
                 using (var client = new HttpClient())
                 {
                     client.DefaultRequestHeaders.UserAgent.ParseAdd("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36");
                     client.Timeout = TimeSpan.FromMinutes(10); // 单线程下载设置更长的超时时间
 
-                    using (var resp = await client.GetAsync(fileUrl, HttpCompletionOption.ResponseHeadersRead))
+                    using (var resp = await client.GetAsync(fileUrl, HttpCompletionOption.ResponseHeadersRead, token))
                     {
                         resp.EnsureSuccessStatusCode();
                         using (var fs = new FileStream(destinationPath, FileMode.Create, FileAccess.Write, FileShare.None))
@@ -1355,9 +1479,9 @@ namespace Ink_Canvas.Helpers
                             long downloaded = 0;
                             var lastProgressUpdate = DateTime.UtcNow;
 
-                            while ((read = await stream.ReadAsync(buffer, 0, buffer.Length)) > 0)
+                            while ((read = await stream.ReadAsync(buffer, 0, buffer.Length, token)) > 0)
                             {
-                                await fs.WriteAsync(buffer, 0, read);
+                                await fs.WriteAsync(buffer, 0, read, token);
                                 downloaded += read;
 
                                 // 限制进度更新频率，避免UI卡顿
@@ -1379,6 +1503,13 @@ namespace Ink_Canvas.Helpers
                 LogHelper.WriteLogToFile("AutoUpdate | 单线程下载完成");
                 return true;
             }
+            catch (OperationCanceledException)
+            {
+                LogHelper.WriteLogToFile("AutoUpdate | 单线程下载已被取消", LogHelper.LogType.Warning);
+                progressCallback?.Invoke(0, "下载已取消");
+                try { if (File.Exists(destinationPath)) File.Delete(destinationPath); } catch { }
+                return false;
+            }
             catch (Exception ex)
             {
                 LogHelper.WriteLogToFile($"AutoUpdate | 单线程下载失败: {ex.Message}", LogHelper.LogType.Error);
@@ -2201,9 +2332,9 @@ namespace Ink_Canvas.Helpers
             {
                 LogHelper.WriteLogToFile($"AutoUpdate | 开始修复版本，通道: {channel}");
 
-                // 获取远程版本号（自动选择最快线路组，始终下载远程版本，版本修复模式）
-                var (remoteVersion, group, _) = await CheckForUpdates(channel, true, true);
-                if (string.IsNullOrEmpty(remoteVersion) || group == null)
+                // 获取远程版本号（始终下载远程版本，版本修复模式）
+                var (remoteVersion, preferredGroup, _) = await CheckForUpdates(channel, true, true);
+                if (string.IsNullOrEmpty(remoteVersion))
                 {
                     LogHelper.WriteLogToFile("AutoUpdate | 修复版本时获取远程版本失败", LogHelper.LogType.Error);
                     return false;
@@ -2211,8 +2342,22 @@ namespace Ink_Canvas.Helpers
 
                 LogHelper.WriteLogToFile($"AutoUpdate | 修复版本远程版本: {remoteVersion}");
 
+                var availableGroups = await GetAvailableLineGroupsOrdered(channel);
+                if (availableGroups.Count == 0)
+                {
+                    LogHelper.WriteLogToFile("AutoUpdate | 修复版本时无可用线路组", LogHelper.LogType.Error);
+                    return false;
+                }
+
+                if (preferredGroup != null)
+                {
+                    availableGroups.RemoveAll(g => g.GroupName == preferredGroup.GroupName);
+                    availableGroups.Insert(0, preferredGroup);
+                    LogHelper.WriteLogToFile($"AutoUpdate | 修复版本下载优先使用线路组: {preferredGroup.GroupName}");
+                }
+
                 // 无论版本是否为最新，都下载远程版本
-                bool downloadResult = await DownloadSetupFile(remoteVersion, group);
+                bool downloadResult = await DownloadSetupFileWithFallback(remoteVersion, availableGroups);
                 if (!downloadResult)
                 {
                     LogHelper.WriteLogToFile("AutoUpdate | 修复版本时下载更新失败", LogHelper.LogType.Error);

Ink Canvas/Helpers/Converters.cs

@@ -2,6 +2,7 @@
 using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
+using System.Windows.Media;
 
 namespace Ink_Canvas.Converter
 {
@@ -152,4 +153,27 @@ namespace Ink_Canvas.Converter
             return null;
         }
     }
+
+    public class StringToGeometryConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            try
+            {
+                if (value is string geometryString && !string.IsNullOrEmpty(geometryString))
+                {
+                    return Geometry.Parse(geometryString);
+                }
+            }
+            catch (Exception)
+            {
+            }
+            return null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
 }

Ink Canvas/Helpers/DebugConsoleManager.cs

@@ -0,0 +1,96 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace Ink_Canvas.Helpers
+{
+    public static class DebugConsoleManager
+    {
+        [DllImport("kernel32.dll", SetLastError = true)]
+        private static extern bool AllocConsole();
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        private static extern bool FreeConsole();
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        private static extern IntPtr GetConsoleWindow();
+
+        [DllImport("user32.dll")]
+        private static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr GetSystemMenu(IntPtr hWnd, bool bRevert);
+
+        [DllImport("user32.dll")]
+        private static extern bool DeleteMenu(IntPtr hMenu, uint uPosition, uint uFlags);
+
+        [DllImport("kernel32.dll")]
+        private static extern bool SetConsoleTitle(string lpConsoleTitle);
+
+        private const int SW_HIDE = 0;
+        private const int SW_SHOW = 5;
+        private const uint SC_CLOSE = 0xF060;
+        private const uint MF_BYCOMMAND = 0x00000000;
+
+        private static bool _allocated;
+
+        public static bool IsVisible { get; private set; }
+
+        public static void Show()
+        {
+            try
+            {
+                if (!_allocated)
+                {
+                    if (GetConsoleWindow() == IntPtr.Zero)
+                    {
+                        if (!AllocConsole()) return;
+                    }
+                    _allocated = true;
+
+                    Console.OutputEncoding = Encoding.UTF8;
+                    SetConsoleTitle("InkCanvasForClass - Debug Console");
+
+                    // 移除关闭菜单，避免用户点 X 时直接结束进程
+                    var hWnd = GetConsoleWindow();
+                    if (hWnd != IntPtr.Zero)
+                    {
+                        var hMenu = GetSystemMenu(hWnd, false);
+                        if (hMenu != IntPtr.Zero) DeleteMenu(hMenu, SC_CLOSE, MF_BYCOMMAND);
+                    }
+                }
+                else
+                {
+                    var hWnd = GetConsoleWindow();
+                    if (hWnd != IntPtr.Zero) ShowWindow(hWnd, SW_SHOW);
+                }
+                IsVisible = true;
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"[DebugConsoleManager] Show failed: {ex.Message}");
+            }
+        }
+
+        public static void Hide()
+        {
+            try
+            {
+                var hWnd = GetConsoleWindow();
+                if (hWnd != IntPtr.Zero) ShowWindow(hWnd, SW_HIDE);
+                IsVisible = false;
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"[DebugConsoleManager] Hide failed: {ex.Message}");
+            }
+        }
+
+        public static void WriteLine(string line)
+        {
+            if (!IsVisible) return;
+            try { Console.WriteLine(line); }
+            catch { }
+        }
+    }
+}

Ink Canvas/Helpers/DeviceIdentifier.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Text;
 
@@ -22,6 +23,9 @@ namespace Ink_Canvas.Helpers
 
         private static readonly string DeviceId;
         private static readonly object fileLock = new object();
+        private static UsageStats usageStatsCache;
+        private static DateTime usageStatsCacheTime;
+        private static readonly TimeSpan UsageStatsCacheDuration = TimeSpan.FromMinutes(2);
 
         static DeviceIdentifier()
         {
@@ -116,114 +120,26 @@ namespace Ink_Canvas.Helpers
         /// </summary>
         private static string GenerateHardwareFingerprint()
         {
-            // 收集硬件信息
             var hardwareInfo = new StringBuilder();
+            AppendFingerprintPart(hardwareInfo, "CPU",
+                GetWmiProperty("SELECT ProcessorId FROM Win32_Processor", "ProcessorId"),
+                GetRegistryValue(@"HARDWARE\DESCRIPTION\System\CentralProcessor\0", "ProcessorNameString"),
+                GetRegistryValue(@"HARDWARE\DESCRIPTION\System\CentralProcessor\0", "Identifier"));
 
-            try
-            {
-                var assembly = Assembly.Load("System.Management");
-                if (assembly != null)
-                {
-                    // CPU信息
-                    try
-                    {
-                        var searcherType = assembly.GetType("System.Management.ManagementObjectSearcher");
-                        var searcher = Activator.CreateInstance(searcherType, "SELECT ProcessorId FROM Win32_Processor");
-                        var getMethod = searcherType.GetMethod("Get");
-                        var enumerator = getMethod.Invoke(searcher, null);
+            AppendFingerprintPart(hardwareInfo, "BOARD",
+                GetWmiProperty("SELECT SerialNumber FROM Win32_BaseBoard", "SerialNumber"),
+                GetRegistryValue(@"HARDWARE\DESCRIPTION\System\BIOS", "BaseBoardSerialNumber"),
+                GetRegistryValue(@"HARDWARE\DESCRIPTION\System\BIOS", "BaseBoardProduct"));
 
-                        var moveNextMethod = enumerator.GetType().GetMethod("MoveNext");
-                        var currentProperty = enumerator.GetType().GetProperty("Current");
+            AppendFingerprintPart(hardwareInfo, "BIOS",
+                GetWmiProperty("SELECT SerialNumber FROM Win32_BIOS", "SerialNumber"),
+                GetRegistryValue(@"HARDWARE\DESCRIPTION\System\BIOS", "BIOSVersion"),
+                GetRegistryValue(@"HARDWARE\DESCRIPTION\System\BIOS", "BIOSVendor"));
 
-                        if ((bool)moveNextMethod.Invoke(enumerator, null))
-                        {
-                            var obj = currentProperty.GetValue(enumerator);
-                            var indexer = obj.GetType().GetProperty("Item", new[] { typeof(string) });
-                            var processorId = indexer.GetValue(obj, new object[] { "ProcessorId" });
-                            hardwareInfo.Append(processorId?.ToString() ?? "");
-                        }
-
-                        var disposeMethod = searcher.GetType().GetMethod("Dispose");
-                        disposeMethod?.Invoke(searcher, null);
-                    }
-                    catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
-
-                    // 主板序列号
-                    try
-                    {
-                        var searcherType = assembly.GetType("System.Management.ManagementObjectSearcher");
-                        var searcher = Activator.CreateInstance(searcherType, "SELECT SerialNumber FROM Win32_BaseBoard");
-                        var getMethod = searcherType.GetMethod("Get");
-                        var enumerator = getMethod.Invoke(searcher, null);
-
-                        var moveNextMethod = enumerator.GetType().GetMethod("MoveNext");
-                        var currentProperty = enumerator.GetType().GetProperty("Current");
-
-                        if ((bool)moveNextMethod.Invoke(enumerator, null))
-                        {
-                            var obj = currentProperty.GetValue(enumerator);
-                            var indexer = obj.GetType().GetProperty("Item", new[] { typeof(string) });
-                            var serialNumber = indexer.GetValue(obj, new object[] { "SerialNumber" });
-                            hardwareInfo.Append(serialNumber?.ToString() ?? "");
-                        }
-
-                        var disposeMethod = searcher.GetType().GetMethod("Dispose");
-                        disposeMethod?.Invoke(searcher, null);
-                    }
-                    catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
-
-                    // BIOS序列号
-                    try
-                    {
-                        var searcherType = assembly.GetType("System.Management.ManagementObjectSearcher");
-                        var searcher = Activator.CreateInstance(searcherType, "SELECT SerialNumber FROM Win32_BIOS");
-                        var getMethod = searcherType.GetMethod("Get");
-                        var enumerator = getMethod.Invoke(searcher, null);
-
-                        var moveNextMethod = enumerator.GetType().GetMethod("MoveNext");
-                        var currentProperty = enumerator.GetType().GetProperty("Current");
-
-                        if ((bool)moveNextMethod.Invoke(enumerator, null))
-                        {
-                            var obj = currentProperty.GetValue(enumerator);
-                            var indexer = obj.GetType().GetProperty("Item", new[] { typeof(string) });
-                            var serialNumber = indexer.GetValue(obj, new object[] { "SerialNumber" });
-                            hardwareInfo.Append(serialNumber?.ToString() ?? "");
-                        }
-
-                        var disposeMethod = searcher.GetType().GetMethod("Dispose");
-                        disposeMethod?.Invoke(searcher, null);
-                    }
-                    catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
-
-                    // 主硬盘序列号
-                    try
-                    {
-                        var searcherType = assembly.GetType("System.Management.ManagementObjectSearcher");
-                        var searcher = Activator.CreateInstance(searcherType, "SELECT SerialNumber FROM Win32_DiskDrive WHERE MediaType='Fixed hard disk media'");
-                        var getMethod = searcherType.GetMethod("Get");
-                        var enumerator = getMethod.Invoke(searcher, null);
-
-                        var moveNextMethod = enumerator.GetType().GetMethod("MoveNext");
-                        var currentProperty = enumerator.GetType().GetProperty("Current");
-
-                        if ((bool)moveNextMethod.Invoke(enumerator, null))
-                        {
-                            var obj = currentProperty.GetValue(enumerator);
-                            var indexer = obj.GetType().GetProperty("Item", new[] { typeof(string) });
-                            var serialNumber = indexer.GetValue(obj, new object[] { "SerialNumber" });
-                            hardwareInfo.Append(serialNumber?.ToString() ?? "");
-                        }
-
-                        var disposeMethod = searcher.GetType().GetMethod("Dispose");
-                        disposeMethod?.Invoke(searcher, null);
-                    }
-                    catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
-                }
-            }
-            catch
-            {
-            }
+            AppendFingerprintPart(hardwareInfo, "DISK",
+                GetWmiProperty("SELECT SerialNumber FROM Win32_DiskDrive WHERE MediaType='Fixed hard disk media'", "SerialNumber"),
+                GetSystemDriveVolumeSerial(),
+                GetRegistryValue(@"SOFTWARE\Microsoft\Cryptography", "MachineGuid"));
 
             if (hardwareInfo.Length < 10)
             {
@@ -235,6 +151,108 @@ namespace Ink_Canvas.Helpers
             return hardwareInfo.ToString();
         }
 
+        private static void AppendFingerprintPart(StringBuilder hardwareInfo, string key, params string[] candidates)
+        {
+            foreach (var candidate in candidates)
+            {
+                if (!string.IsNullOrWhiteSpace(candidate))
+                {
+                    hardwareInfo.Append(key).Append(':').Append(candidate.Trim()).Append(';');
+                    return;
+                }
+            }
+        }
+
+        private static string GetWmiProperty(string query, string propertyName)
+        {
+            try
+            {
+                var assembly = Assembly.Load("System.Management");
+                var searcherType = assembly?.GetType("System.Management.ManagementObjectSearcher");
+                if (searcherType == null)
+                {
+                    return null;
+                }
+
+                var searcher = Activator.CreateInstance(searcherType, query);
+                var getMethod = searcherType.GetMethod("Get");
+                var resultCollection = getMethod?.Invoke(searcher, null);
+                if (resultCollection == null)
+                {
+                    return null;
+                }
+
+                var enumerator = resultCollection.GetType().GetMethod("GetEnumerator")?.Invoke(resultCollection, null);
+                var moveNextMethod = enumerator?.GetType().GetMethod("MoveNext");
+                var currentProperty = enumerator?.GetType().GetProperty("Current");
+                if (enumerator == null || moveNextMethod == null || currentProperty == null)
+                {
+                    return null;
+                }
+
+                if (!(bool)moveNextMethod.Invoke(enumerator, null))
+                {
+                    return null;
+                }
+
+                var currentObject = currentProperty.GetValue(enumerator);
+                var indexer = currentObject?.GetType().GetProperty("Item", new[] { typeof(string) });
+                var result = indexer?.GetValue(currentObject, new object[] { propertyName })?.ToString();
+
+                searcher?.GetType().GetMethod("Dispose")?.Invoke(searcher, null);
+                return result;
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        private static string GetRegistryValue(string subKey, string valueName)
+        {
+            try
+            {
+                return Microsoft.Win32.Registry.GetValue($@"HKEY_LOCAL_MACHINE\{subKey}", valueName, null)?.ToString();
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        private static string GetSystemDriveVolumeSerial()
+        {
+            try
+            {
+                var rootPath = Path.GetPathRoot(Environment.SystemDirectory);
+                if (string.IsNullOrWhiteSpace(rootPath))
+                {
+                    return null;
+                }
+
+                if (GetVolumeInformation(rootPath, null, 0, out uint serialNumber, out _, out _, null, 0))
+                {
+                    return serialNumber.ToString("X8");
+                }
+            }
+            catch
+            {
+            }
+
+            return null;
+        }
+
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        private static extern bool GetVolumeInformation(
+            string rootPathName,
+            StringBuilder volumeNameBuffer,
+            uint volumeNameSize,
+            out uint volumeSerialNumber,
+            out uint maximumComponentLength,
+            out uint fileSystemFlags,
+            StringBuilder fileSystemNameBuffer,
+            uint nFileSystemNameSize);
+
         /// <summary>
         /// 基于硬件指纹生成25字符的设备ID
         /// </summary>
@@ -654,7 +672,7 @@ namespace Ink_Canvas.Helpers
         {
             try
             {
-                var stats = LoadUsageStats();
+                var stats = GetUsageStatsCached();
                 return stats.SystemVersion;
             }
             catch (Exception ex)
@@ -773,7 +791,7 @@ namespace Ink_Canvas.Helpers
         {
             try
             {
-                var stats = LoadUsageStats();
+                var stats = GetUsageStatsCached();
                 return stats.UpdatePriority;
             }
             catch (Exception ex)
@@ -790,7 +808,7 @@ namespace Ink_Canvas.Helpers
         {
             try
             {
-                var stats = LoadUsageStats();
+                var stats = GetUsageStatsCached();
                 return stats.UsageFrequency;
             }
             catch (Exception ex)
@@ -892,6 +910,23 @@ namespace Ink_Canvas.Helpers
             }
         }
 
+        private static UsageStats GetUsageStatsCached(bool forceRefresh = false)
+        {
+            lock (fileLock)
+            {
+                if (!forceRefresh
+                    && usageStatsCache != null
+                    && (DateTime.Now - usageStatsCacheTime) < UsageStatsCacheDuration)
+                {
+                    return usageStatsCache;
+                }
+
+                usageStatsCache = LoadUsageStats();
+                usageStatsCacheTime = DateTime.Now;
+                return usageStatsCache;
+            }
+        }
+
         /// <summary>
         /// 保存使用统计
         /// </summary>
@@ -902,6 +937,9 @@ namespace Ink_Canvas.Helpers
 
             // 保存到备份文件
             SaveUsageStatsToFile(UsageStatsBackupPath, stats);
+
+            usageStatsCache = stats;
+            usageStatsCacheTime = DateTime.Now;
         }
 
 
@@ -1242,15 +1280,20 @@ namespace Ink_Canvas.Helpers
                     int versionDiff = CalculateVersionGenerationDifference(localVersion, updateVersion);
                     LogHelper.WriteLogToFile($"DeviceIdentifier | 无法获取版本发布时间，使用版本号差异判断 - 本地版本: {localVersion}, 远程版本: {updateVersion}, 代数差异: {versionDiff}");
 
-                    if (versionDiff >= 1)
+                    if (versionDiff <= 0)
                     {
-                        LogHelper.WriteLogToFile($"DeviceIdentifier | 版本号代数差异({versionDiff})>=1，允许更新");
-                    }
-                    else
-                    {
-                        LogHelper.WriteLogToFile($"DeviceIdentifier | 版本号代数差异({versionDiff})<1，可能是相同版本或降级，暂不更新");
+                        LogHelper.WriteLogToFile($"DeviceIdentifier | 版本号代数差异({versionDiff})<=0，可能是相同版本或降级，暂不更新");
                         return false;
                     }
+
+                    // 当代数差异较大（>=3）时直接放行，避免被分级策略卡住
+                    if (versionDiff >= 3)
+                    {
+                        LogHelper.WriteLogToFile($"DeviceIdentifier | 版本号代数差异({versionDiff})>=3，跳过分级策略直接推送");
+                        return true;
+                    }
+
+                    LogHelper.WriteLogToFile($"DeviceIdentifier | 版本号代数差异({versionDiff})>=1，进入分级策略判断");
                 }
 
                 // 计算最近活跃度（最后一次使用距今的天数）

Ink Canvas/Helpers/ForegroundWindowInfo.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -54,6 +54,11 @@ namespace Ink_Canvas.Helpers
         [DllImport("user32.dll")]
         private static extern IntPtr MonitorFromRect(ref RECT lprc, uint dwFlags);
 
+        public static IntPtr GetForegroundWindowHandle()
+        {
+            return GetForegroundWindow();
+        }
+
         public static string WindowTitle()
         {
             IntPtr foregroundWindowHandle = GetForegroundWindow();

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
 
         /// <summary>
         /// 确保窗口全屏的Hook
-        /// 使用HandleProcessCorruptedStateExceptions，防止访问内存过程中因为一些致命异常导致程序崩溃
         /// </summary>
-        [HandleProcessCorruptedStateExceptions]
         private static IntPtr KeepFullScreenHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
         {
             //处理WM_WINDOWPOSCHANGING消息

Ink Canvas/Helpers/GlobalHotkeyManager.cs

@@ -285,6 +285,7 @@ namespace Ink_Canvas.Helpers
                 // 功能快捷键
                 RegisterHotkey("DrawLine", Key.L, ModifierKeys.Alt, () => _mainWindow.BtnDrawLine_Click(null, null));
                 RegisterHotkey("Screenshot", Key.C, ModifierKeys.Alt, () => _mainWindow.SaveScreenShotToDesktop());
+                RegisterHotkey("QuickDraw", Key.K, ModifierKeys.Alt, () => _mainWindow.OpenQuickDrawFromHotkey());
                 RegisterHotkey("Hide", Key.V, ModifierKeys.Alt, () => _mainWindow.SymbolIconEmoji_MouseUp(null, null));
 
                 // 退出快捷键
@@ -566,6 +567,36 @@ namespace Ink_Canvas.Helpers
             }
         }
 
+        /// <summary>
+        /// 刷新多屏相关设置（开关和跟随鼠标策略）。
+        /// </summary>
+        public void RefreshMultiScreenSettings()
+        {
+            try
+            {
+                var advanced = MainWindow.Settings.Advanced;
+                _isMultiScreenMode = advanced.EnableMultiScreenSupport && ScreenDetectionHelper.HasMultipleScreens();
+                _enableScreenSpecificHotkeys = _isMultiScreenMode;
+
+                if (_isMultiScreenMode)
+                {
+                    _currentScreen = advanced.FollowMouseForScreenSelection
+                        ? Screen.FromPoint(Control.MousePosition)
+                        : ScreenDetectionHelper.GetWindowScreen(_mainWindow);
+                }
+                else
+                {
+                    _currentScreen = ScreenDetectionHelper.GetPrimaryScreen();
+                }
+
+                RefreshHotkeysForCurrentScreen();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"刷新多屏设置时出错: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
         /// <summary>
         /// 获取当前屏幕信息
         /// </summary>
@@ -623,13 +654,15 @@ namespace Ink_Canvas.Helpers
         {
             try
             {
-                // 检测是否有多个屏幕
-                _isMultiScreenMode = ScreenDetectionHelper.HasMultipleScreens();
+                var advanced = MainWindow.Settings.Advanced;
+                _isMultiScreenMode = advanced.EnableMultiScreenSupport && ScreenDetectionHelper.HasMultipleScreens();
+                _enableScreenSpecificHotkeys = _isMultiScreenMode;
 
                 if (_isMultiScreenMode)
                 {
-                    // 获取当前窗口所在的屏幕
-                    _currentScreen = ScreenDetectionHelper.GetWindowScreen(_mainWindow);
+                    _currentScreen = advanced.FollowMouseForScreenSelection
+                        ? Screen.FromPoint(Control.MousePosition)
+                        : ScreenDetectionHelper.GetWindowScreen(_mainWindow);
 
                     // 监听窗口位置变化事件
                     _mainWindow.LocationChanged += OnWindowLocationChanged;
@@ -687,6 +720,9 @@ namespace Ink_Canvas.Helpers
                 if (!_isMultiScreenMode || !_enableScreenSpecificHotkeys)
                     return;
 
+                if (MainWindow.Settings.Advanced.FollowMouseForScreenSelection)
+                    return;
+
                 var newScreen = ScreenDetectionHelper.GetWindowScreen(_mainWindow);
                 if (newScreen != null && newScreen != _currentScreen)
                 {
@@ -799,9 +835,16 @@ namespace Ink_Canvas.Helpers
                 if (!_isMultiScreenMode || !_enableScreenSpecificHotkeys)
                     return;
 
-                // 检查鼠标是否在当前窗口所在的屏幕上
                 var mousePosition = Control.MousePosition;
-                var currentScreen = Screen.FromPoint(mousePosition);
+                var mouseScreen = Screen.FromPoint(mousePosition);
+
+                if (MainWindow.Settings.Advanced.FollowMouseForScreenSelection &&
+                    mouseScreen != null &&
+                    mouseScreen != _currentScreen)
+                {
+                    _currentScreen = mouseScreen;
+                    RefreshHotkeysForCurrentScreen();
+                }
 
                 // 无论屏幕是否变化，都检查热键状态
                 // 这样可以确保热键状态始终与当前上下文保持一致
@@ -1033,6 +1076,7 @@ namespace Ink_Canvas.Helpers
                     new HotkeyConfigItem { Name = "Pen5", Key = Key.D5, Modifiers = ModifierKeys.Alt },
                     new HotkeyConfigItem { Name = "DrawLine", Key = Key.L, Modifiers = ModifierKeys.Alt },
                     new HotkeyConfigItem { Name = "Screenshot", Key = Key.C, Modifiers = ModifierKeys.Alt },
+                    new HotkeyConfigItem { Name = "QuickDraw", Key = Key.K, Modifiers = ModifierKeys.Alt },
                     new HotkeyConfigItem { Name = "Hide", Key = Key.V, Modifiers = ModifierKeys.Alt },
                     new HotkeyConfigItem { Name = "Exit", Key = Key.Escape, Modifiers = ModifierKeys.None }
                 });
@@ -1111,6 +1155,14 @@ namespace Ink_Canvas.Helpers
                     }
                 }
 
+                // 旧版 HotkeyConfig.json 无「快抽」项时补注册默认组合，避免升级后无快捷键
+                if (successCount > 0 && !IsHotkeyRegistered("QuickDraw"))
+                {
+                    var quickDrawAction = GetActionByName("QuickDraw");
+                    if (quickDrawAction != null && RegisterHotkey("QuickDraw", Key.K, ModifierKeys.Alt, quickDrawAction))
+                        successCount++;
+                }
+
                 if (successCount > 0)
                 {
                     _hotkeysShouldBeRegistered = true;
@@ -1221,6 +1273,8 @@ namespace Ink_Canvas.Helpers
                         return () => _mainWindow.BtnDrawLine_Click(null, null);
                     case "Screenshot":
                         return () => _mainWindow.SaveScreenShotToDesktop();
+                    case "QuickDraw":
+                        return () => _mainWindow.OpenQuickDrawFromHotkey();
                     case "Hide":
                         return () => _mainWindow.SymbolIconEmoji_MouseUp(null, null);
                     case "Exit":

Ink Canvas/Helpers/InkRecognitionManager.cs

@@ -8,9 +8,9 @@ namespace Ink_Canvas.Helpers
     {
         private static InkRecognitionManager _instance;
         private static readonly object _lock = new object();
+        private readonly object _initSync = new object();
 
         private ModernInkProcessor _modernProcessor;
-        private ModernInkAnalyzer _modernAnalyzer;
         private bool _isModernSystemAvailable;
         private bool _isInitialized;
 
@@ -31,35 +31,16 @@ namespace Ink_Canvas.Helpers
             }
         }
 
-        private InkRecognitionManager()
-        {
-            Initialize();
-        }
+        private InkRecognitionManager() { }
 
         private void Initialize()
         {
+            if (_isInitialized) return;
+
             try
             {
-                var tryModern = WinRtInkShapeRecognizer.IsApiAvailable && Environment.Is64BitProcess;
-
-                _isModernSystemAvailable = false;
-                if (tryModern)
-                {
-                    try
-                    {
-                        _modernProcessor = new ModernInkProcessor();
-                        _modernAnalyzer = new ModernInkAnalyzer();
-                        _isModernSystemAvailable = true;
-                    }
-                    catch (Exception ex)
-                    {
-                        LogHelper.WriteLogToFile("WinRT 墨迹初始化失败: " + ex.Message, LogHelper.LogType.Warning);
-                        _isModernSystemAvailable = false;
-                        _modernProcessor = null;
-                        _modernAnalyzer = null;
-                    }
-                }
-
+                // 启动阶段只做能力探测，不做 WinRT 组件实例化（避免冷启动延迟）
+                _isModernSystemAvailable = WinRtInkShapeRecognizer.IsApiAvailable;
                 _isInitialized = true;
             }
             catch (Exception ex)
@@ -69,10 +50,41 @@ namespace Ink_Canvas.Helpers
             }
         }
 
+        private void EnsureInitialized()
+        {
+            if (_isInitialized) return;
+            lock (_initSync)
+            {
+                if (_isInitialized) return;
+                Initialize();
+            }
+        }
+
+        private void EnsureModernAnalyzerInitialized()
+        {
+            if (_modernProcessor != null || !_isModernSystemAvailable) return;
+
+            lock (_initSync)
+            {
+                if (_modernProcessor != null || !_isModernSystemAvailable) return;
+                try
+                {
+                    _modernProcessor ??= new ModernInkProcessor();
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile("WinRT 墨迹模块懒加载失败: " + ex.Message, LogHelper.LogType.Warning);
+                    _isModernSystemAvailable = false;
+                    _modernProcessor = null;
+                }
+            }
+        }
+
         public Task<InkShapeRecognitionResult> RecognizeShapeAsync(
             StrokeCollection strokes,
             ShapeRecognitionEngineMode mode)
         {
+            EnsureInitialized();
             if (!_isInitialized || strokes == null || strokes.Count == 0)
                 return Task.FromResult(InkShapeRecognitionResult.Empty);
 
@@ -108,6 +120,7 @@ namespace Ink_Canvas.Helpers
             bool applyHandwritingBeautify = false,
             string handwritingFontFamilyList = null)
         {
+            EnsureInitialized();
             if (!_isInitialized)
             {
                 LogHelper.WriteLogToFile("[手写体] CorrectInkAsync 跳过：InkRecognitionManager 未初始化。", LogHelper.LogType.Info);
@@ -140,18 +153,11 @@ namespace Ink_Canvas.Helpers
                     return Task.FromResult(strokes);
                 }
 
-                if (!Environment.Is64BitProcess)
+                EnsureModernAnalyzerInitialized();
+                if (_modernProcessor == null)
                 {
                     LogHelper.WriteLogToFile(
-                        "[手写体] CorrectInkAsync 跳过：非 64 位进程，WinRT 手写体替换不可用。笔画数=" + strokes.Count,
-                        LogHelper.LogType.Info);
-                    return Task.FromResult(strokes);
-                }
-
-                if (_modernAnalyzer == null)
-                {
-                    LogHelper.WriteLogToFile(
-                        "[手写体] CorrectInkAsync 跳过：ModernInkAnalyzer 未就绪（WinRT 初始化失败？）。笔画数=" +
+                        "[手写体] CorrectInkAsync 跳过：ModernInkProcessor 未就绪（WinRT 初始化失败？）。笔画数=" +
                         strokes.Count,
                         LogHelper.LogType.Warning);
                     return Task.FromResult(strokes);
@@ -161,7 +167,7 @@ namespace Ink_Canvas.Helpers
                     "[手写体] CorrectInkAsync 开始：笔画数=" + strokes.Count +
                     "，字体=" + (string.IsNullOrWhiteSpace(handwritingFontFamilyList) ? "(默认)" : handwritingFontFamilyList.Trim()),
                     LogHelper.LogType.Info);
-                return _modernAnalyzer.AnalyzeAndCorrectAsync(strokes, handwritingFontFamilyList);
+                return WinRtHandwritingRecognizer.ConvertRecognizedTextToHandwritingInkAsync(strokes, handwritingFontFamilyList);
             }
             catch (Exception ex)
             {
@@ -171,19 +177,19 @@ namespace Ink_Canvas.Helpers
         }
 
         /// <summary>
-        /// WinRT 手写体识别（需 64 位进程、Windows 10+ 及系统手写识别组件）。返回分词候选与包围框，供剪贴板或插件使用。
+        /// WinRT 手写体识别（需 Windows 10+ 及系统手写识别组件）。返回分词候选与包围框，供剪贴板或插件使用。
         /// </summary>
         public Task<HandwritingRecognitionResult> RecognizeHandwritingAsync(
             StrokeCollection strokes,
             ShapeRecognitionEngineMode mode)
         {
+            EnsureInitialized();
             if (!_isInitialized || strokes == null || strokes.Count == 0)
                 return Task.FromResult(HandwritingRecognitionResult.Empty);
 
             try
             {
-                if (!Environment.Is64BitProcess
-                    || !ShapeRecognitionRouter.ResolveUseWinRt(mode)
+                if (!ShapeRecognitionRouter.ResolveUseWinRt(mode)
                     || !WinRtHandwritingRecognizer.IsApiAvailable)
                     return Task.FromResult(HandwritingRecognitionResult.Empty);
 
@@ -209,14 +215,13 @@ namespace Ink_Canvas.Helpers
         public string GetSystemInfo()
         {
             return _isModernSystemAvailable
-                ? $"现代化64位墨迹识别系统 (Windows Runtime API) - 进程架构: {Environment.Is64BitProcess}"
+                ? $"现代化墨迹识别系统 (Windows Runtime API) - 进程架构: {Environment.Is64BitProcess}"
                 : $"传统墨迹识别系统 (IACore) - 进程架构: {Environment.Is64BitProcess}";
         }
 
         public void Dispose()
         {
             _modernProcessor?.Dispose();
-            _modernAnalyzer?.Dispose();
             _isInitialized = false;
         }
     }
@@ -238,20 +243,4 @@ namespace Ink_Canvas.Helpers
         {
         }
     }
-
-    internal sealed class ModernInkAnalyzer : IDisposable
-    {
-        public Task<StrokeCollection> AnalyzeAndCorrectAsync(
-            StrokeCollection strokes,
-            string handwritingFontFamilyList)
-        {
-            return WinRtHandwritingRecognizer.ConvertRecognizedTextToHandwritingInkAsync(
-                strokes,
-                handwritingFontFamilyList);
-        }
-
-        public void Dispose()
-        {
-        }
-    }
 }

Ink Canvas/Helpers/InkRecognizeHelper.cs

@@ -1,4 +1,3 @@
-using Ink_Canvas;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
@@ -49,13 +48,17 @@ namespace Ink_Canvas.Helpers
                             break;
                     }
                     if (alternates.Count > 0)
-                        analysisAlternate = alternates[0];
+                    {
+                        var altFinal = alternates[0];
+                        if (altFinal?.AlternateNodes != null && altFinal.AlternateNodes.Count > 0)
+                            analysisAlternate = altFinal;
+                    }
                 }
             }
 
             analyzer.Dispose();
 
-            if (analysisAlternate != null && analysisAlternate.AlternateNodes.Count > 0)
+            if (analysisAlternate != null && analysisAlternate.AlternateNodes != null && analysisAlternate.AlternateNodes.Count > 0)
             {
                 var node = analysisAlternate.AlternateNodes[0] as InkDrawingNode;
                 if (node == null)
@@ -100,7 +103,6 @@ namespace Ink_Canvas.Helpers
         {
             try
             {
-                _ = InkRecognitionManager.Instance;
                 if (ShapeRecognitionRouter.ResolveUseWinRt(mode))
                 {
                     WinRtInkShapeRecognizer.Warmup();
@@ -115,7 +117,7 @@ namespace Ink_Canvas.Helpers
             }
         }
 
-        /// <summary>WinRT 手写识别（64 位 + Windows 10+）。</summary>
+        /// <summary>WinRT 手写识别（Windows 10+）。</summary>
         public static Task<HandwritingRecognitionResult> RecognizeHandwritingUnifiedAsync(
             StrokeCollection strokes,
             ShapeRecognitionEngineMode mode) =>
@@ -149,6 +151,9 @@ namespace Ink_Canvas.Helpers
 
             var node = legacy.InkDrawingNode;
             var shape = node.GetShape();
+            if (shape == null)
+                return InkShapeRecognitionResult.Empty;
+
             var hot = ClonePointCollection(node.HotPoints);
             return new InkShapeRecognitionResult(
                 node.GetShapeName(),
@@ -170,6 +175,9 @@ namespace Ink_Canvas.Helpers
 
         public static bool IsContainShapeType(string name)
         {
+            if (string.IsNullOrEmpty(name))
+                return false;
+
             if (name.Contains("Triangle") || name.Contains("Circle") ||
                 name.Contains("Rectangle") || name.Contains("Diamond") ||
                 name.Contains("Parallelogram") || name.Contains("Square")

Ink Canvas/Helpers/InkShapeRecognition.cs

@@ -1,5 +1,4 @@
 using OSVersionExtension;
-using System;
 using System.Windows;
 using System.Windows.Ink;
 using System.Windows.Media;
@@ -17,13 +16,13 @@ namespace Ink_Canvas.Helpers
     public static class ShapeRecognitionRouter
     {
         /// <summary>
-        /// 自动模式：按当前进程位数选择——<c>64</c> 位进程用 WinRT，<c>32</c> 位进程（含 x86 目标在 WOW64 下运行）用 IACore。
+        /// 自动模式：在 Windows 10 及以上系统默认使用 WinRT，否则使用 IACore。
         /// </summary>
         public static bool ResolveUseWinRt(ShapeRecognitionEngineMode mode)
         {
             if (mode == ShapeRecognitionEngineMode.WinRT) return true;
             if (mode == ShapeRecognitionEngineMode.IACore) return false;
-            return Environment.Is64BitProcess;
+            return OSVersion.GetOperatingSystem() >= OSVersionExtension.OperatingSystem.Windows10;
         }
 
         public static bool ShouldRunShapeRecognition(bool inkToShapeEnabled, ShapeRecognitionEngineMode mode)
@@ -31,7 +30,7 @@ namespace Ink_Canvas.Helpers
             if (!inkToShapeEnabled) return false;
             if (ResolveUseWinRt(mode))
                 return OSVersion.GetOperatingSystem() >= OSVersionExtension.OperatingSystem.Windows10;
-            return !Environment.Is64BitProcess;
+            return true;
         }
 
         public static ShapeRecognitionEngineMode FromSettingsInt(int value)

Ink Canvas/Helpers/LogHelper.cs

@@ -83,6 +83,7 @@ namespace Ink_Canvas.Helpers
                     }
                 }
                 string logLine = string.Format("{0} [T{1}] [{2}] [{3}] {4}", DateTime.Now.ToString("O"), threadId, strLogType, callerInfo, str);
+                DebugConsoleManager.WriteLine(logLine);
                 ProcessProtectionManager.WithWriteAccess(file, () =>
                 {
                     using (StreamWriter sw = new StreamWriter(file, true))

Ink Canvas/Helpers/OleActiveObject.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// .NET Core / 5+ 未提供 <see cref="Marshal.GetActiveObject"/>，通过 OLE 实现等效行为。
+    /// </summary>
+    internal static class OleActiveObject
+    {
+        [DllImport("ole32.dll", CharSet = CharSet.Unicode, ExactSpelling = true)]
+        private static extern int CLSIDFromProgID(string lpszProgId, out Guid lpclsid);
+
+        [DllImport("oleaut32.dll", PreserveSig = true)]
+        private static extern int GetActiveObject(ref Guid rclsid, IntPtr pvReserved, [MarshalAs(UnmanagedType.IUnknown)] out object ppunk);
+
+        public static object GetActiveObject(string progId)
+        {
+            int hr = CLSIDFromProgID(progId, out Guid clsid);
+            Marshal.ThrowExceptionForHR(hr);
+            hr = GetActiveObject(ref clsid, IntPtr.Zero, out object obj);
+            Marshal.ThrowExceptionForHR(hr);
+            return obj;
+        }
+    }
+}

Ink Canvas/Helpers/PPTInkManager.cs

@@ -460,7 +460,6 @@ namespace Ink_Canvas.Helpers
                 _memoryStreams = new MemoryStream[_maxSlides + 2];
             }
             CurrentStrokes?.Clear();
-            LogHelper.WriteLogToFile("已清除所有墨迹", LogHelper.LogType.Trace);
         }
 
         /// <summary>

Ink Canvas/Helpers/PPTManager.cs

@@ -271,7 +271,7 @@ namespace Ink_Canvas.Helpers
         {
             try
             {
-                var pptApp = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("PowerPoint.Application");
+                var pptApp = (Microsoft.Office.Interop.PowerPoint.Application)OleActiveObject.GetActiveObject("PowerPoint.Application");
 
                 if (pptApp != null && Marshal.IsComObject(pptApp))
                 {
@@ -298,7 +298,7 @@ namespace Ink_Canvas.Helpers
         {
             try
             {
-                var wpsApp = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("kwpp.Application");
+                var wpsApp = (Microsoft.Office.Interop.PowerPoint.Application)OleActiveObject.GetActiveObject("kwpp.Application");
 
                 if (wpsApp != null && Marshal.IsComObject(wpsApp))
                 {
@@ -390,11 +390,15 @@ namespace Ink_Canvas.Helpers
                             {
                                 try
                                 {
-                                    PPTApplication.PresentationOpen -= OnPresentationOpen;
-                                    PPTApplication.PresentationClose -= OnPresentationClose;
-                                    PPTApplication.SlideShowBegin -= OnSlideShowBegin;
-                                    PPTApplication.SlideShowNextSlide -= OnSlideShowNextSlide;
-                                    PPTApplication.SlideShowEnd -= OnSlideShowEnd;
+                                    // 再次检查PPTApplication是否为null，因为可能在异步操作期间被修改
+                                    if (PPTApplication != null && Marshal.IsComObject(PPTApplication))
+                                    {
+                                        PPTApplication.PresentationOpen -= OnPresentationOpen;
+                                        PPTApplication.PresentationClose -= OnPresentationClose;
+                                        PPTApplication.SlideShowBegin -= OnSlideShowBegin;
+                                        PPTApplication.SlideShowNextSlide -= OnSlideShowNextSlide;
+                                        PPTApplication.SlideShowEnd -= OnSlideShowEnd;
+                                    }
                                 }
                                 catch (COMException comEx)
                                 {
@@ -406,6 +410,15 @@ namespace Ink_Canvas.Helpers
                                     // COM对象类型转换失败，通常是因为对象已经被释放
                                     LogHelper.WriteLogToFile("PPT COM对象已被释放，跳过事件注册取消", LogHelper.LogType.Trace);
                                 }
+                                catch (System.Reflection.TargetInvocationException tie) when (tie.InnerException is InvalidComObjectException)
+                                {
+                                    // RCW 已分离：Office Interop 内部通过反射创建 EventProvider 时抛出，是正常情况
+                                    LogHelper.WriteLogToFile("PPT COM对象RCW已分离，跳过事件注册取消", LogHelper.LogType.Trace);
+                                }
+                                catch (InvalidComObjectException)
+                                {
+                                    LogHelper.WriteLogToFile("PPT COM对象RCW已分离，跳过事件注册取消", LogHelper.LogType.Trace);
+                                }
                                 catch (Exception ex)
                                 {
                                     LogHelper.WriteLogToFile($"取消PPT事件注册时发生异常: {ex}", LogHelper.LogType.Warning);
@@ -1251,7 +1264,6 @@ namespace Ink_Canvas.Helpers
             object slideNavigation = null;
             try
             {
-                LogHelper.WriteLogToFile($"尝试显示幻灯片导航 - 连接状态: {IsConnected}, 放映状态: {IsInSlideShow}", LogHelper.LogType.Trace);
 
                 if (!IsConnected || !IsInSlideShow || PPTApplication == null)
                 {
@@ -1284,7 +1296,6 @@ namespace Ink_Canvas.Helpers
                         {
                             dynamic sn = slideNavigation;
                             sn.Visible = true;
-                            LogHelper.WriteLogToFile("成功显示幻灯片导航（PowerPoint模式）", LogHelper.LogType.Event);
                             return true;
                         }
 

Ink Canvas/Helpers/PPTROTConnectionHelper.cs

@@ -104,7 +104,7 @@ namespace Ink_Canvas.Helpers
 
                 try
                 {
-                    var pptApp = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("PowerPoint.Application");
+                    var pptApp = (Microsoft.Office.Interop.PowerPoint.Application)OleActiveObject.GetActiveObject("PowerPoint.Application");
                     if (pptApp != null && Marshal.IsComObject(pptApp))
                     {
                         try
@@ -124,7 +124,7 @@ namespace Ink_Canvas.Helpers
                 {
                     try
                     {
-                        var wpsApp = (Microsoft.Office.Interop.PowerPoint.Application)Marshal.GetActiveObject("kwpp.Application");
+                        var wpsApp = (Microsoft.Office.Interop.PowerPoint.Application)OleActiveObject.GetActiveObject("kwpp.Application");
                         if (wpsApp != null && Marshal.IsComObject(wpsApp))
                         {
                             try

Ink Canvas/Helpers/PPTUIManager.cs

@@ -86,18 +86,8 @@ namespace Ink_Canvas.Helpers
                         _mainWindow.BtnPPTSlideShow.Visibility = Visibility.Collapsed;
                         _mainWindow.BtnPPTSlideShowEnd.Visibility = Visibility.Visible;
 
-                        // 只有在页数有效时才更新页码显示
-                        if (currentSlide > 0 && totalSlides > 0)
-                        {
-                            _mainWindow.PPTBtnPageNow.Text = currentSlide.ToString();
-                            _mainWindow.PPTBtnPageTotal.Text = $"/ {totalSlides}";
-                        }
-                        else
-                        {
-                            // 页数无效时清空页码显示
-                            _mainWindow.PPTBtnPageNow.Text = "?";
-                            _mainWindow.PPTBtnPageTotal.Text = "/ ?";
-                        }
+                        // 同步页码到所有翻页条 + 兼容旧绑定的隐藏 placeholder
+                        SetPageNumberOnAllBars(currentSlide, totalSlides);
 
                         UpdateNavigationPanelsVisibility();
                         UpdateNavigationButtonStyles();
@@ -112,6 +102,11 @@ namespace Ink_Canvas.Helpers
                                 MainWindow.MoveWindow(new WindowInteropHelper(_mainWindow).Handle, 0, 0,
                                     System.Windows.Forms.Screen.PrimaryScreen.Bounds.Width,
                                     System.Windows.Forms.Screen.PrimaryScreen.Bounds.Height, true);
+
+                                // MoveWindow 触发的 WM_WINDOWPOSCHANGING + 重绘会打断面板的 ShowWithFadeIn 动画，
+                                // 在窗口尺寸最终确定后重新评估一次翻页面板的可见性。
+                                UpdateNavigationPanelsVisibility();
+                                UpdateNavigationButtonStyles();
                             }), DispatcherPriority.ApplicationIdle);
 
                             _mainWindow.isFullScreenApplied = true; // 标记已应用全屏处理
@@ -158,18 +153,7 @@ namespace Ink_Canvas.Helpers
             {
                 try
                 {
-                    // 只有在页数有效时才更新页码显示
-                    if (currentSlide > 0 && totalSlides > 0)
-                    {
-                        _mainWindow.PPTBtnPageNow.Text = currentSlide.ToString();
-                        _mainWindow.PPTBtnPageTotal.Text = $"/ {totalSlides}";
-                    }
-                    else
-                    {
-                        // 页数无效时清空页码显示
-                        _mainWindow.PPTBtnPageNow.Text = "?";
-                        _mainWindow.PPTBtnPageTotal.Text = "/ ?";
-                    }
+                    SetPageNumberOnAllBars(currentSlide, totalSlides);
                 }
                 catch (Exception ex)
                 {
@@ -178,6 +162,34 @@ namespace Ink_Canvas.Helpers
             });
         }
 
+        private void SetPageNumberOnAllBars(int currentSlide, int totalSlides)
+        {
+            var bars = new[]
+            {
+                _mainWindow.LeftBottomPanelForPPTNavigation,
+                _mainWindow.RightBottomPanelForPPTNavigation,
+                _mainWindow.LeftSidePanelForPPTNavigation,
+                _mainWindow.RightSidePanelForPPTNavigation,
+            };
+            foreach (var bar in bars)
+            {
+                if (bar == null) continue;
+                bar.CurrentSlide = currentSlide;
+                bar.TotalSlides = totalSlides;
+            }
+            // 兼容旧绑定（其它界面通过 ElementName 引用 PPTBtnPageNow / PPTBtnPageTotal）
+            if (currentSlide > 0 && totalSlides > 0)
+            {
+                _mainWindow.PPTBtnPageNow.Text = currentSlide.ToString();
+                _mainWindow.PPTBtnPageTotal.Text = $"/ {totalSlides}";
+            }
+            else
+            {
+                _mainWindow.PPTBtnPageNow.Text = "?";
+                _mainWindow.PPTBtnPageTotal.Text = "/ ?";
+            }
+        }
+
         /// <summary>
         /// 处理PPT放映状态变化
         /// </summary>
@@ -386,16 +398,17 @@ namespace Ink_Canvas.Helpers
 
                 // 页码按钮显示
                 var pageButtonVisibility = options[0] == '2' ? Visibility.Visible : Visibility.Collapsed;
-                _mainWindow.PPTLSPageButton.Visibility = pageButtonVisibility;
-                _mainWindow.PPTRSPageButton.Visibility = pageButtonVisibility;
+                _mainWindow.LeftSidePanelForPPTNavigation.SetPageButtonVisibility(pageButtonVisibility);
+                _mainWindow.RightSidePanelForPPTNavigation.SetPageButtonVisibility(pageButtonVisibility);
 
-                // 透明度设置 - 直接使用用户设置的透明度值
-                _mainWindow.PPTBtnLSBorder.Opacity = PPTLSButtonOpacity;
-                _mainWindow.PPTBtnRSBorder.Opacity = PPTRSButtonOpacity;
+                // 透明度
+                _mainWindow.LeftSidePanelForPPTNavigation.SetBarOpacity(PPTLSButtonOpacity);
+                _mainWindow.RightSidePanelForPPTNavigation.SetBarOpacity(PPTRSButtonOpacity);
 
                 // 颜色主题
                 bool isDarkTheme = options[2] == '2';
-                ApplyButtonTheme(_mainWindow.PPTBtnLSBorder, _mainWindow.PPTBtnRSBorder, isDarkTheme, true);
+                _mainWindow.LeftSidePanelForPPTNavigation.ApplyTheme(isDarkTheme);
+                _mainWindow.RightSidePanelForPPTNavigation.ApplyTheme(isDarkTheme);
             }
             catch (Exception ex)
             {
@@ -414,113 +427,23 @@ namespace Ink_Canvas.Helpers
 
                 // 页码按钮显示
                 var pageButtonVisibility = options[0] == '2' ? Visibility.Visible : Visibility.Collapsed;
-                _mainWindow.PPTLBPageButton.Visibility = pageButtonVisibility;
-                _mainWindow.PPTRBPageButton.Visibility = pageButtonVisibility;
+                _mainWindow.LeftBottomPanelForPPTNavigation.SetPageButtonVisibility(pageButtonVisibility);
+                _mainWindow.RightBottomPanelForPPTNavigation.SetPageButtonVisibility(pageButtonVisibility);
 
-                // 透明度设置 - 直接使用用户设置的透明度值
-                _mainWindow.PPTBtnLBBorder.Opacity = PPTLBButtonOpacity;
-                _mainWindow.PPTBtnRBBorder.Opacity = PPTRBButtonOpacity;
+                // 透明度
+                _mainWindow.LeftBottomPanelForPPTNavigation.SetBarOpacity(PPTLBButtonOpacity);
+                _mainWindow.RightBottomPanelForPPTNavigation.SetBarOpacity(PPTRBButtonOpacity);
 
                 // 颜色主题
                 bool isDarkTheme = options[2] == '2';
-                ApplyButtonTheme(_mainWindow.PPTBtnLBBorder, _mainWindow.PPTBtnRBBorder, isDarkTheme, false);
+                _mainWindow.LeftBottomPanelForPPTNavigation.ApplyTheme(isDarkTheme);
+                _mainWindow.RightBottomPanelForPPTNavigation.ApplyTheme(isDarkTheme);
             }
             catch (Exception ex)
             {
                 LogHelper.WriteLogToFile($"更新底部按钮样式失败: {ex}", LogHelper.LogType.Error);
             }
         }
-
-        private void ApplyButtonTheme(Border leftBorder, Border rightBorder, bool isDarkTheme, bool isSideButton)
-        {
-            try
-            {
-                Color backgroundColor, borderColor, foregroundColor, feedbackColor;
-
-                if (isDarkTheme)
-                {
-                    backgroundColor = Color.FromRgb(39, 39, 42);
-                    borderColor = Color.FromRgb(82, 82, 91);
-                    foregroundColor = Colors.White;
-                    feedbackColor = Colors.White;
-                }
-                else
-                {
-                    backgroundColor = Color.FromRgb(244, 244, 245);
-                    borderColor = Color.FromRgb(161, 161, 170);
-                    foregroundColor = Color.FromRgb(39, 39, 42);
-                    feedbackColor = Color.FromRgb(24, 24, 27);
-                }
-
-                // 应用背景和边框颜色
-                var backgroundBrush = new SolidColorBrush(backgroundColor);
-                var borderBrush = new SolidColorBrush(borderColor);
-
-                leftBorder.Background = backgroundBrush;
-                leftBorder.BorderBrush = borderBrush;
-                rightBorder.Background = backgroundBrush;
-                rightBorder.BorderBrush = borderBrush;
-
-                // 应用图标和文字颜色
-                var foregroundBrush = new SolidColorBrush(foregroundColor);
-                var feedbackBrush = new SolidColorBrush(feedbackColor);
-
-                if (isSideButton)
-                {
-                    ApplySideButtonColors(foregroundBrush, feedbackBrush);
-                }
-                else
-                {
-                    ApplyBottomButtonColors(foregroundBrush, feedbackBrush);
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"应用按钮主题失败: {ex}", LogHelper.LogType.Error);
-            }
-        }
-
-        private void ApplySideButtonColors(SolidColorBrush foregroundBrush, SolidColorBrush feedbackBrush)
-        {
-            // 图标颜色
-            _mainWindow.PPTLSPreviousButtonGeometry.Brush = foregroundBrush;
-            _mainWindow.PPTRSPreviousButtonGeometry.Brush = foregroundBrush;
-            _mainWindow.PPTLSNextButtonGeometry.Brush = foregroundBrush;
-            _mainWindow.PPTRSNextButtonGeometry.Brush = foregroundBrush;
-
-            // 反馈背景颜色
-            _mainWindow.PPTLSPreviousButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTRSPreviousButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTLSPageButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTRSPageButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTLSNextButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTRSNextButtonFeedbackBorder.Background = feedbackBrush;
-
-            // 文字颜色
-            TextBlock.SetForeground(_mainWindow.PPTLSPageButton, foregroundBrush);
-            TextBlock.SetForeground(_mainWindow.PPTRSPageButton, foregroundBrush);
-        }
-
-        private void ApplyBottomButtonColors(SolidColorBrush foregroundBrush, SolidColorBrush feedbackBrush)
-        {
-            // 图标颜色
-            _mainWindow.PPTLBPreviousButtonGeometry.Brush = foregroundBrush;
-            _mainWindow.PPTRBPreviousButtonGeometry.Brush = foregroundBrush;
-            _mainWindow.PPTLBNextButtonGeometry.Brush = foregroundBrush;
-            _mainWindow.PPTRBNextButtonGeometry.Brush = foregroundBrush;
-
-            // 反馈背景颜色
-            _mainWindow.PPTLBPreviousButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTRBPreviousButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTLBPageButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTRBPageButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTLBNextButtonFeedbackBorder.Background = feedbackBrush;
-            _mainWindow.PPTRBNextButtonFeedbackBorder.Background = feedbackBrush;
-
-            // 文字颜色
-            TextBlock.SetForeground(_mainWindow.PPTLBPageButton, foregroundBrush);
-            TextBlock.SetForeground(_mainWindow.PPTRBPageButton, foregroundBrush);
-        }
         #endregion
     }
 }

Ink Canvas/Helpers/PdfWinRtHelper.cs

@@ -0,0 +1,79 @@
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Media.Imaging;
+using Windows.Data.Pdf;
+using Windows.Storage;
+using Windows.Storage.Streams;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// 使用 Windows.Data.Pdf（WinRT）将 PDF 页渲染为 WPF 可用的位图。
+    /// </summary>
+    internal static class PdfWinRtHelper
+    {
+        public static async Task<uint> GetPageCountAsync(string pdfPath)
+        {
+            if (string.IsNullOrWhiteSpace(pdfPath) || !File.Exists(pdfPath))
+                return 0;
+
+            var file = await StorageFile.GetFileFromPathAsync(pdfPath).AsTask();
+            var doc = await PdfDocument.LoadFromFileAsync(file).AsTask();
+            if (doc.IsPasswordProtected)
+                return 0;
+            return doc.PageCount;
+        }
+
+        public static async Task<BitmapSource> RenderPageToBitmapSourceAsync(string pdfPath, uint pageIndex)
+        {
+            if (string.IsNullOrWhiteSpace(pdfPath) || !File.Exists(pdfPath))
+                return null;
+
+            var file = await StorageFile.GetFileFromPathAsync(pdfPath).AsTask();
+            var doc = await PdfDocument.LoadFromFileAsync(file).AsTask();
+            if (doc.IsPasswordProtected)
+                return null;
+            if (pageIndex >= doc.PageCount)
+                return null;
+
+            var page = doc.GetPage(pageIndex);
+            try
+            {
+                using (var ras = new InMemoryRandomAccessStream())
+                {
+                    await page.RenderToStreamAsync(ras).AsTask();
+                    ras.Seek(0);
+
+                    var ms = new MemoryStream();
+                    using (var netStream = ras.AsStreamForRead())
+                        netStream.CopyTo(ms);
+                    ms.Position = 0;
+
+                    try
+                    {
+                        return await Application.Current.Dispatcher.InvokeAsync(() =>
+                        {
+                            var bi = new BitmapImage();
+                            bi.BeginInit();
+                            bi.StreamSource = ms;
+                            bi.CacheOption = BitmapCacheOption.OnLoad;
+                            bi.EndInit();
+                            bi.Freeze();
+                            return (BitmapSource)bi;
+                        });
+                    }
+                    finally
+                    {
+                        ms.Dispose();
+                    }
+                }
+            }
+            finally
+            {
+                (page as IDisposable)?.Dispose();
+            }
+        }
+    }
+}

Ink Canvas/Helpers/Plugins/BuiltIn/SuperLauncher/LauncherButton.cs

@@ -1,274 +0,0 @@
-using iNKORE.UI.WPF.Controls;
-using System;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Media;
-
-namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
-{
-    /// <summary>
-    /// 启动台按钮控件
-    /// </summary>
-    public class LauncherButton
-    {
-        /// <summary>
-        /// 父插件
-        /// </summary>
-        private readonly SuperLauncherPlugin _plugin;
-
-        /// <summary>
-        /// 实际按钮控件
-        /// </summary>
-        private readonly SimpleStackPanel _panel;
-
-        /// <summary>
-        /// 获取按钮UI元素
-        /// </summary>
-        public UIElement Element => _panel;
-
-        /// <summary>
-        /// 构造函数
-        /// </summary>
-        /// <param name="plugin">父插件</param>
-        public LauncherButton(SuperLauncherPlugin plugin)
-        {
-            try
-            {
-                _plugin = plugin;
-                LogHelper.WriteLogToFile("开始创建启动台按钮");
-
-                // 创建SimpleStackPanel
-                _panel = new SimpleStackPanel
-                {
-                    Name = "Launcher_Icon",
-                    Orientation = Orientation.Vertical,
-                    HorizontalAlignment = HorizontalAlignment.Center,
-                    Width = 28,
-                    Margin = new Thickness(0, -2, 0, 0),
-                    Background = Brushes.Transparent
-                };
-
-                LogHelper.WriteLogToFile("创建SimpleStackPanel完成");
-
-                // 添加图标
-                var image = CreateIconImage();
-                _panel.Children.Add(image);
-
-                // 添加文本
-                TextBlock textBlock = new TextBlock
-                {
-                    Text = "启动台",
-                    Foreground = Brushes.Black,
-                    FontSize = 8,
-                    Margin = new Thickness(0, 1, 0, 0),
-                    TextAlignment = TextAlignment.Center
-                };
-                _panel.Children.Add(textBlock);
-
-                // 设置鼠标事件
-                _panel.MouseDown += Panel_MouseDown;
-                _panel.MouseUp += Panel_MouseUp;
-                _panel.MouseLeave += Panel_MouseLeave;
-
-                // 右键菜单支持
-                _panel.ContextMenu = CreateContextMenu();
-
-                // 设置工具提示
-                _panel.ToolTip = "启动台";
-
-                LogHelper.WriteLogToFile("启动台按钮创建完成");
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"创建启动台按钮时出错: {ex.Message}", LogHelper.LogType.Error);
-                LogHelper.NewLog(ex);
-            }
-        }
-
-        /// <summary>
-        /// 创建右键菜单
-        /// </summary>
-        private ContextMenu CreateContextMenu()
-        {
-            try
-            {
-                // 创建菜单
-                ContextMenu menu = new ContextMenu();
-
-                // 创建位置切换菜单项
-                MenuItem positionMenuItem = new MenuItem();
-                positionMenuItem.Header = _plugin.Config.ButtonPosition == LauncherButtonPosition.Left ?
-                    "移至右侧" : "移至左侧";
-                positionMenuItem.Click += (s, e) =>
-                {
-                    // 切换位置
-                    _plugin.Config.ButtonPosition = _plugin.Config.ButtonPosition == LauncherButtonPosition.Left ?
-                        LauncherButtonPosition.Right : LauncherButtonPosition.Left;
-
-                    // 更新按钮位置
-                    _plugin.UpdateButtonPosition();
-
-                    // 保存配置
-                    _plugin.SaveConfig();
-
-                    LogHelper.WriteLogToFile($"通过右键菜单切换启动台按钮位置为: {_plugin.Config.ButtonPosition}");
-                };
-                menu.Items.Add(positionMenuItem);
-
-                // 添加设置菜单项
-                MenuItem settingsMenuItem = new MenuItem();
-                settingsMenuItem.Header = "打开设置";
-                settingsMenuItem.Click += (s, e) =>
-                {
-                    // 打开插件设置窗口
-                    var mainWindow = Application.Current.MainWindow;
-                    if (mainWindow != null)
-                    {
-                        try
-                        {
-                            // 使用反射调用主窗口的ShowPluginSettings方法
-                            var method = mainWindow.GetType().GetMethod("ShowPluginSettings");
-                            if (method != null)
-                            {
-                                method.Invoke(mainWindow, null);
-                                LogHelper.WriteLogToFile("已打开插件设置窗口");
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            LogHelper.WriteLogToFile($"打开插件设置窗口失败: {ex.Message}", LogHelper.LogType.Error);
-                        }
-                    }
-                };
-                menu.Items.Add(settingsMenuItem);
-
-                return menu;
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"创建右键菜单时出错: {ex.Message}", LogHelper.LogType.Error);
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// 获取实际的UI元素
-        /// </summary>
-        [Obsolete("使用Element属性代替")]
-        public UIElement GetUIElement()
-        {
-            return _panel;
-        }
-
-        /// <summary>
-        /// 创建图标图像
-        /// </summary>
-        private Image CreateIconImage()
-        {
-            try
-            {
-                // 创建图像
-                Image image = new Image
-                {
-                    Height = 17,
-                    Margin = new Thickness(0, 3, 0, 0)
-                };
-
-                // 设置位图缩放模式
-                RenderOptions.SetBitmapScalingMode(image, BitmapScalingMode.HighQuality);
-
-                // 创建绘图图像
-                DrawingImage drawingImage = new DrawingImage();
-                DrawingGroup drawingGroup = new DrawingGroup();
-                drawingGroup.ClipGeometry = Geometry.Parse("M0,0 V24 H24 V0 H0 Z");
-
-                // 使用提供的应用网格图标
-                GeometryDrawing geometryDrawing = new GeometryDrawing
-                {
-                    Brush = new SolidColorBrush(Color.FromRgb(0x1B, 0x1B, 0x1B)),
-                    Geometry = Geometry.Parse("F0 M24,24z M0,0z M4.41721,4.29873C4.35178,4.29873,4.29873,4.35178,4.29873,4.41721L4.29873,9.15646C4.29873,9.22189,4.35178,9.27494,4.41721,9.27494L9.15646,9.27494C9.22189,9.27494,9.27494,9.22189,9.27494,9.15646L9.27494,4.41721C9.27494,4.35178,9.22189,4.29873,9.15646,4.29873L4.41721,4.29873z M2.64,4.41721C2.64,3.43569,3.43569,2.64,4.41721,2.64L9.15646,2.64C10.138,2.64,10.9337,3.43569,10.9337,4.41721L10.9337,9.15646C10.9337,10.138,10.138,10.9337,9.15646,10.9337L4.41721,10.9337C3.43569,10.9337,2.64,10.138,2.64,9.15646L2.64,4.41721z M14.8435,4.29873C14.7781,4.29873,14.7251,4.35178,14.7251,4.41721L14.7251,9.15646C14.7251,9.22189,14.7781,9.27494,14.8435,9.27494L19.5828,9.27494C19.6482,9.27494,19.7013,9.22189,19.7013,9.15646L19.7013,4.41721C19.7013,4.35178,19.6482,4.29873,19.5828,4.29873L14.8435,4.29873z M13.0663,4.41721C13.0663,3.43569,13.862,2.64,14.8435,2.64L19.5828,2.64C20.5643,2.64,21.36,3.43569,21.36,4.41721L21.36,9.15646C21.36,10.138,20.5643,10.9337,19.5828,10.9337L14.8435,10.9337C13.862,10.9337,13.0663,10.138,13.0663,9.15646L13.0663,4.41721z M14.8435,14.7251C14.7781,14.7251,14.7251,14.7781,14.7251,14.8435L14.7251,19.5828C14.7251,19.6482,14.7781,19.7013,14.8435,19.7013L19.5828,19.7013C19.6482,19.7013,19.7013,19.6482,19.7013,19.5828L19.7013,14.8435C19.7013,14.7781,19.6482,14.7251,19.5828,14.7251L14.8435,14.7251z M13.0663,14.8435C13.0663,13.862,13.862,13.0663,14.8435,13.0663L19.5828,13.0663C20.5643,13.0663,21.36,13.862,21.36,14.8435L21.36,19.5828C21.36,20.5643,20.5643,21.36,19.5828,21.36L14.8435,21.36C13.862,21.36,13.0663,20.5643,13.0663,19.5828L13.0663,14.8435z M4.41721,14.7251C4.35178,14.7251,4.29873,14.7781,4.29873,14.8435L4.29873,19.5828C4.29873,19.6482,4.35178,19.7013,4.41721,19.7013L9.15646,19.7013C9.22189,19.7013,9.27494,19.6482,9.27494,19.5828L9.27494,14.8435C9.27494,14.7781,9.22189,14.7251,9.15646,14.7251L4.41721,14.7251z M2.64,14.8435C2.64,13.862,3.43569,13.0663,4.41721,13.0663L9.15646,13.0663C10.138,13.0663,10.9337,13.862,10.9337,14.8435L10.9337,19.5828C10.9337,20.5643,10.138,21.36,9.15646,21.36L4.41721,21.36C3.43569,21.36,2.64,20.5643,2.64,19.5828L2.64,14.8435z")
-                };
-
-                drawingGroup.Children.Add(geometryDrawing);
-
-                // 设置图像源
-                drawingImage.Drawing = drawingGroup;
-                image.Source = drawingImage;
-
-                return image;
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"创建图标图像时出错: {ex.Message}", LogHelper.LogType.Error);
-                LogHelper.NewLog(ex);
-
-                // 返回一个空图像
-                return new Image();
-            }
-        }
-
-        /// <summary>
-        /// 鼠标按下事件
-        /// </summary>
-        private void Panel_MouseDown(object sender, MouseButtonEventArgs e)
-        {
-            try
-            {
-                // 提供反馈
-                _panel.Background = new SolidColorBrush(Color.FromArgb(40, 0, 0, 0));
-                LogHelper.WriteLogToFile("启动台按钮鼠标按下");
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"启动台按钮鼠标按下事件出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 鼠标抬起事件
-        /// </summary>
-        private void Panel_MouseUp(object sender, MouseButtonEventArgs e)
-        {
-            try
-            {
-                // 只有左键点击才显示启动台窗口
-                if (e.ChangedButton != MouseButton.Left)
-                {
-                    return;
-                }
-
-                // 恢复背景
-                _panel.Background = Brushes.Transparent;
-                LogHelper.WriteLogToFile("启动台按钮鼠标抬起，准备显示启动台窗口");
-
-                // 获取按钮在屏幕上的位置
-                Point buttonPosition = _panel.PointToScreen(new Point(_panel.ActualWidth / 2, 0));
-
-                // 显示启动台窗口
-                _plugin.ShowLauncherWindow(buttonPosition);
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"启动台按钮鼠标抬起事件出错: {ex.Message}", LogHelper.LogType.Error);
-                LogHelper.NewLog(ex);
-            }
-        }
-
-        /// <summary>
-        /// 鼠标离开事件
-        /// </summary>
-        private void Panel_MouseLeave(object sender, MouseEventArgs e)
-        {
-            try
-            {
-                // 恢复背景
-                _panel.Background = Brushes.Transparent;
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"启动台按钮鼠标离开事件出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-    }
-}

Ink Canvas/Helpers/Plugins/BuiltIn/SuperLauncher/LauncherModels.cs

@@ -1,332 +0,0 @@
-using Microsoft.Win32;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Drawing;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Windows;
-using System.Windows.Interop;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-
-namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
-{
-    /// <summary>
-    /// 启动台按钮位置
-    /// </summary>
-    public enum LauncherButtonPosition
-    {
-        /// <summary>
-        /// 左侧
-        /// </summary>
-        Left,
-
-        /// <summary>
-        /// 右侧
-        /// </summary>
-        Right
-    }
-
-    /// <summary>
-    /// 启动台配置
-    /// </summary>
-    public class LauncherConfig
-    {
-        /// <summary>
-        /// 启动台按钮位置
-        /// </summary>
-        public LauncherButtonPosition ButtonPosition { get; set; } = LauncherButtonPosition.Right;
-
-        /// <summary>
-        /// 启动台应用程序列表
-        /// </summary>
-        public List<LauncherItem> Items { get; set; } = new List<LauncherItem>();
-    }
-
-    /// <summary>
-    /// 启动台应用项
-    /// </summary>
-    public class LauncherItem
-    {
-        /// <summary>
-        /// 应用程序名称
-        /// </summary>
-        public string Name { get; set; }
-
-        /// <summary>
-        /// 应用程序路径
-        /// </summary>
-        public string Path { get; set; }
-
-        /// <summary>
-        /// 是否可见
-        /// </summary>
-        public bool IsVisible { get; set; } = true;
-
-        /// <summary>
-        /// 在启动台中的位置（0-39）
-        /// </summary>
-        public int Position { get; set; } = -1;
-
-        /// <summary>
-        /// 是否已固定位置
-        /// </summary>
-        public bool IsPositionFixed { get; set; } = false;
-
-        /// <summary>
-        /// 图标缓存
-        /// </summary>
-        [JsonIgnore]
-        private ImageSource _iconCache;
-
-        /// <summary>
-        /// 获取应用程序图标
-        /// </summary>
-        [JsonIgnore]
-        public ImageSource Icon
-        {
-            get
-            {
-                if (_iconCache != null)
-                {
-                    return _iconCache;
-                }
-
-                try
-                {
-                    if (File.Exists(Path))
-                    {
-                        // 从文件中获取图标
-                        Icon icon = System.Drawing.Icon.ExtractAssociatedIcon(Path);
-                        if (icon != null)
-                        {
-                            _iconCache = Imaging.CreateBitmapSourceFromHIcon(
-                                icon.Handle,
-                                Int32Rect.Empty,
-                                BitmapSizeOptions.FromEmptyOptions());
-
-                            icon.Dispose();
-                            return _iconCache;
-                        }
-                    }
-                    else
-                    {
-                        // 从注册表中获取文件类型关联图标
-                        string extension = System.IO.Path.GetExtension(Path);
-                        if (!string.IsNullOrEmpty(extension))
-                        {
-                            string fileType = Registry.ClassesRoot.OpenSubKey(extension)?.GetValue(string.Empty) as string;
-                            if (!string.IsNullOrEmpty(fileType))
-                            {
-                                string iconPath = Registry.ClassesRoot.OpenSubKey(fileType + "\\DefaultIcon")?.GetValue(string.Empty) as string;
-                                if (!string.IsNullOrEmpty(iconPath))
-                                {
-                                    string[] parts = iconPath.Split(',');
-                                    string iconFile = parts[0].Trim('"');
-                                    int iconIndex = parts.Length > 1 ? Convert.ToInt32(parts[1]) : 0;
-
-                                    if (File.Exists(iconFile))
-                                    {
-                                        Icon icon = IconExtractor.Extract(iconFile, iconIndex, true);
-                                        if (icon != null)
-                                        {
-                                            _iconCache = Imaging.CreateBitmapSourceFromHIcon(
-                                                icon.Handle,
-                                                Int32Rect.Empty,
-                                                BitmapSizeOptions.FromEmptyOptions());
-
-                                            icon.Dispose();
-                                            return _iconCache;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    LogHelper.WriteLogToFile($"获取应用图标时出错: {ex.Message}", LogHelper.LogType.Error);
-                }
-
-                // 返回默认图标
-                return GetDefaultIcon();
-            }
-        }
-
-        /// <summary>
-        /// 获取默认图标
-        /// </summary>
-        private ImageSource GetDefaultIcon()
-        {
-            try
-            {
-                // 对于资源管理器，使用特定图标
-                if (Path.EndsWith("explorer.exe", StringComparison.OrdinalIgnoreCase))
-                {
-                    try
-                    {
-                        // 直接从C:\Windows\explorer.exe获取图标
-                        string explorerPath = @"C:\Windows\explorer.exe";
-                        if (File.Exists(explorerPath))
-                        {
-                            Icon icon = System.Drawing.Icon.ExtractAssociatedIcon(explorerPath);
-                            if (icon != null)
-                            {
-                                _iconCache = Imaging.CreateBitmapSourceFromHIcon(
-                                    icon.Handle,
-                                    Int32Rect.Empty,
-                                    BitmapSizeOptions.FromEmptyOptions());
-
-                                icon.Dispose();
-                                return _iconCache;
-                            }
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        LogHelper.WriteLogToFile($"获取资源管理器图标时出错: {ex.Message}", LogHelper.LogType.Warning);
-                        // 如果获取Windows图标失败，回退到默认图标
-                    }
-
-                    // 回退到备用图标
-                    string explorerIconPath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Resources", "Icons-Fluent", "ic_fluent_folder_24_regular.png");
-                    if (File.Exists(explorerIconPath))
-                    {
-                        Uri uri = new Uri(explorerIconPath);
-                        BitmapImage image = new BitmapImage(uri);
-                        _iconCache = image;
-                        return _iconCache;
-                    }
-                }
-
-                // 返回一个简单的默认图标
-                string iconPath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Resources", "Icons-png", "icc.png");
-                if (File.Exists(iconPath))
-                {
-                    Uri uri = new Uri(iconPath);
-                    BitmapImage image = new BitmapImage(uri);
-                    _iconCache = image;
-                    return _iconCache;
-                }
-
-                // 如果还是没有找到，尝试使用应用程序图标
-                string appIconPath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Resources", "Icons-Fluent", "ic_fluent_apps_24_regular.png");
-                if (File.Exists(appIconPath))
-                {
-                    Uri uri = new Uri(appIconPath);
-                    BitmapImage image = new BitmapImage(uri);
-                    _iconCache = image;
-                    return _iconCache;
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"获取默认图标时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// 启动应用程序
-        /// </summary>
-        public void Launch()
-        {
-            try
-            {
-                if (string.IsNullOrEmpty(Path))
-                {
-                    LogHelper.WriteLogToFile("无法启动应用程序：路径为空", LogHelper.LogType.Error);
-                    return;
-                }
-
-                // 检查文件是否存在
-                if (!File.Exists(Path) && !Path.Contains(":\\"))
-                {
-                    // 可能是系统命令，如explorer.exe
-                    ProcessStartInfo psi = new ProcessStartInfo
-                    {
-                        FileName = Path,
-                        UseShellExecute = true
-                    };
-                    Process.Start(psi);
-                }
-                else
-                {
-                    // 使用Process.Start启动应用程序
-                    ProcessStartInfo psi = new ProcessStartInfo
-                    {
-                        FileName = Path,
-                        UseShellExecute = true
-                    };
-                    Process.Start(psi);
-                }
-
-                LogHelper.WriteLogToFile($"已启动应用程序: {Path}");
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"启动应用程序时出错: {ex.Message}", LogHelper.LogType.Error);
-                MessageBox.Show($"启动应用程序时出错: {ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
-            }
-        }
-    }
-
-    /// <summary>
-    /// 图标提取工具类
-    /// </summary>
-    public static class IconExtractor
-    {
-        /// <summary>
-        /// 从文件中提取图标
-        /// </summary>
-        /// <param name="file">文件路径</param>
-        /// <param name="index">图标索引</param>
-        /// <param name="largeIcon">是否提取大图标</param>
-        /// <returns>提取的图标</returns>
-        public static Icon Extract(string file, int index, bool largeIcon)
-        {
-            try
-            {
-                IntPtr large;
-                IntPtr small;
-                ExtractIconEx(file, index, out large, out small, 1);
-
-                try
-                {
-                    return Icon.FromHandle(largeIcon ? large : small);
-                }
-                catch
-                {
-                    return null;
-                }
-                finally
-                {
-                    if (large != IntPtr.Zero)
-                        DestroyIcon(large);
-
-                    if (small != IntPtr.Zero)
-                        DestroyIcon(small);
-                }
-            }
-            catch
-            {
-                return null;
-            }
-        }
-
-        [DllImport("Shell32.dll", EntryPoint = "ExtractIconEx")]
-        private static extern int ExtractIconEx(
-            [MarshalAs(UnmanagedType.LPStr)] string lpszFile,
-            int nIconIndex,
-            out IntPtr phiconLarge,
-            out IntPtr phiconSmall,
-            int nIcons);
-
-        [DllImport("User32.dll")]
-        private static extern int DestroyIcon(IntPtr hIcon);
-    }
-}

Ink Canvas/Helpers/Plugins/BuiltIn/SuperLauncher/LauncherSettingsControl.xaml

@@ -1,143 +0,0 @@
-<UserControl x:Class="Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher.LauncherSettingsControl"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher"
-             mc:Ignorable="d"
-             d:DesignHeight="500" d:DesignWidth="600">
-
-    <UserControl.Resources>
-        <!-- 自定义按钮样式 -->
-        <Style x:Key="DefaultButtonStyle" TargetType="Button">
-            <Setter Property="FontWeight" Value="SemiBold"/>
-            <Setter Property="FontSize" Value="12"/>
-            <Setter Property="Cursor" Value="Hand"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border x:Name="border"
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="4"
-                                Padding="{TemplateBinding Padding}">
-                            <ContentPresenter HorizontalAlignment="Center"
-                                            VerticalAlignment="Center"
-                                            TextElement.Foreground="{TemplateBinding Foreground}"/>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="border" Property="Opacity" Value="0.8"/>
-                                <Setter Property="Effect">
-                                    <Setter.Value>
-                                        <DropShadowEffect Color="Black" Direction="270" ShadowDepth="2" Opacity="0.3" BlurRadius="4"/>
-                                    </Setter.Value>
-                                </Setter>
-                            </Trigger>
-                            <Trigger Property="IsPressed" Value="True">
-                                <Setter TargetName="border" Property="Opacity" Value="0.6"/>
-                                <Setter Property="RenderTransform">
-                                    <Setter.Value>
-                                        <ScaleTransform ScaleX="0.95" ScaleY="0.95"/>
-                                    </Setter.Value>
-                                </Setter>
-                                <Setter Property="RenderTransformOrigin" Value="0.5,0.5"/>
-                            </Trigger>
-                            <Trigger Property="IsEnabled" Value="False">
-                                <Setter TargetName="border" Property="Opacity" Value="0.4"/>
-                                <Setter Property="Cursor" Value="Arrow"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-    </UserControl.Resources>
-
-    <Grid Margin="10">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="Auto"/>
-        </Grid.RowDefinitions>
-        
-        <!-- 标题 -->
-        <TextBlock Grid.Row="0" Text="超级启动台设置" FontSize="16" FontWeight="Bold" Margin="0,0,0,15" Foreground="Black"/>
-
-        <!-- 基本设置 -->
-        <StackPanel Grid.Row="1" Margin="0,0,0,15">
-            <TextBlock Text="基本设置" FontSize="14" FontWeight="SemiBold" Margin="0,0,0,10" Foreground="Black"/>
-
-            <Grid Margin="10,0,0,0">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="120"/>
-                    <ColumnDefinition Width="*"/>
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto"/>
-                </Grid.RowDefinitions>
-
-                <!-- 按钮位置 -->
-                <TextBlock Grid.Row="0" Grid.Column="0" Text="按钮位置:" VerticalAlignment="Center" Foreground="Black"/>
-                <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" Margin="0,5">
-                    <RadioButton x:Name="RbtnLeft" Content="浮动栏左侧" Margin="0,0,20,0" Checked="RbtnPosition_Checked" Foreground="Black"/>
-                    <RadioButton x:Name="RbtnRight" Content="浮动栏右侧" IsChecked="True" Checked="RbtnPosition_Checked" Foreground="Black"/>
-                </StackPanel>
-            </Grid>
-        </StackPanel>
-        
-        <!-- 应用管理 -->
-        <Grid Grid.Row="2">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="*"/>
-            </Grid.RowDefinitions>
-            
-            <TextBlock Grid.Row="0" Text="应用管理" FontSize="14" FontWeight="SemiBold" Margin="0,0,0,10" Foreground="Black"/>
-            
-            <Border Grid.Row="1" BorderThickness="1" BorderBrush="#CCCCCC" CornerRadius="5">
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="*"/>
-                        <RowDefinition Height="Auto"/>
-                    </Grid.RowDefinitions>
-                    
-                    <!-- 应用列表 -->
-                    <DataGrid Grid.Row="0" x:Name="DgApps" AutoGenerateColumns="False" Margin="5"
-                              CanUserAddRows="False" CanUserDeleteRows="False" 
-                              HeadersVisibility="Column" SelectionMode="Single"
-                              SelectionChanged="DgApps_SelectionChanged">
-                        <DataGrid.Columns>
-                            <DataGridCheckBoxColumn Header="显示" Binding="{Binding IsVisible}" Width="50"/>
-                            <DataGridTextColumn Header="名称" Binding="{Binding Name}" Width="150"/>
-                            <DataGridTextColumn Header="路径" Binding="{Binding Path}" Width="*"/>
-                            <DataGridTextColumn Header="位置" Binding="{Binding Position}" Width="50"/>
-                        </DataGrid.Columns>
-                    </DataGrid>
-                    
-                    <!-- 操作按钮 -->
-                    <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="5">
-                        <Button x:Name="BtnAdd" Content="添加" Padding="10,5" Margin="0,5,5,5" Click="BtnAdd_Click"
-                                Background="#FF007ACC" Foreground="White" BorderBrush="#FF005A9B" BorderThickness="1"
-                                Style="{StaticResource DefaultButtonStyle}"/>
-                        <Button x:Name="BtnEdit" Content="编辑" Padding="10,5" Margin="5" Click="BtnEdit_Click"
-                                Background="#FF6C757D" Foreground="White" BorderBrush="#FF5A6268" BorderThickness="1"
-                                Style="{StaticResource DefaultButtonStyle}"/>
-                        <Button x:Name="BtnDelete" Content="删除" Padding="10,5" Margin="5" Click="BtnDelete_Click"
-                                Background="#FFDC3545" Foreground="White" BorderBrush="#FFBD2130" BorderThickness="1"
-                                Style="{StaticResource DefaultButtonStyle}"/>
-                    </StackPanel>
-                </Grid>
-            </Border>
-        </Grid>
-        
-        <!-- 底部按钮 -->
-        <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,15,0,0">
-            <Button x:Name="BtnSave" Content="保存设置" Padding="15,5" Click="BtnSave_Click"
-                    Background="#FF28A745" Foreground="White" BorderBrush="#FF1E7E34" BorderThickness="1"
-                    Style="{StaticResource DefaultButtonStyle}"/>
-        </StackPanel>
-    </Grid>
-</UserControl> 

Ink Canvas/Helpers/Plugins/BuiltIn/SuperLauncher/LauncherSettingsControl.xaml.cs

@@ -1,396 +0,0 @@
-using Ink_Canvas.Windows;
-using Microsoft.Win32;
-using System;
-using System.ComponentModel;
-using System.IO;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
-{
-    /// <summary>
-    /// LauncherSettingsControl.xaml 的交互逻辑
-    /// </summary>
-    public partial class LauncherSettingsControl : UserControl
-    {
-        /// <summary>
-        /// 父插件
-        /// </summary>
-        private readonly SuperLauncherPlugin _plugin;
-
-        /// <summary>
-        /// 构造函数
-        /// </summary>
-        /// <param name="plugin">父插件</param>
-        public LauncherSettingsControl(SuperLauncherPlugin plugin)
-        {
-            InitializeComponent();
-
-            _plugin = plugin;
-
-            // 设置按钮位置
-            RbtnLeft.IsChecked = _plugin.Config.ButtonPosition == LauncherButtonPosition.Left;
-            RbtnRight.IsChecked = _plugin.Config.ButtonPosition == LauncherButtonPosition.Right;
-
-            // 绑定应用列表
-            DgApps.ItemsSource = _plugin.LauncherItems;
-
-            // 初始化按钮状态
-            UpdateButtonStates();
-        }
-
-        /// <summary>
-        /// 更新按钮状态
-        /// </summary>
-        private void UpdateButtonStates()
-        {
-            bool hasSelection = DgApps.SelectedItem != null;
-            BtnEdit.IsEnabled = hasSelection;
-            BtnDelete.IsEnabled = hasSelection;
-        }
-
-        /// <summary>
-        /// 位置单选按钮选择事件
-        /// </summary>
-        private void RbtnPosition_Checked(object sender, RoutedEventArgs e)
-        {
-            if (!IsLoaded) return;
-
-            LauncherButtonPosition oldPosition = _plugin.Config.ButtonPosition;
-
-            if (sender == RbtnLeft)
-            {
-                _plugin.Config.ButtonPosition = LauncherButtonPosition.Left;
-            }
-            else if (sender == RbtnRight)
-            {
-                _plugin.Config.ButtonPosition = LauncherButtonPosition.Right;
-            }
-
-            // 如果位置发生变化，更新按钮位置
-            if (oldPosition != _plugin.Config.ButtonPosition)
-            {
-                try
-                {
-                    // 更新按钮位置
-                    _plugin.UpdateButtonPosition();
-
-                    // 保存配置
-                    _plugin.SaveConfig();
-
-                    LogHelper.WriteLogToFile($"启动台按钮位置已更改为: {_plugin.Config.ButtonPosition}");
-                }
-                catch (Exception ex)
-                {
-                    LogHelper.WriteLogToFile($"更新启动台按钮位置时出错: {ex.Message}", LogHelper.LogType.Error);
-                    MessageBox.Show($"更新启动台按钮位置时出错: {ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 添加按钮点击事件
-        /// </summary>
-        private void BtnAdd_Click(object sender, RoutedEventArgs e)
-        {
-            try
-            {
-                // 创建新的启动项
-                LauncherItem item = new LauncherItem
-                {
-                    Name = "",
-                    Path = "",
-                    IsVisible = true,
-                    Position = -1 // 让插件管理器分配位置
-                };
-
-                // 直接显示编辑对话框
-                EditLauncherItem(item, true);
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"添加启动项时出错: {ex.Message}", LogHelper.LogType.Error);
-                MessageBox.Show($"添加启动项时出错: {ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
-            }
-        }
-
-        /// <summary>
-        /// 编辑应用按钮点击事件
-        /// </summary>
-        private void BtnEdit_Click(object sender, RoutedEventArgs e)
-        {
-            if (DgApps.SelectedItem is LauncherItem item)
-            {
-                EditLauncherItem(item, false);
-            }
-        }
-
-        /// <summary>
-        /// 删除应用按钮点击事件
-        /// </summary>
-        private void BtnDelete_Click(object sender, RoutedEventArgs e)
-        {
-            if (DgApps.SelectedItem is LauncherItem item)
-            {
-                // 确认删除
-                MessageBoxResult result = MessageBox.Show(
-                    $"确定要删除 {item.Name} 吗？",
-                    "删除确认",
-                    MessageBoxButton.YesNo,
-                    MessageBoxImage.Question);
-
-                if (result == MessageBoxResult.Yes)
-                {
-                    // 从集合中移除
-                    _plugin.LauncherItems.Remove(item);
-
-                    // 保存配置
-                    _plugin.SaveConfig();
-                }
-            }
-        }
-
-        /// <summary>
-        /// 保存设置按钮点击事件
-        /// </summary>
-        private void BtnSave_Click(object sender, RoutedEventArgs e)
-        {
-            try
-            {
-                // 保存配置
-                _plugin.SaveConfig();
-
-                // 如果插件已启用，重新加载启动台按钮
-                if (_plugin.IsEnabled)
-                {
-                    _plugin.Disable();
-                    _plugin.Enable();
-                }
-                else
-                {
-                    // 如果插件未启用，则启用它
-                    _plugin.Enable();
-
-                    // 通知PluginSettingsWindow刷新插件列表
-                    var window = Window.GetWindow(this);
-                    if (window is PluginSettingsWindow pluginSettingsWindow)
-                    {
-                        // 触发刷新
-                        pluginSettingsWindow.RefreshPluginList();
-                    }
-                }
-
-                MessageBox.Show("设置已保存并应用！", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"保存设置时出错: {ex.Message}", LogHelper.LogType.Error);
-                MessageBox.Show($"保存设置时出错: {ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
-            }
-        }
-
-        /// <summary>
-        /// 应用项选择变更事件
-        /// </summary>
-        private void DgApps_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            UpdateButtonStates();
-        }
-
-        /// <summary>
-        /// 编辑启动项
-        /// </summary>
-        /// <param name="item">启动项</param>
-        /// <param name="isNew">是否为新建</param>
-        private void EditLauncherItem(LauncherItem item, bool isNew)
-        {
-            // 创建简单的编辑窗口
-            Window editWindow = new Window
-            {
-                Title = isNew ? "添加" : "编辑应用",
-                Width = 400,
-                Height = 200,
-                WindowStartupLocation = WindowStartupLocation.CenterScreen,
-                ResizeMode = ResizeMode.NoResize
-            };
-
-            // 创建编辑表单
-            Grid grid = new Grid
-            {
-                Margin = new Thickness(20)
-            };
-
-            grid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
-            grid.RowDefinitions.Add(new RowDefinition { Height = GridLength.Auto });
-            grid.RowDefinitions.Add(new RowDefinition { Height = new GridLength(1, GridUnitType.Star) });
-
-            grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(80) });
-            grid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
-
-            // 名称输入框
-            TextBlock nameLabel = new TextBlock
-            {
-                Text = "名称:",
-                VerticalAlignment = VerticalAlignment.Center
-            };
-            TextBox nameTextBox = new TextBox
-            {
-                Text = item.Name,
-                Margin = new Thickness(0, 5, 0, 5)
-            };
-
-            Grid.SetRow(nameLabel, 0);
-            Grid.SetColumn(nameLabel, 0);
-            Grid.SetRow(nameTextBox, 0);
-            Grid.SetColumn(nameTextBox, 1);
-
-            grid.Children.Add(nameLabel);
-            grid.Children.Add(nameTextBox);
-
-            // 路径输入框
-            TextBlock pathLabel = new TextBlock
-            {
-                Text = "路径:",
-                VerticalAlignment = VerticalAlignment.Center
-            };
-            Grid pathGrid = new Grid();
-            pathGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength(1, GridUnitType.Star) });
-            pathGrid.ColumnDefinitions.Add(new ColumnDefinition { Width = new GridLength() });
-
-            TextBox pathTextBox = new TextBox
-            {
-                Text = item.Path,
-                Margin = new Thickness(0, 5, 5, 5)
-            };
-            Button browseButton = new Button
-            {
-                Content = "浏览",
-                Padding = new Thickness(5, 0, 5, 0),
-                Margin = new Thickness(0, 5, 0, 5)
-            };
-
-            browseButton.Click += (s, e) =>
-            {
-                OpenFileDialog dialog = new OpenFileDialog
-                {
-                    Title = "选择应用程序",
-                    Filter = "应用程序 (*.exe)|*.exe|所有文件 (*.*)|*.*",
-                    Multiselect = false,
-                    FileName = pathTextBox.Text
-                };
-
-                if (dialog.ShowDialog() == true)
-                {
-                    pathTextBox.Text = dialog.FileName;
-
-                    // 如果选择的是.exe文件，自动获取文件名填入名称字段
-                    if (Path.GetExtension(dialog.FileName).ToLower() == ".exe")
-                    {
-                        string fileName = Path.GetFileNameWithoutExtension(dialog.FileName);
-                        // 只有在名称字段为空或者是新建项目时才自动填入
-                        if (string.IsNullOrWhiteSpace(nameTextBox.Text) || isNew)
-                        {
-                            nameTextBox.Text = fileName;
-                        }
-                    }
-                }
-            };
-
-            Grid.SetColumn(pathTextBox, 0);
-            Grid.SetColumn(browseButton, 1);
-            pathGrid.Children.Add(pathTextBox);
-            pathGrid.Children.Add(browseButton);
-
-            Grid.SetRow(pathLabel, 1);
-            Grid.SetColumn(pathLabel, 0);
-            Grid.SetRow(pathGrid, 1);
-            Grid.SetColumn(pathGrid, 1);
-
-            grid.Children.Add(pathLabel);
-            grid.Children.Add(pathGrid);
-
-            // 确认和取消按钮
-            StackPanel buttonPanel = new StackPanel
-            {
-                Orientation = Orientation.Horizontal,
-                HorizontalAlignment = HorizontalAlignment.Right,
-                Margin = new Thickness(0, 10, 0, 0)
-            };
-
-            Button okButton = new Button
-            {
-                Content = "确定",
-                Padding = new Thickness(15, 5, 15, 5),
-                Margin = new Thickness(0, 0, 10, 0),
-                IsDefault = true
-            };
-
-            Button cancelButton = new Button
-            {
-                Content = "取消",
-                Padding = new Thickness(15, 5, 15, 5),
-                IsCancel = true
-            };
-
-            okButton.Click += (s, e) =>
-            {
-                // 验证输入
-                if (string.IsNullOrWhiteSpace(nameTextBox.Text))
-                {
-                    MessageBox.Show("请输入应用名称！", "提示", MessageBoxButton.OK, MessageBoxImage.Warning);
-                    return;
-                }
-
-                if (string.IsNullOrWhiteSpace(pathTextBox.Text))
-                {
-                    MessageBox.Show("请输入应用路径！", "提示", MessageBoxButton.OK, MessageBoxImage.Warning);
-                    return;
-                }
-
-                // 更新项目
-                item.Name = nameTextBox.Text;
-                item.Path = pathTextBox.Text;
-
-                // 如果是新建，添加到集合
-                if (isNew)
-                {
-                    _plugin.AddLauncherItem(item);
-                }
-                else
-                {
-                    // 触发属性变更通知，刷新DataGrid
-                    if (DgApps.ItemsSource is ICollectionView view)
-                    {
-                        view.Refresh();
-                    }
-
-                    // 保存配置
-                    _plugin.SaveConfig();
-                }
-
-                editWindow.DialogResult = true;
-                editWindow.Close();
-            };
-
-            cancelButton.Click += (s, e) =>
-            {
-                editWindow.DialogResult = false;
-                editWindow.Close();
-            };
-
-            buttonPanel.Children.Add(okButton);
-            buttonPanel.Children.Add(cancelButton);
-
-            Grid.SetRow(buttonPanel, 2);
-            Grid.SetColumnSpan(buttonPanel, 2);
-
-            grid.Children.Add(buttonPanel);
-
-            // 设置窗口内容
-            editWindow.Content = grid;
-
-            // 显示窗口
-            editWindow.ShowDialog();
-        }
-    }
-}

Ink Canvas/Helpers/Plugins/BuiltIn/SuperLauncher/LauncherWindow.xaml

@@ -1,91 +0,0 @@
-<Window x:Class="Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher.LauncherWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher"
-        mc:Ignorable="d"
-        Title="启动台" 
-        Width="400" 
-        Height="300" 
-        WindowStyle="None" 
-        AllowsTransparency="True" 
-        Background="#80000000"
-        ResizeMode="NoResize"
-        Topmost="True"
-        Deactivated="Window_Deactivated"
-        ShowInTaskbar="False">
-    
-    <Window.Resources>
-        <!-- 应用项样式 -->
-        <Style x:Key="LauncherItemStyle" TargetType="Button">
-            <Setter Property="Width" Value="80"/>
-            <Setter Property="Height" Value="80"/>
-            <Setter Property="Margin" Value="5"/>
-            <Setter Property="Background" Value="#40FFFFFF"/>
-            <Setter Property="Foreground" Value="White"/>
-            <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Border x:Name="border" Background="{TemplateBinding Background}" 
-                                BorderBrush="{TemplateBinding BorderBrush}" 
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="8">
-                            <Grid>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="*"/>
-                                    <RowDefinition Height="Auto"/>
-                                </Grid.RowDefinitions>
-                                <Image Grid.Row="0" Source="{Binding Icon}" Width="32" Height="32" Margin="0,10,0,5"/>
-                                <TextBlock Grid.Row="1" Text="{Binding Name}" TextWrapping="Wrap" TextAlignment="Center" 
-                                           Margin="2,0,2,8" FontSize="11" Foreground="White"/>
-                            </Grid>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" Value="#80FFFFFF"/>
-                            </Trigger>
-                            <Trigger Property="IsPressed" Value="True">
-                                <Setter Property="Background" Value="#C0FFFFFF"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-    </Window.Resources>
-    
-    <Border CornerRadius="15" Background="#80000000" BorderThickness="1" BorderBrush="#40FFFFFF">
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="*"/>
-            </Grid.RowDefinitions>
-            
-            <!-- 标题栏 -->
-            <Grid Grid.Row="0" Height="40">
-                <TextBlock Text="启动台" Foreground="White" FontSize="18" FontWeight="Bold" 
-                           VerticalAlignment="Center" Margin="15,0,0,0"/>
-                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,10,0">
-                    <Button x:Name="BtnFixMode" Click="BtnFixMode_Click" Width="30" Height="30" 
-                            Margin="5,0" Background="Transparent" BorderThickness="0" 
-                            ToolTip="切换固定模式">
-                        <Path x:Name="FixModeIcon" Data="M7,2V13H10V22L17,10H13L17,2H7Z" Fill="White" Stretch="Uniform" Width="16" Height="16"/>
-                    </Button>
-                    <Button x:Name="BtnClose" Click="BtnClose_Click" Width="30" Height="30" 
-                            Background="Transparent" BorderThickness="0" 
-                            ToolTip="关闭">
-                        <Path Data="M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z" 
-                              Fill="White" Stretch="Uniform" Width="16" Height="16"/>
-                    </Button>
-                </StackPanel>
-            </Grid>
-            
-            <!-- 应用网格 -->
-            <ScrollViewer Grid.Row="1" Margin="10" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
-                <WrapPanel x:Name="AppPanel" Orientation="Horizontal" HorizontalAlignment="Center"/>
-            </ScrollViewer>
-        </Grid>
-    </Border>
-</Window> 

Ink Canvas/Helpers/Plugins/BuiltIn/SuperLauncher/LauncherWindow.xaml.cs

@@ -1,466 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Threading;
-
-namespace Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher
-{
-    /// <summary>
-    /// LauncherWindow.xaml 的交互逻辑
-    /// </summary>
-    public partial class LauncherWindow : Window
-    {
-        /// <summary>
-        /// 父插件
-        /// </summary>
-        private readonly SuperLauncherPlugin _plugin;
-
-        /// <summary>
-        /// 是否处于固定模式
-        /// </summary>
-        private bool _isFixMode;
-
-        /// <summary>
-        /// 应用项按钮列表
-        /// </summary>
-        private readonly Dictionary<Button, LauncherItem> _appButtons = new Dictionary<Button, LauncherItem>();
-
-        /// <summary>
-        /// 拖拽中的按钮
-        /// </summary>
-        private Button _draggingButton;
-
-        /// <summary>
-        /// 拖拽开始位置
-        /// </summary>
-        private Point _dragStartPoint;
-
-        /// <summary>
-        /// 构造函数
-        /// </summary>
-        public LauncherWindow(SuperLauncherPlugin plugin)
-        {
-            InitializeComponent();
-
-            _plugin = plugin;
-
-            // 加载应用项
-            LoadLauncherItems();
-
-            // 添加鼠标按下事件（用于拖动窗口）
-            MouseDown += (s, e) =>
-            {
-                if (e.ChangedButton == MouseButton.Left && e.ButtonState == MouseButtonState.Pressed)
-                {
-                    DragMove();
-                }
-            };
-
-            // 根据应用数量调整窗口大小
-            AdjustWindowSize();
-        }
-
-        /// <summary>
-        /// 加载启动台应用项
-        /// </summary>
-        private void LoadLauncherItems()
-        {
-            // 清空现有应用项
-            AppPanel.Children.Clear();
-            _appButtons.Clear();
-
-            // 获取显示的应用项
-            var visibleItems = _plugin.LauncherItems
-                .Where(item => item.IsVisible)
-                .OrderBy(item => item.Position)
-                .ToList();
-
-            foreach (var item in visibleItems)
-            {
-                // 创建应用按钮
-                Button appButton = new Button
-                {
-                    Style = (Style)FindResource("LauncherItemStyle"),
-                    DataContext = item,
-                    Tag = item.Position
-                };
-
-                // 添加点击事件
-                appButton.Click += AppButton_Click;
-
-                // 在固定模式下，添加拖拽事件
-                appButton.PreviewMouseDown += AppButton_PreviewMouseDown;
-                appButton.PreviewMouseMove += AppButton_PreviewMouseMove;
-                appButton.PreviewMouseUp += AppButton_PreviewMouseUp;
-
-                // 记录按钮和项目的对应关系
-                _appButtons.Add(appButton, item);
-
-                // 添加到面板
-                AppPanel.Children.Add(appButton);
-            }
-        }
-
-        /// <summary>
-        /// 根据应用数量调整窗口大小
-        /// </summary>
-        private void AdjustWindowSize()
-        {
-            try
-            {
-                // 每行最多显示4个应用
-                const int appsPerRow = 4;
-
-                // 计算行数
-                int visibleCount = _appButtons.Count;
-                int rowCount = (int)Math.Ceiling(visibleCount / (double)appsPerRow);
-
-                // 设置窗口宽度（每个应用90像素宽 = 80 + 5*2）
-                Width = Math.Min(appsPerRow * 90 + 40, 400); // 最大宽度400
-
-                // 设置窗口高度（每个应用90像素高 = 80 + 5*2）
-                Height = Math.Min(rowCount * 90 + 60, 600); // 最大高度600，标题栏40 + 边距20
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"调整启动台窗口大小时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 应用按钮点击事件
-        /// </summary>
-        private void AppButton_Click(object sender, RoutedEventArgs e)
-        {
-            try
-            {
-                if (_isFixMode) return; // 在固定模式下，不响应点击事件
-
-                if (sender is Button button && _appButtons.TryGetValue(button, out LauncherItem item))
-                {
-                    // 获取应用路径和名称，用于后续启动
-                    string appPath = item.Path;
-                    string appName = item.Name;
-
-                    LogHelper.WriteLogToFile($"点击启动应用: {appName}, 路径: {appPath}");
-
-                    // 首先标记窗口正在关闭
-                    IsClosing = true;
-
-                    // 创建一个应用启动任务
-                    var launchTask = new Task(() =>
-                    {
-                        try
-                        {
-                            // 等待一段时间，确保窗口关闭流程已经开始
-                            Thread.Sleep(200);
-
-                            // 使用UI线程启动应用
-                            Application.Current.Dispatcher.Invoke(() =>
-                            {
-                                try
-                                {
-                                    // 检查应用路径是否存在
-                                    if (File.Exists(appPath) || !appPath.Contains(":\\"))
-                                    {
-                                        // 创建进程启动信息
-                                        var psi = new ProcessStartInfo
-                                        {
-                                            FileName = appPath,
-                                            UseShellExecute = true,
-                                        };
-
-                                        // 启动应用程序
-                                        var process = Process.Start(psi);
-                                        LogHelper.WriteLogToFile($"应用程序 {appName} 已启动");
-                                    }
-                                    else
-                                    {
-                                        LogHelper.WriteLogToFile($"应用路径不存在: {appPath}", LogHelper.LogType.Error);
-                                        MessageBox.Show($"找不到应用程序: {appPath}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
-                                    }
-                                }
-                                catch (Exception ex)
-                                {
-                                    LogHelper.WriteLogToFile($"启动应用程序失败: {ex.Message}", LogHelper.LogType.Error);
-                                    MessageBox.Show($"启动应用程序失败: {ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
-                                }
-                            });
-                        }
-                        catch (Exception ex)
-                        {
-                            LogHelper.WriteLogToFile($"应用启动任务出错: {ex.Message}", LogHelper.LogType.Error);
-                        }
-                    });
-
-                    // 关闭窗口
-                    try
-                    {
-                        Dispatcher.BeginInvoke(new Action(() =>
-                        {
-                            try { Close(); } catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
-
-                            // 启动应用程序任务
-                            launchTask.Start();
-                        }), DispatcherPriority.Background);
-                    }
-                    catch (Exception ex)
-                    {
-                        LogHelper.WriteLogToFile($"关闭窗口或启动任务时出错: {ex.Message}", LogHelper.LogType.Error);
-                        // 如果无法通过UI关闭窗口，直接启动任务
-                        launchTask.Start();
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"应用按钮点击事件出错: {ex.Message}", LogHelper.LogType.Error);
-                try { IsClosing = true; Close(); } catch (Exception innerEx) { System.Diagnostics.Debug.WriteLine(innerEx); }
-            }
-        }
-
-        #region 固定模式拖拽事件
-
-        /// <summary>
-        /// 应用按钮鼠标按下事件
-        /// </summary>
-        private void AppButton_PreviewMouseDown(object sender, MouseButtonEventArgs e)
-        {
-            if (!_isFixMode) return;
-
-            if (e.ChangedButton == MouseButton.Left && sender is Button button)
-            {
-                _draggingButton = button;
-                _dragStartPoint = e.GetPosition(AppPanel);
-                button.CaptureMouse();
-                button.Opacity = 0.7;
-
-                // 阻止事件冒泡，以避免触发按钮点击
-                e.Handled = true;
-            }
-        }
-
-        /// <summary>
-        /// 应用按钮鼠标移动事件
-        /// </summary>
-        private void AppButton_PreviewMouseMove(object sender, MouseEventArgs e)
-        {
-            if (!_isFixMode || _draggingButton == null) return;
-
-            if (e.LeftButton == MouseButtonState.Pressed)
-            {
-                Point currentPosition = e.GetPosition(AppPanel);
-
-                // 移动按钮
-                System.Windows.Controls.Canvas.SetLeft(_draggingButton, currentPosition.X - _draggingButton.ActualWidth / 2);
-                System.Windows.Controls.Canvas.SetTop(_draggingButton, currentPosition.Y - _draggingButton.ActualHeight / 2);
-
-                // 将按钮移到最上层
-                Panel.SetZIndex(_draggingButton, 100);
-
-                // 阻止事件冒泡
-                e.Handled = true;
-            }
-        }
-
-        /// <summary>
-        /// 应用按钮鼠标释放事件
-        /// </summary>
-        private void AppButton_PreviewMouseUp(object sender, MouseButtonEventArgs e)
-        {
-            if (!_isFixMode || _draggingButton == null) return;
-
-            // 释放鼠标捕获
-            _draggingButton.ReleaseMouseCapture();
-
-            // 计算新位置
-            Point releasePoint = e.GetPosition(AppPanel);
-            int newPosition = CalculateGridPosition(releasePoint);
-
-            // 获取当前项目
-            LauncherItem currentItem = _appButtons[_draggingButton];
-
-            // 重新排序
-            ReorderItems(currentItem, newPosition);
-
-            // 重新加载应用项
-            LoadLauncherItems();
-
-            // 保存配置
-            _plugin.SaveConfig();
-
-            // 清除拖拽状态
-            _draggingButton.Opacity = 1;
-            Panel.SetZIndex(_draggingButton, 0);
-            _draggingButton = null;
-
-            // 阻止事件冒泡
-            e.Handled = true;
-        }
-
-        /// <summary>
-        /// 计算网格位置
-        /// </summary>
-        private int CalculateGridPosition(Point point)
-        {
-            // 计算行和列
-            int columnCount = 4; // 每行最多4个应用
-            int columnWidth = 90; // 应用宽度（包括边距）
-            int rowHeight = 90; // 应用高度（包括边距）
-
-            int column = (int)(point.X / columnWidth);
-            int row = (int)(point.Y / rowHeight);
-
-            // 确保在有效范围内
-            column = Math.Max(0, Math.Min(column, columnCount - 1));
-            row = Math.Max(0, row);
-
-            // 计算位置索引
-            return row * columnCount + column;
-        }
-
-        /// <summary>
-        /// 重新排序应用项
-        /// </summary>
-        private void ReorderItems(LauncherItem item, int newPosition)
-        {
-            try
-            {
-                // 设置项目为固定位置
-                item.IsPositionFixed = true;
-
-                // 如果位置相同，无需调整
-                if (item.Position == newPosition)
-                {
-                    return;
-                }
-
-                // 获取所有可见项目
-                var visibleItems = _plugin.LauncherItems
-                    .Where(i => i.IsVisible)
-                    .OrderBy(i => i.Position)
-                    .ToList();
-
-                // 移除当前项目
-                visibleItems.Remove(item);
-
-                // 查找插入位置
-                int insertIndex = 0;
-                for (int i = 0; i < visibleItems.Count; i++)
-                {
-                    if (visibleItems[i].Position >= newPosition)
-                    {
-                        insertIndex = i;
-                        break;
-                    }
-                    insertIndex = i + 1;
-                }
-
-                // 插入项目
-                visibleItems.Insert(insertIndex, item);
-
-                // 重新分配位置
-                for (int i = 0; i < visibleItems.Count; i++)
-                {
-                    visibleItems[i].Position = i;
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"重新排序应用项时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        #endregion
-
-        #region 窗口事件处理
-
-        /// <summary>
-        /// 窗口失去焦点事件
-        /// </summary>
-        private void Window_Deactivated(object sender, EventArgs e)
-        {
-            try
-            {
-                // 只有在非固定模式、窗口已加载、未处于关闭状态且IsLoaded=true时关闭窗口
-                if (!_isFixMode && IsLoaded && !IsClosing)
-                {
-                    // 标记为正在关闭
-                    IsClosing = true;
-
-                    // 使用Dispatcher.BeginInvoke而不是直接调用Close，避免冲突
-                    Dispatcher.BeginInvoke(new Action(() =>
-                    {
-                        try
-                        {
-                            // 再次检查窗口状态
-                            if (IsLoaded && !IsClosing)
-                            {
-                                Close();
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            LogHelper.WriteLogToFile($"延迟关闭窗口时出错: {ex.Message}", LogHelper.LogType.Error);
-                        }
-                    }), DispatcherPriority.Background);
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"窗口失去焦点关闭时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 窗口是否正在关闭
-        /// </summary>
-        private bool IsClosing { get; set; }
-
-        /// <summary>
-        /// 重写OnClosing方法，标记窗口正在关闭
-        /// </summary>
-        protected override void OnClosing(CancelEventArgs e)
-        {
-            IsClosing = true;
-            base.OnClosing(e);
-        }
-
-        /// <summary>
-        /// 关闭按钮点击事件
-        /// </summary>
-        private void BtnClose_Click(object sender, RoutedEventArgs e)
-        {
-            Close();
-        }
-
-        /// <summary>
-        /// 固定模式按钮点击事件
-        /// </summary>
-        private void BtnFixMode_Click(object sender, RoutedEventArgs e)
-        {
-            // 切换固定模式
-            _isFixMode = !_isFixMode;
-
-            // 更新固定模式按钮图标颜色
-            FixModeIcon.Fill = _isFixMode ? Brushes.Yellow : Brushes.White;
-
-            // 显示提示
-            if (_isFixMode)
-            {
-                MessageBox.Show("已进入固定模式，您可以拖动应用图标调整位置。", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
-            }
-        }
-
-        #endregion
-    }
-}

Ink Canvas/Helpers/Plugins/BuiltIn/SuperLauncherPlugin.cs

@@ -1,589 +0,0 @@
-using Ink_Canvas.Helpers.Plugins.BuiltIn.SuperLauncher;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.IO;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-
-namespace Ink_Canvas.Helpers.Plugins.BuiltIn
-{
-    /// <summary>
-    /// 超级启动台插件
-    /// </summary>
-    public class SuperLauncherPlugin : PluginBase
-    {
-        #region 插件基本信息
-
-        public override string Name => "超级启动台";
-
-        public override string Description => "在浮动栏添加一个启动台按钮，可快速启动常用应用程序。";
-
-        public override Version Version => new Version(1, 0, 1);
-
-        public override string Author => "ICC CE 团队";
-
-        public override bool IsBuiltIn => true;
-
-        #endregion
-
-        #region 插件属性和字段
-
-        /// <summary>
-        /// 启动台配置
-        /// </summary>
-        public LauncherConfig Config { get; private set; }
-
-        /// <summary>
-        /// 启动台应用程序列表
-        /// </summary>
-        public ObservableCollection<LauncherItem> LauncherItems { get; private set; }
-
-        /// <summary>
-        /// 启动台按钮
-        /// </summary>
-        private LauncherButton _launcherButton;
-
-        /// <summary>
-        /// 启动台窗口
-        /// </summary>
-        private LauncherWindow _launcherWindow;
-
-        /// <summary>
-        /// 配置文件路径
-        /// </summary>
-        private readonly string _configPath = Path.Combine(App.RootPath, "PluginConfigs", "SuperLauncher.json");
-
-        /// <summary>
-        /// 标记是否已添加到浮动栏
-        /// </summary>
-        private bool _isAddedToFloatingBar;
-
-        #endregion
-
-        #region 插件生命周期
-
-        public override void Initialize()
-        {
-            try
-            {
-                base.Initialize();
-
-                // 创建配置目录
-                string configDir = Path.Combine(App.RootPath, "PluginConfigs");
-                if (!Directory.Exists(configDir))
-                {
-                    Directory.CreateDirectory(configDir);
-                }
-
-                // 加载配置
-                LoadConfig();
-
-                LogHelper.WriteLogToFile("超级启动台插件已初始化");
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"初始化超级启动台插件时出错: {ex.Message}", LogHelper.LogType.Error);
-                LogHelper.NewLog(ex);
-            }
-        }
-
-        public override void Enable()
-        {
-            try
-            {
-                if (IsEnabled) return; // 防止重复启用
-
-                // 创建启动台按钮
-                if (_launcherButton == null)
-                {
-                    _launcherButton = new LauncherButton(this);
-                    LogHelper.WriteLogToFile("超级启动台按钮已创建");
-                }
-
-                // 添加启动台按钮到浮动栏
-                AddLauncherButtonToFloatingBar();
-
-                // 设置启用状态
-                base.Enable();
-
-                // 保存插件配置
-                SavePluginSettings();
-
-                LogHelper.WriteLogToFile("超级启动台插件已启用");
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"启用超级启动台插件时出错: {ex.Message}", LogHelper.LogType.Error);
-                LogHelper.NewLog(ex);
-            }
-        }
-
-        public override void Disable()
-        {
-            try
-            {
-                if (!IsEnabled) return; // 防止重复禁用
-
-                // 从浮动栏移除启动台按钮
-                RemoveLauncherButtonFromFloatingBar();
-
-                // 如果启动台窗口打开，则关闭
-                if (_launcherWindow != null && _launcherWindow.IsVisible)
-                {
-                    _launcherWindow.Close();
-                    _launcherWindow = null;
-                }
-
-                // 设置禁用状态
-                base.Disable();
-
-                // 保存插件配置
-                SavePluginSettings();
-
-                LogHelper.WriteLogToFile("超级启动台插件已禁用");
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"禁用超级启动台插件时出错: {ex.Message}", LogHelper.LogType.Error);
-                LogHelper.NewLog(ex);
-            }
-        }
-
-        public override UserControl GetSettingsView()
-        {
-            return new LauncherSettingsControl(this);
-        }
-
-        public override void Cleanup()
-        {
-            // 保存配置
-            SaveConfig();
-
-            // 从浮动栏移除启动台按钮
-            RemoveLauncherButtonFromFloatingBar();
-
-            // 如果启动台窗口打开，则关闭
-            if (_launcherWindow != null && _launcherWindow.IsVisible)
-            {
-                _launcherWindow.Close();
-                _launcherWindow = null;
-            }
-
-            base.Cleanup();
-        }
-
-        /// <summary>
-        /// 保存插件设置
-        /// </summary>
-        public override void SavePluginSettings()
-        {
-            try
-            {
-                // 确保配置已加载
-                if (Config == null)
-                {
-                    LoadConfig();
-                }
-
-                // 更新其他设置，但不更改插件启用状态
-
-                // 保存配置
-                SaveConfig();
-
-                LogHelper.WriteLogToFile("超级启动台插件设置已保存");
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"保存超级启动台插件设置时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        #endregion
-
-        #region 配置管理
-
-        /// <summary>
-        /// 加载配置
-        /// </summary>
-        private void LoadConfig()
-        {
-            try
-            {
-                if (File.Exists(_configPath))
-                {
-                    string json = File.ReadAllText(_configPath);
-                    Config = JsonConvert.DeserializeObject<LauncherConfig>(json) ?? CreateDefaultConfig();
-                    LauncherItems = new ObservableCollection<LauncherItem>(Config.Items ?? new List<LauncherItem>());
-
-                    // 注意：不再根据配置更改插件启用状态
-                    // 插件状态由PluginManager统一管理
-                }
-                else
-                {
-                    Config = CreateDefaultConfig();
-                    LauncherItems = new ObservableCollection<LauncherItem>(Config.Items);
-                    SaveConfig();
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"加载超级启动台配置时出错: {ex.Message}", LogHelper.LogType.Error);
-                Config = CreateDefaultConfig();
-                LauncherItems = new ObservableCollection<LauncherItem>(Config.Items);
-            }
-        }
-
-        /// <summary>
-        /// 保存配置
-        /// </summary>
-        public void SaveConfig()
-        {
-            try
-            {
-                // 同步LauncherItems到Config
-                Config.Items = new List<LauncherItem>(LauncherItems);
-
-                // 序列化并保存配置
-                string json = JsonConvert.SerializeObject(Config, Formatting.Indented);
-                File.WriteAllText(_configPath, json);
-
-                LogHelper.WriteLogToFile("超级启动台配置已保存");
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"保存超级启动台配置时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 创建默认配置
-        /// </summary>
-        private LauncherConfig CreateDefaultConfig()
-        {
-            var config = new LauncherConfig
-            {
-                ButtonPosition = LauncherButtonPosition.Right,
-                // 不再使用IsEnabled，插件状态由PluginManager管理
-                Items = new List<LauncherItem>
-                {
-                    new LauncherItem
-                    {
-                        Name = "资源管理器",
-                        Path = @"C:\Windows\explorer.exe",
-                        IsVisible = true,
-                        Position = 0
-                    }
-                }
-            };
-
-            return config;
-        }
-
-        #endregion
-
-        #region 启动台按钮管理
-
-        /// <summary>
-        /// 将启动台按钮添加到浮动栏
-        /// </summary>
-        private void AddLauncherButtonToFloatingBar()
-        {
-            try
-            {
-                // 如果已经添加，先移除
-                if (_isAddedToFloatingBar)
-                {
-                    RemoveLauncherButtonFromFloatingBar();
-                    _isAddedToFloatingBar = false;
-                }
-
-                // 获取主窗口实例
-                var mainWindow = Application.Current.MainWindow;
-                if (mainWindow == null)
-                {
-                    LogHelper.WriteLogToFile("未找到主窗口实例，无法添加启动台按钮", LogHelper.LogType.Error);
-                    return;
-                }
-
-                // 创建启动台按钮
-                _launcherButton = new LauncherButton(this);
-                var buttonElement = _launcherButton.Element;
-
-                // 查找浮动栏
-                var floatingBar = mainWindow.FindName("StackPanelFloatingBar") as Panel;
-                if (floatingBar == null)
-                {
-                    // 如果直接查找失败，则尝试遍历可视树查找
-                    Panel floatingBarPanelFromTree = null;
-                    FindStackPanelFloatingBar(mainWindow, ref floatingBarPanelFromTree);
-                    floatingBar = floatingBarPanelFromTree;
-                }
-
-                if (floatingBar == null)
-                {
-                    LogHelper.WriteLogToFile("未找到浮动栏，无法添加启动台按钮", LogHelper.LogType.Error);
-                    return;
-                }
-
-                // 添加启动台按钮到浮动栏
-                if (Config.ButtonPosition == LauncherButtonPosition.Left)
-                {
-                    floatingBar.Children.Insert(0, buttonElement);
-                    LogHelper.WriteLogToFile("启动台按钮已添加到浮动栏左侧");
-                }
-                else
-                {
-                    floatingBar.Children.Add(buttonElement);
-                    LogHelper.WriteLogToFile("启动台按钮已添加到浮动栏右侧");
-                }
-
-                _isAddedToFloatingBar = true;
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"添加启动台按钮到浮动栏时出错: {ex.Message}", LogHelper.LogType.Error);
-                LogHelper.NewLog(ex);
-            }
-        }
-
-        /// <summary>
-        /// 递归查找StackPanelFloatingBar
-        /// </summary>
-        private void FindStackPanelFloatingBar(DependencyObject parent, ref Panel result)
-        {
-            if (parent == null || result != null) return;
-
-            try
-            {
-                // 检查当前对象是否为我们要找的面板
-                if (parent is Panel panel && panel.Name == "StackPanelFloatingBar")
-                {
-                    result = panel;
-                    return;
-                }
-
-                // 获取子元素数量
-                int childCount = VisualTreeHelper.GetChildrenCount(parent);
-
-                // 遍历所有子元素
-                for (int i = 0; i < childCount; i++)
-                {
-                    DependencyObject child = VisualTreeHelper.GetChild(parent, i);
-                    FindStackPanelFloatingBar(child, ref result);
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"查找StackPanelFloatingBar时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 从浮动栏移除启动台按钮
-        /// </summary>
-        private void RemoveLauncherButtonFromFloatingBar()
-        {
-            try
-            {
-                if (!_isAddedToFloatingBar || _launcherButton == null)
-                {
-                    return;
-                }
-
-                // 获取主窗口实例
-                var mainWindow = Application.Current.MainWindow;
-                if (mainWindow == null)
-                {
-                    LogHelper.WriteLogToFile("未找到主窗口实例，无法移除启动台按钮", LogHelper.LogType.Error);
-                    return;
-                }
-
-                // 获取按钮元素
-                var buttonElement = _launcherButton.Element;
-
-                // 查找浮动栏
-                var floatingBar = mainWindow.FindName("StackPanelFloatingBar") as Panel;
-                if (floatingBar == null)
-                {
-                    // 如果直接查找失败，则尝试遍历可视树查找
-                    Panel floatingBarPanelFromTree = null;
-                    FindStackPanelFloatingBar(mainWindow, ref floatingBarPanelFromTree);
-                    floatingBar = floatingBarPanelFromTree;
-                }
-
-                if (floatingBar == null)
-                {
-                    LogHelper.WriteLogToFile("未找到浮动栏，无法移除启动台按钮", LogHelper.LogType.Error);
-                    return;
-                }
-
-                // 从浮动栏移除启动台按钮
-                if (floatingBar.Children.Contains(buttonElement))
-                {
-                    floatingBar.Children.Remove(buttonElement);
-                    LogHelper.WriteLogToFile("启动台按钮已从浮动栏移除");
-                }
-
-                _isAddedToFloatingBar = false;
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"移除启动台按钮时出错: {ex.Message}", LogHelper.LogType.Error);
-                LogHelper.NewLog(ex);
-            }
-        }
-
-        /// <summary>
-        /// 更新启动台按钮位置
-        /// </summary>
-        public void UpdateButtonPosition()
-        {
-            try
-            {
-                // 如果按钮已添加到浮动栏，重新添加以更新位置
-                if (_isAddedToFloatingBar)
-                {
-                    RemoveLauncherButtonFromFloatingBar();
-                    AddLauncherButtonToFloatingBar();
-                    LogHelper.WriteLogToFile($"启动台按钮位置已更新为: {Config.ButtonPosition}");
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"更新启动台按钮位置时出错: {ex.Message}", LogHelper.LogType.Error);
-                LogHelper.NewLog(ex);
-            }
-        }
-
-        #endregion
-
-        #region 启动台功能
-
-        /// <summary>
-        /// 显示启动台窗口
-        /// </summary>
-        /// <param name="buttonPosition">按钮在屏幕上的位置</param>
-        public void ShowLauncherWindow(Point buttonPosition)
-        {
-            try
-            {
-                // 如果窗口已存在，关闭它
-                if (_launcherWindow != null && _launcherWindow.IsVisible)
-                {
-                    _launcherWindow.Close();
-                    _launcherWindow = null;
-                    return;
-                }
-
-                // 创建新的启动台窗口
-                _launcherWindow = new LauncherWindow(this);
-
-                // 计算窗口位置，使其位于按钮上方
-                PositionLauncherWindow(_launcherWindow, buttonPosition);
-
-                // 显示窗口
-                _launcherWindow.Show();
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"显示启动台窗口时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 设置启动台窗口位置
-        /// </summary>
-        /// <param name="window">启动台窗口</param>
-        /// <param name="buttonPosition">按钮在屏幕上的位置</param>
-        private void PositionLauncherWindow(LauncherWindow window, Point buttonPosition)
-        {
-            // 确保窗口已加载
-            if (window.ActualWidth == 0 || window.ActualHeight == 0)
-            {
-                window.WindowStartupLocation = WindowStartupLocation.CenterScreen;
-
-                // 设置窗口加载完成后的位置
-                window.Loaded += (s, e) =>
-                {
-                    // 窗口位于按钮上方居中
-                    double left = buttonPosition.X - (window.ActualWidth / 2);
-                    double top = buttonPosition.Y - window.ActualHeight - 10; // 在按钮上方留出一些间距
-
-                    // 确保窗口在屏幕内
-                    left = Math.Max(0, Math.Min(left, SystemParameters.WorkArea.Width - window.ActualWidth));
-                    top = Math.Max(0, Math.Min(top, SystemParameters.WorkArea.Height - window.ActualHeight));
-
-                    window.Left = left;
-                    window.Top = top;
-                };
-            }
-            else
-            {
-                // 窗口位于按钮上方居中
-                double left = buttonPosition.X - (window.ActualWidth / 2);
-                double top = buttonPosition.Y - window.ActualHeight - 10; // 在按钮上方留出一些间距
-
-                // 确保窗口在屏幕内
-                left = Math.Max(0, Math.Min(left, SystemParameters.WorkArea.Width - window.ActualWidth));
-                top = Math.Max(0, Math.Min(top, SystemParameters.WorkArea.Height - window.ActualHeight));
-
-                window.Left = left;
-                window.Top = top;
-            }
-        }
-
-        /// <summary>
-        /// 添加应用到启动台
-        /// </summary>
-        /// <param name="item">启动台项</param>
-        public void AddLauncherItem(LauncherItem item)
-        {
-            // 如果项目数量已达上限，则不添加
-            if (LauncherItems.Count >= 40)
-            {
-                MessageBox.Show("启动台项目数量已达上限(40个)！", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
-                return;
-            }
-
-            // 寻找合适的位置
-            if (item.Position < 0)
-            {
-                item.Position = FindNextAvailablePosition();
-            }
-
-            // 添加项目并保存配置
-            LauncherItems.Add(item);
-            SaveConfig();
-        }
-
-        /// <summary>
-        /// 查找下一个可用位置
-        /// </summary>
-        private int FindNextAvailablePosition()
-        {
-            // 获取已使用的位置列表
-            var usedPositions = new HashSet<int>();
-            foreach (var item in LauncherItems)
-            {
-                usedPositions.Add(item.Position);
-            }
-
-            // 查找第一个可用位置
-            for (int i = 0; i < 40; i++)
-            {
-                if (!usedPositions.Contains(i))
-                {
-                    return i;
-                }
-            }
-
-            // 如果所有位置都已使用，则返回0
-            return 0;
-        }
-
-        #endregion
-    }
-}

Ink Canvas/Helpers/Plugins/EnhancedPluginBase.cs

@@ -1,92 +0,0 @@
-using System.Windows.Controls;
-
-namespace Ink_Canvas.Helpers.Plugins
-{
-    /// <summary>
-    /// 增强的插件基类，提供对插件服务的访问和基本实现
-    /// </summary>
-    public abstract class EnhancedPluginBase : PluginBase, IEnhancedPlugin
-    {
-        /// <summary>
-        /// 插件服务实例
-        /// </summary>
-        public IPluginService PluginService { get; private set; }
-
-        /// <summary>
-        /// 构造函数
-        /// </summary>
-        protected EnhancedPluginBase()
-        {
-            PluginService = PluginServiceManager.Instance;
-        }
-
-        /// <summary>
-        /// 插件启动时调用，在Initialize之后
-        /// </summary>
-        public virtual void OnStartup()
-        {
-            LogHelper.WriteLogToFile($"插件 {Name} 已启动");
-        }
-
-        /// <summary>
-        /// 插件关闭时调用，在Cleanup之前
-        /// </summary>
-        public virtual void OnShutdown()
-        {
-            LogHelper.WriteLogToFile($"插件 {Name} 正在关闭");
-        }
-
-        /// <summary>
-        /// 获取插件的菜单项
-        /// </summary>
-        /// <returns>菜单项集合</returns>
-        public virtual MenuItem[] GetMenuItems()
-        {
-            return new MenuItem[0];
-        }
-
-        /// <summary>
-        /// 获取插件的工具栏按钮
-        /// </summary>
-        /// <returns>工具栏按钮集合</returns>
-        public virtual Button[] GetToolbarButtons()
-        {
-            return new Button[0];
-        }
-
-        /// <summary>
-        /// 获取插件的状态栏信息
-        /// </summary>
-        /// <returns>状态栏信息</returns>
-        public virtual string GetStatusBarInfo()
-        {
-            return $"{Name} v{Version} - {(IsEnabled ? "已启用" : "已禁用")}";
-        }
-
-        /// <summary>
-        /// 插件配置变更时调用
-        /// </summary>
-        public virtual void OnConfigurationChanged()
-        {
-            LogHelper.WriteLogToFile($"插件 {Name} 配置已变更");
-        }
-
-        /// <summary>
-        /// 重写初始化方法，调用OnStartup
-        /// </summary>
-        public override void Initialize()
-        {
-            base.Initialize();
-            OnStartup();
-        }
-
-        /// <summary>
-        /// 重写清理方法，调用OnShutdown
-        /// </summary>
-        public override void Cleanup()
-        {
-            OnShutdown();
-            base.Cleanup();
-        }
-    }
-}

Ink Canvas/Helpers/Plugins/EnhancedPluginBaseV2.cs

@@ -1,241 +0,0 @@
-using System.Windows.Controls;
-
-namespace Ink_Canvas.Helpers.Plugins
-{
-    /// <summary>
-    /// 增强的插件基类 V2，提供对三个专门服务接口的访问
-    /// 插件开发者可以根据需要选择性地使用这些服务
-    /// </summary>
-    public abstract class EnhancedPluginBaseV2 : PluginBase, IEnhancedPlugin
-    {
-        /// <summary>
-        /// 获取服务实例
-        /// </summary>
-        public IGetService GetService { get; private set; }
-
-        /// <summary>
-        /// 窗口服务实例
-        /// </summary>
-        public IWindowService WindowService { get; private set; }
-
-        /// <summary>
-        /// 操作服务实例
-        /// </summary>
-        public IActionService ActionService { get; private set; }
-
-        /// <summary>
-        /// 插件服务实例（兼容性）
-        /// </summary>
-        public IPluginService PluginService { get; private set; }
-
-        /// <summary>
-        /// 构造函数
-        /// </summary>
-        protected EnhancedPluginBaseV2()
-        {
-            // 初始化所有服务实例
-            PluginService = PluginServiceManager.Instance;
-            GetService = PluginServiceManager.Instance;
-            WindowService = PluginServiceManager.Instance;
-            ActionService = PluginServiceManager.Instance;
-        }
-
-        /// <summary>
-        /// 插件启动时调用，在Initialize之后
-        /// </summary>
-        public virtual void OnStartup()
-        {
-            LogHelper.WriteLogToFile($"插件 {Name} 已启动");
-        }
-
-        /// <summary>
-        /// 插件关闭时调用，在Cleanup之前
-        /// </summary>
-        public virtual void OnShutdown()
-        {
-            LogHelper.WriteLogToFile($"插件 {Name} 正在关闭");
-        }
-
-        /// <summary>
-        /// 获取插件的菜单项
-        /// </summary>
-        /// <returns>菜单项集合</returns>
-        public virtual MenuItem[] GetMenuItems()
-        {
-            return new MenuItem[0];
-        }
-
-        /// <summary>
-        /// 获取插件的工具栏按钮
-        /// </summary>
-        /// <returns>工具栏按钮集合</returns>
-        public virtual Button[] GetToolbarButtons()
-        {
-            return new Button[0];
-        }
-
-        /// <summary>
-        /// 获取插件的状态栏信息
-        /// </summary>
-        /// <returns>状态栏信息</returns>
-        public virtual string GetStatusBarInfo()
-        {
-            return $"{Name} v{Version} - {(IsEnabled ? "已启用" : "已禁用")}";
-        }
-
-        /// <summary>
-        /// 插件配置变更时调用
-        /// </summary>
-        public virtual void OnConfigurationChanged()
-        {
-            LogHelper.WriteLogToFile($"插件 {Name} 配置已变更");
-        }
-
-        #region 便捷方法
-
-        /// <summary>
-        /// 显示通知消息
-        /// </summary>
-        /// <param name="message">消息内容</param>
-        /// <param name="type">消息类型</param>
-        protected void ShowNotification(string message, NotificationType type = NotificationType.Info)
-        {
-            WindowService.ShowNotification(message, type);
-        }
-
-        /// <summary>
-        /// 显示确认对话框
-        /// </summary>
-        /// <param name="message">消息内容</param>
-        /// <param name="title">标题</param>
-        /// <returns>用户选择结果</returns>
-        protected bool ShowConfirmDialog(string message, string title = "确认")
-        {
-            return WindowService.ShowConfirmDialog(message, title);
-        }
-
-        /// <summary>
-        /// 显示输入对话框
-        /// </summary>
-        /// <param name="message">提示消息</param>
-        /// <param name="title">标题</param>
-        /// <param name="defaultValue">默认值</param>
-        /// <returns>用户输入内容</returns>
-        protected string ShowInputDialog(string message, string title = "输入", string defaultValue = "")
-        {
-            return WindowService.ShowInputDialog(message, title, defaultValue);
-        }
-
-        /// <summary>
-        /// 获取系统设置
-        /// </summary>
-        /// <typeparam name="T">设置类型</typeparam>
-        /// <param name="key">设置键</param>
-        /// <param name="defaultValue">默认值</param>
-        /// <returns>设置值</returns>
-        protected T GetSetting<T>(string key, T defaultValue = default(T))
-        {
-            return GetService.GetSetting(key, defaultValue);
-        }
-
-        /// <summary>
-        /// 设置系统设置
-        /// </summary>
-        /// <typeparam name="T">设置类型</typeparam>
-        /// <param name="key">设置键</param>
-        /// <param name="value">设置值</param>
-        protected void SetSetting<T>(string key, T value)
-        {
-            ActionService.SetSetting(key, value);
-        }
-
-        /// <summary>
-        /// 保存设置
-        /// </summary>
-        protected void SaveSettings()
-        {
-            ActionService.SaveSettings();
-        }
-
-        /// <summary>
-        /// 清除当前画布
-        /// </summary>
-        protected void ClearCanvas()
-        {
-            ActionService.ClearCanvas();
-        }
-
-        /// <summary>
-        /// 撤销操作
-        /// </summary>
-        protected void Undo()
-        {
-            ActionService.Undo();
-        }
-
-        /// <summary>
-        /// 重做操作
-        /// </summary>
-        protected void Redo()
-        {
-            ActionService.Redo();
-        }
-
-        /// <summary>
-        /// 检查是否可以撤销
-        /// </summary>
-        protected bool CanUndo => GetService.CanUndo;
-
-        /// <summary>
-        /// 检查是否可以重做
-        /// </summary>
-        protected bool CanRedo => GetService.CanRedo;
-
-        /// <summary>
-        /// 获取当前绘制模式
-        /// </summary>
-        protected int CurrentDrawingMode => GetService.CurrentDrawingMode;
-
-        /// <summary>
-        /// 设置绘制模式
-        /// </summary>
-        /// <param name="mode">绘制模式</param>
-        protected void SetDrawingMode(int mode)
-        {
-            ActionService.SetDrawingMode(mode);
-        }
-
-        /// <summary>
-        /// 注册事件处理器
-        /// </summary>
-        /// <param name="eventName">事件名称</param>
-        /// <param name="handler">事件处理器</param>
-        protected void RegisterEventHandler(string eventName, System.EventHandler handler)
-        {
-            ActionService.RegisterEventHandler(eventName, handler);
-        }
-
-        /// <summary>
-        /// 注销事件处理器
-        /// </summary>
-        /// <param name="eventName">事件名称</param>
-        /// <param name="handler">事件处理器</param>
-        protected void UnregisterEventHandler(string eventName, System.EventHandler handler)
-        {
-            ActionService.UnregisterEventHandler(eventName, handler);
-        }
-
-        /// <summary>
-        /// 触发事件
-        /// </summary>
-        /// <param name="eventName">事件名称</param>
-        /// <param name="sender">事件发送者</param>
-        /// <param name="args">事件参数</param>
-        protected void TriggerEvent(string eventName, object sender, System.EventArgs args)
-        {
-            ActionService.TriggerEvent(eventName, sender, args);
-        }
-
-        #endregion
-    }
-}

Ink Canvas/Helpers/Plugins/IActionService.cs

@@ -1,296 +0,0 @@
-using System;
-using System.Windows.Media;
-
-namespace Ink_Canvas.Helpers.Plugins
-{
-    /// <summary>
-    /// 操作服务接口，统一所有执行操作相关的方法
-    /// </summary>
-    public interface IActionService
-    {
-        #region 画布操作
-
-        /// <summary>
-        /// 清除当前画布
-        /// </summary>
-        void ClearCanvas();
-
-        /// <summary>
-        /// 清除所有画布
-        /// </summary>
-        void ClearAllCanvases();
-
-        /// <summary>
-        /// 添加新页面
-        /// </summary>
-        void AddNewPage();
-
-        /// <summary>
-        /// 删除当前页面
-        /// </summary>
-        void DeleteCurrentPage();
-
-        /// <summary>
-        /// 切换到指定页面
-        /// </summary>
-        /// <param name="pageIndex">页面索引</param>
-        void SwitchToPage(int pageIndex);
-
-        /// <summary>
-        /// 切换到下一页
-        /// </summary>
-        void NextPage();
-
-        /// <summary>
-        /// 切换到上一页
-        /// </summary>
-        void PreviousPage();
-
-        #endregion
-
-        #region 绘制操作
-
-        /// <summary>
-        /// 设置绘制模式
-        /// </summary>
-        /// <param name="mode">绘制模式</param>
-        void SetDrawingMode(int mode);
-
-        /// <summary>
-        /// 设置笔触宽度
-        /// </summary>
-        /// <param name="width">宽度</param>
-        void SetInkWidth(double width);
-
-        /// <summary>
-        /// 设置笔触颜色
-        /// </summary>
-        /// <param name="color">颜色</param>
-        void SetInkColor(Color color);
-
-        /// <summary>
-        /// 设置高亮笔宽度
-        /// </summary>
-        /// <param name="width">宽度</param>
-        void SetHighlighterWidth(double width);
-
-        /// <summary>
-        /// 设置橡皮擦大小
-        /// </summary>
-        /// <param name="size">大小</param>
-        void SetEraserSize(int size);
-
-        /// <summary>
-        /// 设置橡皮擦类型
-        /// </summary>
-        /// <param name="type">类型</param>
-        void SetEraserType(int type);
-
-        /// <summary>
-        /// 设置橡皮擦形状
-        /// </summary>
-        /// <param name="shape">形状</param>
-        void SetEraserShape(int shape);
-
-        /// <summary>
-        /// 设置笔触透明度
-        /// </summary>
-        /// <param name="alpha">透明度</param>
-        void SetInkAlpha(double alpha);
-
-        /// <summary>
-        /// 设置笔触样式
-        /// </summary>
-        /// <param name="style">样式</param>
-        void SetInkStyle(int style);
-
-        /// <summary>
-        /// 设置背景颜色
-        /// </summary>
-        /// <param name="color">颜色</param>
-        void SetBackgroundColor(string color);
-
-        #endregion
-
-        #region 文件操作
-
-        /// <summary>
-        /// 保存画布内容
-        /// </summary>
-        /// <param name="filePath">文件路径</param>
-        void SaveCanvas(string filePath);
-
-        /// <summary>
-        /// 加载画布内容
-        /// </summary>
-        /// <param name="filePath">文件路径</param>
-        void LoadCanvas(string filePath);
-
-        /// <summary>
-        /// 导出为图片
-        /// </summary>
-        /// <param name="filePath">文件路径</param>
-        /// <param name="format">图片格式</param>
-        void ExportAsImage(string filePath, string format);
-
-        /// <summary>
-        /// 导出为PDF
-        /// </summary>
-        /// <param name="filePath">文件路径</param>
-        void ExportAsPDF(string filePath);
-
-        #endregion
-
-        #region 撤销重做操作
-
-        /// <summary>
-        /// 撤销操作
-        /// </summary>
-        void Undo();
-
-        /// <summary>
-        /// 重做操作
-        /// </summary>
-        void Redo();
-
-        #endregion
-
-        #region 选择操作
-
-        /// <summary>
-        /// 全选
-        /// </summary>
-        void SelectAll();
-
-        /// <summary>
-        /// 取消选择
-        /// </summary>
-        void DeselectAll();
-
-        /// <summary>
-        /// 删除选中内容
-        /// </summary>
-        void DeleteSelected();
-
-        /// <summary>
-        /// 复制选中内容
-        /// </summary>
-        void CopySelected();
-
-        /// <summary>
-        /// 剪切选中内容
-        /// </summary>
-        void CutSelected();
-
-        /// <summary>
-        /// 粘贴内容
-        /// </summary>
-        void Paste();
-
-        #endregion
-
-        #region 系统设置操作
-
-        /// <summary>
-        /// 设置系统设置
-        /// </summary>
-        /// <typeparam name="T">设置类型</typeparam>
-        /// <param name="key">设置键</param>
-        /// <param name="value">设置值</param>
-        void SetSetting<T>(string key, T value);
-
-        /// <summary>
-        /// 保存设置到文件
-        /// </summary>
-        void SaveSettings();
-
-        /// <summary>
-        /// 从文件加载设置
-        /// </summary>
-        void LoadSettings();
-
-        /// <summary>
-        /// 重置设置为默认值
-        /// </summary>
-        void ResetSettings();
-
-        #endregion
-
-        #region 插件管理操作
-
-        /// <summary>
-        /// 启用插件
-        /// </summary>
-        /// <param name="pluginName">插件名称</param>
-        void EnablePlugin(string pluginName);
-
-        /// <summary>
-        /// 禁用插件
-        /// </summary>
-        /// <param name="pluginName">插件名称</param>
-        void DisablePlugin(string pluginName);
-
-        /// <summary>
-        /// 卸载插件
-        /// </summary>
-        /// <param name="pluginName">插件名称</param>
-        void UnloadPlugin(string pluginName);
-
-        #endregion
-
-        #region 事件系统操作
-
-        /// <summary>
-        /// 注册事件处理器
-        /// </summary>
-        /// <param name="eventName">事件名称</param>
-        /// <param name="handler">事件处理器</param>
-        void RegisterEventHandler(string eventName, EventHandler handler);
-
-        /// <summary>
-        /// 注销事件处理器
-        /// </summary>
-        /// <param name="eventName">事件名称</param>
-        /// <param name="handler">事件处理器</param>
-        void UnregisterEventHandler(string eventName, EventHandler handler);
-
-        /// <summary>
-        /// 触发事件
-        /// </summary>
-        /// <param name="eventName">事件名称</param>
-        /// <param name="sender">事件发送者</param>
-        /// <param name="args">事件参数</param>
-        void TriggerEvent(string eventName, object sender, EventArgs args);
-
-        #endregion
-
-        #region 应用程序操作
-
-        /// <summary>
-        /// 重启应用程序
-        /// </summary>
-        void RestartApplication();
-
-        /// <summary>
-        /// 退出应用程序
-        /// </summary>
-        void ExitApplication();
-
-        /// <summary>
-        /// 检查更新
-        /// </summary>
-        void CheckForUpdates();
-
-        /// <summary>
-        /// 打开帮助文档
-        /// </summary>
-        void OpenHelpDocument();
-
-        /// <summary>
-        /// 打开关于页面
-        /// </summary>
-        void OpenAboutPage();
-
-        #endregion
-    }
-}

Ink Canvas/Helpers/Plugins/ICCPPPluginAdapter.cs

@@ -1,178 +0,0 @@
-using System;
-using System.IO;
-
-namespace Ink_Canvas.Helpers.Plugins
-{
-    /// <summary>
-    /// ICCPP 插件适配器，用于加载和管理 .iccpp 格式的插件
-    /// </summary>
-    public class ICCPPPluginAdapter : PluginBase
-    {
-        private readonly byte[] _pluginData;
-        private readonly string _pluginPath;
-        private readonly string _pluginName;
-        private readonly Version _pluginVersion;
-        private bool _isInitialized;
-
-        /// <summary>
-        /// 创建 ICCPP 插件适配器
-        /// </summary>
-        /// <param name="pluginPath">插件文件路径</param>
-        /// <param name="pluginData">插件文件数据</param>
-        public ICCPPPluginAdapter(string pluginPath, byte[] pluginData)
-        {
-            _pluginPath = pluginPath;
-            _pluginData = pluginData;
-            PluginPath = pluginPath;
-
-            // 从文件名获取插件名称
-            _pluginName = Path.GetFileNameWithoutExtension(pluginPath);
-            _pluginVersion = new Version(1, 0, 0); // 默认版本
-
-            // 尝试从插件数据中读取更多信息
-            TryReadPluginMetadata();
-        }
-
-        public ICCPPPluginAdapter()
-        {
-            _pluginPath = string.Empty;
-            _pluginData = new byte[0];
-            PluginPath = string.Empty;
-            _pluginName = "ICCPPPlugin";
-            _pluginVersion = new Version(1, 0, 0);
-            // 可选：初始化其他字段
-        }
-
-        /// <summary>
-        /// 尝试从插件数据中读取元数据
-        /// </summary>
-        private void TryReadPluginMetadata()
-        {
-            try
-            {
-                // 这里可以根据 .iccpp 文件的实际格式解析元数据
-                // 例如，如果文件有特定的头部结构，可以在这里解析
-
-                // 示例：如果前100字节包含元数据
-                if (_pluginData.Length > 100)
-                {
-                    // 解析元数据的代码...
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"解析插件 {_pluginName} 元数据时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        #region IPlugin 接口实现
-
-        /// <summary>
-        /// 插件名称
-        /// </summary>
-        public override string Name => _pluginName;
-
-        /// <summary>
-        /// 插件描述
-        /// </summary>
-        public override string Description => $"{_pluginName} (ICCPP 格式插件)";
-
-        /// <summary>
-        /// 插件版本
-        /// </summary>
-        public override Version Version => _pluginVersion;
-
-        /// <summary>
-        /// 插件作者
-        /// </summary>
-        public override string Author => "未知";
-
-        /// <summary>
-        /// 是否为内置插件
-        /// </summary>
-        public override bool IsBuiltIn => false;
-
-        /// <summary>
-        /// 初始化插件
-        /// </summary>
-        public override void Initialize()
-        {
-            if (_isInitialized) return;
-
-            try
-            {
-                // 这里可以添加 .iccpp 插件的初始化逻辑
-                // 例如，根据文件格式加载特定资源
-
-                LogHelper.WriteLogToFile($"ICCPP 插件 {Name} 已初始化");
-                _isInitialized = true;
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"初始化 ICCPP 插件 {Name} 时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 启用插件
-        /// </summary>
-        public override void Enable()
-        {
-            if (IsEnabled) return;
-
-            try
-            {
-                // 这里可以添加 .iccpp 插件的启用逻辑
-                // 例如，加载动态库、注册事件等
-
-                base.Enable(); // 设置启用状态并触发事件
-                LogHelper.WriteLogToFile($"ICCPP 插件 {Name} 已启用");
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"启用 ICCPP 插件 {Name} 时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 禁用插件
-        /// </summary>
-        public override void Disable()
-        {
-            if (!IsEnabled) return;
-
-            try
-            {
-                // 这里可以添加 .iccpp 插件的禁用逻辑
-                // 例如，卸载动态库、注销事件等
-
-                base.Disable(); // 设置禁用状态并触发事件
-                LogHelper.WriteLogToFile($"ICCPP 插件 {Name} 已禁用");
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"禁用 ICCPP 插件 {Name} 时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 清理插件资源
-        /// </summary>
-        public override void Cleanup()
-        {
-            try
-            {
-                // 这里可以添加 .iccpp 插件的清理逻辑
-                // 例如，释放资源等
-
-                LogHelper.WriteLogToFile($"ICCPP 插件 {Name} 已清理资源");
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"清理 ICCPP 插件 {Name} 资源时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        #endregion
-    }
-}

Ink Canvas/Helpers/Plugins/IEnhancedPlugin.cs

@@ -1,48 +0,0 @@
-using System.Windows.Controls;
-
-namespace Ink_Canvas.Helpers.Plugins
-{
-    /// <summary>
-    /// 增强的插件接口，提供对插件服务的访问
-    /// </summary>
-    public interface IEnhancedPlugin : IPlugin
-    {
-        /// <summary>
-        /// 获取插件服务实例
-        /// </summary>
-        IPluginService PluginService { get; }
-
-        /// <summary>
-        /// 插件启动时调用，在Initialize之后
-        /// </summary>
-        void OnStartup();
-
-        /// <summary>
-        /// 插件关闭时调用，在Cleanup之前
-        /// </summary>
-        void OnShutdown();
-
-        /// <summary>
-        /// 获取插件的菜单项
-        /// </summary>
-        /// <returns>菜单项集合</returns>
-        MenuItem[] GetMenuItems();
-
-        /// <summary>
-        /// 获取插件的工具栏按钮
-        /// </summary>
-        /// <returns>工具栏按钮集合</returns>
-        Button[] GetToolbarButtons();
-
-        /// <summary>
-        /// 获取插件的状态栏信息
-        /// </summary>
-        /// <returns>状态栏信息</returns>
-        string GetStatusBarInfo();
-
-        /// <summary>
-        /// 插件配置变更时调用
-        /// </summary>
-        void OnConfigurationChanged();
-    }
-}

Ink Canvas/Helpers/Plugins/IGetService.cs

@@ -1,214 +0,0 @@
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-
-namespace Ink_Canvas.Helpers.Plugins
-{
-    /// <summary>
-    /// 获取服务接口，统一所有获取类的方法
-    /// </summary>
-    public interface IGetService
-    {
-        #region 窗口和UI获取
-
-        /// <summary>
-        /// 获取主窗口引用
-        /// </summary>
-        Window MainWindow { get; }
-
-        /// <summary>
-        /// 获取当前画布
-        /// </summary>
-        InkCanvas CurrentCanvas { get; }
-
-        /// <summary>
-        /// 获取所有画布页面
-        /// </summary>
-        List<Canvas> AllCanvasPages { get; }
-
-        /// <summary>
-        /// 获取当前页面索引
-        /// </summary>
-        int CurrentPageIndex { get; }
-
-        /// <summary>
-        /// 获取当前页面数量
-        /// </summary>
-        int TotalPageCount { get; }
-
-        /// <summary>
-        /// 获取浮动工具栏
-        /// </summary>
-        FrameworkElement FloatingToolBar { get; }
-
-        /// <summary>
-        /// 获取左侧面板
-        /// </summary>
-        FrameworkElement LeftPanel { get; }
-
-        /// <summary>
-        /// 获取右侧面板
-        /// </summary>
-        FrameworkElement RightPanel { get; }
-
-        /// <summary>
-        /// 获取顶部面板
-        /// </summary>
-        FrameworkElement TopPanel { get; }
-
-        /// <summary>
-        /// 获取底部面板
-        /// </summary>
-        FrameworkElement BottomPanel { get; }
-
-        #endregion
-
-        #region 绘制工具状态获取
-
-        /// <summary>
-        /// 获取当前绘制模式
-        /// </summary>
-        int CurrentDrawingMode { get; }
-
-        /// <summary>
-        /// 获取当前笔触宽度
-        /// </summary>
-        double CurrentInkWidth { get; }
-
-        /// <summary>
-        /// 获取当前笔触颜色
-        /// </summary>
-        Color CurrentInkColor { get; }
-
-        /// <summary>
-        /// 获取当前高亮笔宽度
-        /// </summary>
-        double CurrentHighlighterWidth { get; }
-
-        /// <summary>
-        /// 获取当前橡皮擦大小
-        /// </summary>
-        int CurrentEraserSize { get; }
-
-        /// <summary>
-        /// 获取当前橡皮擦类型
-        /// </summary>
-        int CurrentEraserType { get; }
-
-        /// <summary>
-        /// 获取当前橡皮擦形状
-        /// </summary>
-        int CurrentEraserShape { get; }
-
-        /// <summary>
-        /// 获取当前笔触透明度
-        /// </summary>
-        double CurrentInkAlpha { get; }
-
-        /// <summary>
-        /// 获取当前笔触样式
-        /// </summary>
-        int CurrentInkStyle { get; }
-
-        /// <summary>
-        /// 获取当前背景颜色
-        /// </summary>
-        string CurrentBackgroundColor { get; }
-
-        #endregion
-
-        #region 应用状态获取
-
-        /// <summary>
-        /// 获取当前主题模式
-        /// </summary>
-        bool IsDarkTheme { get; }
-
-        /// <summary>
-        /// 获取当前是否为白板模式
-        /// </summary>
-        bool IsWhiteboardMode { get; }
-
-        /// <summary>
-        /// 获取当前是否为PPT模式
-        /// </summary>
-        bool IsPPTMode { get; }
-
-        /// <summary>
-        /// 获取当前是否为全屏模式
-        /// </summary>
-        bool IsFullScreenMode { get; }
-
-        /// <summary>
-        /// 获取当前是否为画板模式
-        /// </summary>
-        bool IsCanvasMode { get; }
-
-        /// <summary>
-        /// 获取当前是否为选择模式
-        /// </summary>
-        bool IsSelectionMode { get; }
-
-        /// <summary>
-        /// 获取当前是否为擦除模式
-        /// </summary>
-        bool IsEraserMode { get; }
-
-        /// <summary>
-        /// 获取当前是否为形状绘制模式
-        /// </summary>
-        bool IsShapeDrawingMode { get; }
-
-        /// <summary>
-        /// 获取当前是否为高亮模式
-        /// </summary>
-        bool IsHighlighterMode { get; }
-
-        #endregion
-
-        #region 撤销重做状态获取
-
-        /// <summary>
-        /// 获取是否可以撤销
-        /// </summary>
-        bool CanUndo { get; }
-
-        /// <summary>
-        /// 获取是否可以重做
-        /// </summary>
-        bool CanRedo { get; }
-
-        #endregion
-
-        #region 系统设置获取
-
-        /// <summary>
-        /// 获取系统设置
-        /// </summary>
-        /// <typeparam name="T">设置类型</typeparam>
-        /// <param name="key">设置键</param>
-        /// <param name="defaultValue">默认值</param>
-        /// <returns>设置值</returns>
-        T GetSetting<T>(string key, T defaultValue = default(T));
-
-        #endregion
-
-        #region 插件信息获取
-
-        /// <summary>
-        /// 获取所有已加载的插件
-        /// </summary>
-        /// <returns>插件列表</returns>
-        List<IPlugin> GetAllPlugins();
-
-        /// <summary>
-        /// 获取指定插件
-        /// </summary>
-        /// <param name="pluginName">插件名称</param>
-        /// <returns>插件实例</returns>
-        IPlugin GetPlugin(string pluginName);
-
-        #endregion
-    }
-}

Ink Canvas/Helpers/Plugins/IPlugin.cs

@@ -1,67 +0,0 @@
-using System;
-using System.Windows.Controls;
-
-namespace Ink_Canvas.Helpers.Plugins
-{
-    /// <summary>
-    /// 定义插件的基本接口
-    /// </summary>
-    public interface IPlugin
-    {
-        /// <summary>
-        /// 插件名称
-        /// </summary>
-        string Name { get; }
-
-        /// <summary>
-        /// 插件描述
-        /// </summary>
-        string Description { get; }
-
-        /// <summary>
-        /// 插件版本
-        /// </summary>
-        Version Version { get; }
-
-        /// <summary>
-        /// 插件作者
-        /// </summary>
-        string Author { get; }
-
-        /// <summary>
-        /// 是否为内置插件
-        /// </summary>
-        bool IsBuiltIn { get; }
-
-        /// <summary>
-        /// 初始化插件
-        /// 此方法在插件加载时被调用，用于执行一些初始化工作
-        /// </summary>
-        void Initialize();
-
-        /// <summary>
-        /// 启用插件
-        /// 此方法在插件被用户或系统启用时调用，激活插件功能
-        /// </summary>
-        void Enable();
-
-        /// <summary>
-        /// 禁用插件
-        /// 此方法在插件被用户或系统禁用时调用，停用插件功能
-        /// </summary>
-        void Disable();
-
-        /// <summary>
-        /// 获取插件设置界面
-        /// 此方法返回插件的设置界面控件，用于展示在设置窗口
-        /// </summary>
-        /// <returns>插件设置界面</returns>
-        UserControl GetSettingsView();
-
-        /// <summary>
-        /// 插件卸载时的清理工作
-        /// 此方法在插件被卸载前调用，用于释放资源和执行清理
-        /// </summary>
-        void Cleanup();
-    }
-}

Ink Canvas/Helpers/Plugins/IPluginService.cs

@@ -1,38 +0,0 @@
-namespace Ink_Canvas.Helpers.Plugins
-{
-    /// <summary>
-    /// 插件服务接口，提供对软件内部功能的访问
-    /// 继承自三个专门的服务接口：获取服务、窗口服务、操作服务
-    /// </summary>
-    public interface IPluginService : IGetService, IWindowService, IActionService
-    {
-        // 这个接口现在继承自三个专门的服务接口
-        // 所有方法都在子接口中定义，这里不需要重复定义
-    }
-
-    /// <summary>
-    /// 通知类型枚举
-    /// </summary>
-    public enum NotificationType
-    {
-        /// <summary>
-        /// 信息
-        /// </summary>
-        Info,
-
-        /// <summary>
-        /// 成功
-        /// </summary>
-        Success,
-
-        /// <summary>
-        /// 警告
-        /// </summary>
-        Warning,
-
-        /// <summary>
-        /// 错误
-        /// </summary>
-        Error
-    }
-}

Ink Canvas/Helpers/Plugins/IWindowService.cs

@@ -1,152 +0,0 @@
-namespace Ink_Canvas.Helpers.Plugins
-{
-    /// <summary>
-    /// 窗口服务接口，统一所有窗口操作相关的方法
-    /// </summary>
-    public interface IWindowService
-    {
-        #region 窗口显示和隐藏
-
-        /// <summary>
-        /// 显示设置窗口
-        /// </summary>
-        void ShowSettingsWindow();
-
-        /// <summary>
-        /// 隐藏设置窗口
-        /// </summary>
-        void HideSettingsWindow();
-
-        /// <summary>
-        /// 显示插件设置窗口
-        /// </summary>
-        void ShowPluginSettingsWindow();
-
-        /// <summary>
-        /// 隐藏插件设置窗口
-        /// </summary>
-        void HidePluginSettingsWindow();
-
-        /// <summary>
-        /// 显示帮助窗口
-        /// </summary>
-        void ShowHelpWindow();
-
-        /// <summary>
-        /// 隐藏帮助窗口
-        /// </summary>
-        void HideHelpWindow();
-
-        /// <summary>
-        /// 显示关于窗口
-        /// </summary>
-        void ShowAboutWindow();
-
-        /// <summary>
-        /// 隐藏关于窗口
-        /// </summary>
-        void HideAboutWindow();
-
-        #endregion
-
-        #region 对话框和通知
-
-        /// <summary>
-        /// 显示通知消息
-        /// </summary>
-        /// <param name="message">消息内容</param>
-        /// <param name="type">消息类型</param>
-        void ShowNotification(string message, NotificationType type = NotificationType.Info);
-
-        /// <summary>
-        /// 显示确认对话框
-        /// </summary>
-        /// <param name="message">消息内容</param>
-        /// <param name="title">标题</param>
-        /// <returns>用户选择结果</returns>
-        bool ShowConfirmDialog(string message, string title = "确认");
-
-        /// <summary>
-        /// 显示输入对话框
-        /// </summary>
-        /// <param name="message">提示消息</param>
-        /// <param name="title">标题</param>
-        /// <param name="defaultValue">默认值</param>
-        /// <returns>用户输入内容</returns>
-        string ShowInputDialog(string message, string title = "输入", string defaultValue = "");
-
-        #endregion
-
-        #region 窗口状态控制
-
-        /// <summary>
-        /// 设置窗口全屏状态
-        /// </summary>
-        /// <param name="isFullScreen">是否全屏</param>
-        void SetFullScreen(bool isFullScreen);
-
-        /// <summary>
-        /// 设置窗口置顶状态
-        /// </summary>
-        /// <param name="isTopMost">是否置顶</param>
-        void SetTopMost(bool isTopMost);
-
-        /// <summary>
-        /// 设置窗口可见性
-        /// </summary>
-        /// <param name="isVisible">是否可见</param>
-        void SetWindowVisibility(bool isVisible);
-
-        /// <summary>
-        /// 最小化窗口
-        /// </summary>
-        void MinimizeWindow();
-
-        /// <summary>
-        /// 最大化窗口
-        /// </summary>
-        void MaximizeWindow();
-
-        /// <summary>
-        /// 恢复窗口
-        /// </summary>
-        void RestoreWindow();
-
-        /// <summary>
-        /// 关闭窗口
-        /// </summary>
-        void CloseWindow();
-
-        #endregion
-
-        #region 窗口位置和大小
-
-        /// <summary>
-        /// 设置窗口位置
-        /// </summary>
-        /// <param name="x">X坐标</param>
-        /// <param name="y">Y坐标</param>
-        void SetWindowPosition(double x, double y);
-
-        /// <summary>
-        /// 设置窗口大小
-        /// </summary>
-        /// <param name="width">宽度</param>
-        /// <param name="height">高度</param>
-        void SetWindowSize(double width, double height);
-
-        /// <summary>
-        /// 获取窗口位置
-        /// </summary>
-        /// <returns>窗口位置</returns>
-        (double x, double y) GetWindowPosition();
-
-        /// <summary>
-        /// 获取窗口大小
-        /// </summary>
-        /// <returns>窗口大小</returns>
-        (double width, double height) GetWindowSize();
-
-        #endregion
-    }
-}

Ink Canvas/Helpers/Plugins/PluginBase.cs

@@ -1,161 +0,0 @@
-using System;
-using System.Windows.Controls;
-
-namespace Ink_Canvas.Helpers.Plugins
-{
-    /// <summary>
-    /// 插件基类，提供基本实现
-    /// </summary>
-    public abstract class PluginBase : IPlugin
-    {
-        /// <summary>
-        /// 插件状态（私有字段）
-        /// </summary>
-        private bool _isEnabled;
-
-        /// <summary>
-        /// 插件状态（公共属性）
-        /// </summary>
-        public bool IsEnabled
-        {
-            get => _isEnabled;
-            protected set
-            {
-                if (_isEnabled != value)
-                {
-                    _isEnabled = value;
-                    OnEnabledStateChanged(value);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 插件ID
-        /// </summary>
-        public string Id { get; protected set; }
-
-        /// <summary>
-        /// 插件路径
-        /// </summary>
-        public string PluginPath { get; set; }
-
-        /// <summary>
-        /// 插件名称
-        /// </summary>
-        public abstract string Name { get; }
-
-        /// <summary>
-        /// 插件描述
-        /// </summary>
-        public abstract string Description { get; }
-
-        /// <summary>
-        /// 插件版本
-        /// </summary>
-        public abstract Version Version { get; }
-
-        /// <summary>
-        /// 插件作者
-        /// </summary>
-        public abstract string Author { get; }
-
-        /// <summary>
-        /// 是否为内置插件
-        /// </summary>
-        public virtual bool IsBuiltIn => false;
-
-        /// <summary>
-        /// 状态变更事件
-        /// </summary>
-        public event EventHandler<bool> EnabledStateChanged;
-
-        /// <summary>
-        /// 初始化插件
-        /// </summary>
-        public virtual void Initialize()
-        {
-            Id = GetType().FullName;
-
-            // 添加日志，记录插件名称
-            try
-            {
-                string name = Name;
-                LogHelper.WriteLogToFile($"初始化插件: ID={Id}, 名称={name ?? "未命名"}");
-
-                if (string.IsNullOrEmpty(name))
-                {
-                    LogHelper.WriteLogToFile($"警告: 插件 {Id} 的名称为空", LogHelper.LogType.Warning);
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"获取插件名称时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-
-            LogHelper.WriteLogToFile($"插件 {Name} 已初始化");
-        }
-
-        /// <summary>
-        /// 启用插件
-        /// </summary>
-        public virtual void Enable()
-        {
-            if (!IsEnabled)
-            {
-                IsEnabled = true;
-                LogHelper.WriteLogToFile($"插件 {Name} 已启用");
-            }
-        }
-
-        /// <summary>
-        /// 禁用插件
-        /// </summary>
-        public virtual void Disable()
-        {
-            if (IsEnabled)
-            {
-                IsEnabled = false;
-                LogHelper.WriteLogToFile($"插件 {Name} 已禁用");
-            }
-        }
-
-        /// <summary>
-        /// 获取插件设置界面
-        /// </summary>
-        /// <returns>插件设置界面</returns>
-        public virtual UserControl GetSettingsView()
-        {
-            // 默认返回空设置页面
-            return new UserControl();
-        }
-
-        /// <summary>
-        /// 插件卸载时的清理工作
-        /// </summary>
-        public virtual void Cleanup()
-        {
-            LogHelper.WriteLogToFile($"插件 {Name} 已卸载");
-        }
-
-        /// <summary>
-        /// 保存插件自身的设置
-        /// 注意：此方法仅用于保存插件的特定设置，不应影响插件启用/禁用状态
-        /// 插件启用状态由PluginManager统一管理
-        /// </summary>
-        public virtual void SavePluginSettings()
-        {
-            // 默认实现不做任何事情
-            // 子类可以重写此方法，将自身设置保存到配置文件中
-            LogHelper.WriteLogToFile($"插件 {Name} 设置已保存", LogHelper.LogType.Event);
-        }
-
-        /// <summary>
-        /// 触发状态变更事件
-        /// </summary>
-        /// <param name="isEnabled">是否启用</param>
-        protected virtual void OnEnabledStateChanged(bool isEnabled)
-        {
-            EnabledStateChanged?.Invoke(this, isEnabled);
-        }
-    }
-}

Ink Canvas/Helpers/Plugins/PluginConfigurationManager.cs

@@ -1,273 +0,0 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
-
-namespace Ink_Canvas.Helpers.Plugins
-{
-    /// <summary>
-    /// 插件配置管理器，允许插件管理自己的配置
-    /// </summary>
-    public class PluginConfigurationManager
-    {
-        private static readonly string PluginConfigDirectory = Path.Combine(App.RootPath, "PluginConfigs");
-        private static readonly Dictionary<string, Dictionary<string, object>> _pluginConfigs = new Dictionary<string, Dictionary<string, object>>();
-        private static readonly object _lockObject = new object();
-
-        static PluginConfigurationManager()
-        {
-            // 确保配置目录存在
-            if (!Directory.Exists(PluginConfigDirectory))
-            {
-                Directory.CreateDirectory(PluginConfigDirectory);
-            }
-        }
-
-        /// <summary>
-        /// 获取插件配置值
-        /// </summary>
-        /// <typeparam name="T">配置值类型</typeparam>
-        /// <param name="pluginName">插件名称</param>
-        /// <param name="key">配置键</param>
-        /// <param name="defaultValue">默认值</param>
-        /// <returns>配置值</returns>
-        public static T GetConfiguration<T>(string pluginName, string key, T defaultValue = default(T))
-        {
-            lock (_lockObject)
-            {
-                try
-                {
-                    if (_pluginConfigs.TryGetValue(pluginName, out var pluginConfig))
-                    {
-                        if (pluginConfig.TryGetValue(key, out var value))
-                        {
-                            if (value is T typedValue)
-                            {
-                                return typedValue;
-                            }
-
-                            // 尝试类型转换
-                            try
-                            {
-                                return (T)Convert.ChangeType(value, typeof(T));
-                            }
-                            catch
-                            {
-                                return defaultValue;
-                            }
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    LogHelper.WriteLogToFile($"获取插件 {pluginName} 配置 {key} 时出错: {ex.Message}", LogHelper.LogType.Error);
-                }
-
-                return defaultValue;
-            }
-        }
-
-        /// <summary>
-        /// 设置插件配置值
-        /// </summary>
-        /// <typeparam name="T">配置值类型</typeparam>
-        /// <param name="pluginName">插件名称</param>
-        /// <param name="key">配置键</param>
-        /// <param name="value">配置值</param>
-        public static void SetConfiguration<T>(string pluginName, string key, T value)
-        {
-            lock (_lockObject)
-            {
-                try
-                {
-                    if (!_pluginConfigs.ContainsKey(pluginName))
-                    {
-                        _pluginConfigs[pluginName] = new Dictionary<string, object>();
-                    }
-
-                    _pluginConfigs[pluginName][key] = value;
-
-                    // 异步保存配置
-                    Task.Run(() => SavePluginConfiguration(pluginName));
-                }
-                catch (Exception ex)
-                {
-                    LogHelper.WriteLogToFile($"设置插件 {pluginName} 配置 {key} 时出错: {ex.Message}", LogHelper.LogType.Error);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 删除插件配置
-        /// </summary>
-        /// <param name="pluginName">插件名称</param>
-        /// <param name="key">配置键</param>
-        public static void RemoveConfiguration(string pluginName, string key)
-        {
-            lock (_lockObject)
-            {
-                try
-                {
-                    if (_pluginConfigs.TryGetValue(pluginName, out var pluginConfig))
-                    {
-                        if (pluginConfig.Remove(key))
-                        {
-                            // 异步保存配置
-                            Task.Run(() => SavePluginConfiguration(pluginName));
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    LogHelper.WriteLogToFile($"删除插件 {pluginName} 配置 {key} 时出错: {ex.Message}", LogHelper.LogType.Error);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 获取插件的所有配置
-        /// </summary>
-        /// <param name="pluginName">插件名称</param>
-        /// <returns>配置字典</returns>
-        public static Dictionary<string, object> GetAllConfigurations(string pluginName)
-        {
-            lock (_lockObject)
-            {
-                if (_pluginConfigs.TryGetValue(pluginName, out var pluginConfig))
-                {
-                    return new Dictionary<string, object>(pluginConfig);
-                }
-                return new Dictionary<string, object>();
-            }
-        }
-
-        /// <summary>
-        /// 清除插件的所有配置
-        /// </summary>
-        /// <param name="pluginName">插件名称</param>
-        public static void ClearAllConfigurations(string pluginName)
-        {
-            lock (_lockObject)
-            {
-                try
-                {
-                    if (_pluginConfigs.Remove(pluginName))
-                    {
-                        // 删除配置文件
-                        string configFile = Path.Combine(PluginConfigDirectory, $"{pluginName}.json");
-                        if (File.Exists(configFile))
-                        {
-                            File.Delete(configFile);
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    LogHelper.WriteLogToFile($"清除插件 {pluginName} 所有配置时出错: {ex.Message}", LogHelper.LogType.Error);
-                }
-            }
-        }
-
-        /// <summary>
-        /// 加载插件配置
-        /// </summary>
-        /// <param name="pluginName">插件名称</param>
-        public static void LoadPluginConfiguration(string pluginName)
-        {
-            try
-            {
-                string configFile = Path.Combine(PluginConfigDirectory, $"{pluginName}.json");
-                if (File.Exists(configFile))
-                {
-                    string json = File.ReadAllText(configFile);
-                    var config = JsonConvert.DeserializeObject<Dictionary<string, object>>(json);
-
-                    lock (_lockObject)
-                    {
-                        _pluginConfigs[pluginName] = config ?? new Dictionary<string, object>();
-                    }
-
-                    LogHelper.WriteLogToFile($"已加载插件 {pluginName} 的配置");
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"加载插件 {pluginName} 配置时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 保存插件配置
-        /// </summary>
-        /// <param name="pluginName">插件名称</param>
-        private static void SavePluginConfiguration(string pluginName)
-        {
-            try
-            {
-                Dictionary<string, object> pluginConfig;
-                lock (_lockObject)
-                {
-                    if (!_pluginConfigs.TryGetValue(pluginName, out pluginConfig))
-                    {
-                        return;
-                    }
-                }
-
-                string configFile = Path.Combine(PluginConfigDirectory, $"{pluginName}.json");
-                string json = JsonConvert.SerializeObject(pluginConfig, Formatting.Indented);
-                File.WriteAllText(configFile, json);
-
-                LogHelper.WriteLogToFile($"已保存插件 {pluginName} 的配置");
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"保存插件 {pluginName} 配置时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 加载所有插件的配置
-        /// </summary>
-        public static void LoadAllPluginConfigurations()
-        {
-            try
-            {
-                if (Directory.Exists(PluginConfigDirectory))
-                {
-                    string[] configFiles = Directory.GetFiles(PluginConfigDirectory, "*.json");
-                    foreach (string configFile in configFiles)
-                    {
-                        string pluginName = Path.GetFileNameWithoutExtension(configFile);
-                        LoadPluginConfiguration(pluginName);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"加载所有插件配置时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 保存所有插件的配置
-        /// </summary>
-        public static void SaveAllPluginConfigurations()
-        {
-            try
-            {
-                lock (_lockObject)
-                {
-                    foreach (string pluginName in _pluginConfigs.Keys)
-                    {
-                        SavePluginConfiguration(pluginName);
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"保存所有插件配置时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-    }
-}

Ink Canvas/Helpers/Plugins/PluginServiceManager.cs

@@ -1,509 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-
-namespace Ink_Canvas.Helpers.Plugins
-{
-    /// <summary>
-    /// 插件服务管理器，实现IPluginService接口，提供对软件内部功能的访问
-    /// </summary>
-    public class PluginServiceManager : IPluginService
-    {
-        private static PluginServiceManager _instance;
-        private MainWindow _mainWindow;
-        private Dictionary<string, EventHandler> _eventHandlers;
-
-        /// <summary>
-        /// 单例实例
-        /// </summary>
-        public static PluginServiceManager Instance
-        {
-            get
-            {
-                if (_instance == null)
-                {
-                    _instance = new PluginServiceManager();
-                }
-                return _instance;
-            }
-        }
-
-        private PluginServiceManager()
-        {
-            _eventHandlers = new Dictionary<string, EventHandler>();
-        }
-
-        /// <summary>
-        /// 设置主窗口引用
-        /// </summary>
-        /// <param name="mainWindow">主窗口实例</param>
-        public void SetMainWindow(MainWindow mainWindow)
-        {
-            _mainWindow = mainWindow;
-        }
-
-        #region 窗口和UI访问
-
-        public Window MainWindow => _mainWindow;
-
-        public InkCanvas CurrentCanvas => null; // 暂时返回null，避免访问权限问题
-
-        public List<Canvas> AllCanvasPages => new List<Canvas>(); // 暂时返回空列表
-
-        public int CurrentPageIndex => 0; // 暂时返回0
-
-        public int TotalPageCount => 0; // 暂时返回0
-
-        public FrameworkElement FloatingToolBar => _mainWindow?.ViewboxFloatingBar;
-
-        public FrameworkElement LeftPanel => _mainWindow?.BlackboardLeftSide;
-
-        public FrameworkElement RightPanel => _mainWindow?.BlackboardRightSide;
-
-        public FrameworkElement TopPanel => _mainWindow?.BorderTools;
-
-        public FrameworkElement BottomPanel => _mainWindow?.BorderSettings;
-
-        #endregion
-
-        #region 绘制工具状态
-
-        public int CurrentDrawingMode => 0; // 暂时返回0
-
-        public double CurrentInkWidth => 2.5; // 暂时返回默认值
-
-        public Color CurrentInkColor => Colors.Black; // 暂时返回默认值
-
-        public double CurrentHighlighterWidth => 20.0; // 暂时返回默认值
-
-        public int CurrentEraserSize => 2; // 暂时返回默认值
-
-        public int CurrentEraserType => 0; // 暂时返回默认值
-
-        public int CurrentEraserShape => 0; // 暂时返回默认值
-
-        public double CurrentInkAlpha => 255.0; // 暂时返回默认值
-
-        public int CurrentInkStyle => 0; // 暂时返回默认值
-
-        public string CurrentBackgroundColor => "#162924"; // 暂时返回默认值
-
-        #endregion
-
-        #region 应用状态
-
-        public bool IsDarkTheme => false; // 暂时返回默认值
-
-        public bool IsWhiteboardMode => false; // 暂时返回默认值
-
-        public bool IsPPTMode => false; // 暂时返回默认值
-
-        public bool IsFullScreenMode => false; // 暂时返回默认值
-
-        public bool IsCanvasMode => true; // 暂时返回默认值
-
-        public bool IsSelectionMode => false; // 暂时返回默认值
-
-        public bool IsEraserMode => false; // 暂时返回默认值
-
-        public bool IsShapeDrawingMode => false; // 暂时返回默认值
-
-        public bool IsHighlighterMode => false; // 暂时返回默认值
-
-        #endregion
-
-        #region IGetService 实现
-
-        public bool CanUndo => false; // 暂时返回默认值
-
-        public bool CanRedo => false; // 暂时返回默认值
-
-        public T GetSetting<T>(string key, T defaultValue = default(T))
-        {
-            // 暂时不实现，避免访问权限问题
-            return defaultValue;
-        }
-
-        public List<IPlugin> GetAllPlugins()
-        {
-            return new List<IPlugin>(PluginManager.Instance.Plugins);
-        }
-
-        public IPlugin GetPlugin(string pluginName)
-        {
-            return PluginManager.Instance.Plugins.FirstOrDefault(p => p.Name == pluginName);
-        }
-
-        #endregion
-
-        #region IWindowService 实现
-
-        public void ShowSettingsWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void HideSettingsWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void ShowPluginSettingsWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void HidePluginSettingsWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void ShowHelpWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void HideHelpWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void ShowAboutWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void HideAboutWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void ShowNotification(string message, NotificationType type = NotificationType.Info)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public bool ShowConfirmDialog(string message, string title = "确认")
-        {
-            // 暂时不实现，避免访问权限问题
-            return false;
-        }
-
-        public string ShowInputDialog(string message, string title = "输入", string defaultValue = "")
-        {
-            // 暂时不实现，避免访问权限问题
-            return defaultValue;
-        }
-
-        public void SetFullScreen(bool isFullScreen)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetTopMost(bool isTopMost)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetWindowVisibility(bool isVisible)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void MinimizeWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void MaximizeWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void RestoreWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void CloseWindow()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetWindowPosition(double x, double y)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetWindowSize(double width, double height)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public (double x, double y) GetWindowPosition()
-        {
-            // 暂时不实现，避免访问权限问题
-            return (0, 0);
-        }
-
-        public (double width, double height) GetWindowSize()
-        {
-            // 暂时不实现，避免访问权限问题
-            return (800, 600);
-        }
-
-        #endregion
-
-        #region IActionService 实现
-
-        public void ClearCanvas()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void ClearAllCanvases()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void AddNewPage()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void DeleteCurrentPage()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SwitchToPage(int pageIndex)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void NextPage()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void PreviousPage()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetDrawingMode(int mode)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetInkWidth(double width)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetInkColor(Color color)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetHighlighterWidth(double width)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetEraserSize(int size)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetEraserType(int type)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetEraserShape(int shape)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetInkAlpha(double alpha)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetInkStyle(int style)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetBackgroundColor(string color)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SaveCanvas(string filePath)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void LoadCanvas(string filePath)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void ExportAsImage(string filePath, string format)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void ExportAsPDF(string filePath)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void Undo()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void Redo()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SelectAll()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void DeselectAll()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void DeleteSelected()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void CopySelected()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void CutSelected()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void Paste()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SetSetting<T>(string key, T value)
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void SaveSettings()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void LoadSettings()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void ResetSettings()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void EnablePlugin(string pluginName)
-        {
-            var plugin = GetPlugin(pluginName);
-            if (plugin != null)
-            {
-                PluginManager.Instance.TogglePlugin(plugin, true);
-            }
-        }
-
-        public void DisablePlugin(string pluginName)
-        {
-            var plugin = GetPlugin(pluginName);
-            if (plugin != null)
-            {
-                PluginManager.Instance.TogglePlugin(plugin, false);
-            }
-        }
-
-        public void UnloadPlugin(string pluginName)
-        {
-            var plugin = GetPlugin(pluginName);
-            if (plugin != null)
-            {
-                PluginManager.Instance.UnloadPlugin(plugin);
-            }
-        }
-
-        public void RegisterEventHandler(string eventName, EventHandler handler)
-        {
-            if (!_eventHandlers.ContainsKey(eventName))
-            {
-                _eventHandlers[eventName] = handler;
-            }
-            else
-            {
-                _eventHandlers[eventName] += handler;
-            }
-        }
-
-        public void UnregisterEventHandler(string eventName, EventHandler handler)
-        {
-            if (_eventHandlers.ContainsKey(eventName))
-            {
-                _eventHandlers[eventName] -= handler;
-            }
-        }
-
-        public void TriggerEvent(string eventName, object sender, EventArgs args)
-        {
-            if (_eventHandlers.ContainsKey(eventName))
-            {
-                _eventHandlers[eventName]?.Invoke(sender, args);
-            }
-        }
-
-        public void RestartApplication()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void ExitApplication()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void CheckForUpdates()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void OpenHelpDocument()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        public void OpenAboutPage()
-        {
-            // 暂时不实现，避免访问权限问题
-        }
-
-        #endregion
-    }
-}

Ink Canvas/Helpers/Plugins/PluginTemplate.cs

@@ -1,276 +0,0 @@
-using System;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Ink_Canvas.Helpers.Plugins
-{
-    /// <summary>
-    /// 插件模板，用于开发者参考
-    /// 注意：实际开发时，请将此类移到单独的程序集中
-    /// </summary>
-    public class PluginTemplate : PluginBase
-    {
-        #region 插件基本信息
-
-        /// <summary>
-        /// 插件名称
-        /// </summary>
-        public override string Name => "插件模板";
-
-        /// <summary>
-        /// 插件描述
-        /// </summary>
-        public override string Description => "这是一个插件开发模板，用于开发者参考。";
-
-        /// <summary>
-        /// 插件版本
-        /// </summary>
-        public override Version Version => new Version(1, 0, 0);
-
-        /// <summary>
-        /// 插件作者
-        /// </summary>
-        public override string Author => "Your Name";
-
-        /// <summary>
-        /// 是否为内置插件（外部插件请返回false）
-        /// </summary>
-        public override bool IsBuiltIn => false;
-
-        #endregion
-
-        #region 插件生命周期
-
-        /// <summary>
-        /// 插件初始化
-        /// 在这里进行插件的初始化工作，如加载配置、注册事件等
-        /// </summary>
-        public override void Initialize()
-        {
-            // 先调用基类方法，这样会设置插件ID和记录日志
-            base.Initialize();
-
-            // TODO: 在这里进行插件初始化工作
-
-            // 示例：记录初始化信息
-            LogHelper.WriteLogToFile($"插件 {Name} 开始初始化");
-
-            // 示例：加载配置
-            LoadConfig();
-
-            // 示例：注册自定义事件
-            // MainWindow.Instance.SomeEvent += OnSomeEvent;
-
-            LogHelper.WriteLogToFile($"插件 {Name} 初始化完成");
-        }
-
-        /// <summary>
-        /// 启用插件
-        /// 在这里激活插件功能
-        /// </summary>
-        public override void Enable()
-        {
-            // 先调用基类方法，这样会设置插件状态和记录日志
-            base.Enable();
-
-            // TODO: 在这里启用插件功能
-
-            LogHelper.WriteLogToFile($"插件 {Name} 已启用");
-        }
-
-        /// <summary>
-        /// 禁用插件
-        /// 在这里停用插件功能
-        /// </summary>
-        public override void Disable()
-        {
-            // 先调用基类方法，这样会设置插件状态和记录日志
-            base.Disable();
-
-            // TODO: 在这里禁用插件功能
-
-            LogHelper.WriteLogToFile($"插件 {Name} 已禁用");
-        }
-
-        /// <summary>
-        /// 清理资源
-        /// 在插件卸载时调用，清理资源
-        /// </summary>
-        public override void Cleanup()
-        {
-            // TODO: 在这里清理插件资源
-
-            // 示例：取消注册事件
-            // MainWindow.Instance.SomeEvent -= OnSomeEvent;
-
-            // 示例：保存配置
-            SaveConfig();
-
-            // 最后调用基类方法
-            base.Cleanup();
-        }
-
-        #endregion
-
-        #region 插件配置
-
-        /// <summary>
-        /// 加载插件配置
-        /// </summary>
-        private void LoadConfig()
-        {
-            try
-            {
-                // TODO: 从文件或其他位置加载配置
-                // 示例：
-                // string configPath = Path.Combine(App.RootPath, "PluginConfigs", "YourPluginName.json");
-                // if (File.Exists(configPath))
-                // {
-                //     string json = File.ReadAllText(configPath);
-                //     YourConfig = Newtonsoft.Json.JsonConvert.DeserializeObject<YourConfigClass>(json);
-                // }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"加载插件配置时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 保存插件配置
-        /// </summary>
-        private void SaveConfig()
-        {
-            try
-            {
-                // TODO: 保存配置到文件或其他位置
-                // 示例：
-                // string configDir = Path.Combine(App.RootPath, "PluginConfigs");
-                // if (!Directory.Exists(configDir))
-                // {
-                //     Directory.CreateDirectory(configDir);
-                // }
-                // string configPath = Path.Combine(configDir, "YourPluginName.json");
-                // string json = Newtonsoft.Json.JsonConvert.SerializeObject(YourConfig, Newtonsoft.Json.Formatting.Indented);
-                // File.WriteAllText(configPath, json);
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"保存插件配置时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        #endregion
-
-        #region 插件设置界面
-
-        /// <summary>
-        /// 获取插件设置界面
-        /// </summary>
-        /// <returns>插件设置界面</returns>
-        public override UserControl GetSettingsView()
-        {
-            // 创建插件设置界面
-            return new PluginTemplateSettingsControl();
-        }
-
-        #endregion
-
-        #region 插件功能方法
-
-        // TODO: 在这里添加插件的具体功能方法
-
-        /// <summary>
-        /// 示例方法：执行一些功能
-        /// </summary>
-        public void DoSomething()
-        {
-            if (!IsEnabled) return;
-
-            try
-            {
-                // TODO: 实现你的功能
-                MessageBox.Show("插件功能执行示例", "插件模板", MessageBoxButton.OK, MessageBoxImage.Information);
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"执行插件功能时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        #endregion
-    }
-
-    /// <summary>
-    /// 插件设置控件
-    /// </summary>
-    public class PluginTemplateSettingsControl : UserControl
-    {
-        public PluginTemplateSettingsControl()
-        {
-            // 创建设置界面布局
-            var panel = new StackPanel
-            {
-                Margin = new Thickness(10)
-            };
-
-            // 添加标题
-            panel.Children.Add(new TextBlock
-            {
-                Text = "插件模板设置",
-                FontSize = 16,
-                FontWeight = FontWeights.Bold,
-                Margin = new Thickness(0, 0, 0, 10)
-            });
-
-            // 添加说明文字
-            panel.Children.Add(new TextBlock
-            {
-                Text = "这是一个示例设置界面，你可以在这里添加自己的设置控件。",
-                TextWrapping = TextWrapping.Wrap,
-                Margin = new Thickness(0, 0, 0, 15)
-            });
-
-            // 添加示例设置选项
-            var checkBox = new CheckBox
-            {
-                Content = "启用某项功能",
-                Margin = new Thickness(0, 0, 0, 10)
-            };
-            panel.Children.Add(checkBox);
-
-            // 添加文本输入框
-            panel.Children.Add(new TextBlock
-            {
-                Text = "设置项:",
-                Margin = new Thickness(0, 5, 0, 5)
-            });
-
-            panel.Children.Add(new TextBox
-            {
-                Margin = new Thickness(0, 0, 0, 10),
-                Width = 200,
-                HorizontalAlignment = HorizontalAlignment.Left
-            });
-
-            // 添加按钮
-            var button = new Button
-            {
-                Content = "保存设置",
-                Padding = new Thickness(10, 5, 10, 5),
-                Margin = new Thickness(0, 10, 0, 0),
-                HorizontalAlignment = HorizontalAlignment.Left
-            };
-
-            button.Click += (sender, e) =>
-            {
-                MessageBox.Show("设置已保存！", "插件模板", MessageBoxButton.OK, MessageBoxImage.Information);
-            };
-
-            panel.Children.Add(button);
-
-            // 设置控件内容
-            Content = panel;
-        }
-    }
-}

Ink Canvas/Helpers/SaveFileNameHelper.cs

@@ -0,0 +1,68 @@
+using System;
+using System.IO;
+using System.Text.RegularExpressions;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// 渲染保存文件名模板。支持占位符: {date} {time} {datetime} {mode} {page} {count} {type}。
+    /// 当模板为空、渲染结果非法或仅含分隔符时，回退到默认时间戳命名。
+    /// </summary>
+    public static class SaveFileNameHelper
+    {
+        private const string DefaultDateTime = "yyyy-MM-dd HH-mm-ss-fff";
+
+        public static string Render(string template, SaveFileNameContext ctx)
+        {
+            if (ctx == null) ctx = new SaveFileNameContext();
+            var now = ctx.Time ?? DateTime.Now;
+
+            if (string.IsNullOrWhiteSpace(template))
+                return now.ToString(DefaultDateTime);
+
+            try
+            {
+                string result = template
+                    .Replace("{date}", now.ToString("yyyy-MM-dd"))
+                    .Replace("{time}", now.ToString("HH-mm-ss"))
+                    .Replace("{datetime}", now.ToString(DefaultDateTime))
+                    .Replace("{mode}", ctx.Mode ?? "")
+                    .Replace("{page}", ctx.Page?.ToString() ?? "")
+                    .Replace("{count}", ctx.Count?.ToString() ?? "")
+                    .Replace("{type}", ctx.Type ?? "");
+
+                result = SanitizeFileName(result);
+
+                if (string.IsNullOrWhiteSpace(result) || Regex.IsMatch(result, @"^[\s\-_]+$"))
+                    return now.ToString(DefaultDateTime);
+
+                return result;
+            }
+            catch
+            {
+                return now.ToString(DefaultDateTime);
+            }
+        }
+
+        private static string SanitizeFileName(string name)
+        {
+            if (string.IsNullOrEmpty(name)) return name;
+            foreach (var c in Path.GetInvalidFileNameChars())
+            {
+                name = name.Replace(c, '_');
+            }
+            return name.Trim();
+        }
+    }
+
+    public class SaveFileNameContext
+    {
+        public DateTime? Time { get; set; }
+        /// <summary>"Annotation" or "BlackBoard" or "Screenshot" etc.</summary>
+        public string Mode { get; set; }
+        /// <summary>"User" or "Auto"</summary>
+        public string Type { get; set; }
+        public int? Page { get; set; }
+        public int? Count { get; set; }
+    }
+}

Ink Canvas/Helpers/SoftwareLauncher.cs

@@ -49,16 +49,13 @@ namespace Ink_Canvas.Helpers
             if (string.IsNullOrWhiteSpace(softwareName))
                 return null;
 
-            // 64 位进程默认只枚举 64 位注册表视图；32 位希沃常写在 WOW6432Node 下，需一并扫描。
-            string[] uninstallRoots =
+            // 须用 OpenBaseKey + RegistryView 显式指定视图：Registry.LocalMachine.OpenSubKey 跟随进程位数，
+            // 32 位进程下无法靠拼接 WOW6432Node 路径进入 64 位视图，会找不到 64 位安装的展台。
+            const string uninstallSubKey = @"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall";
+            foreach (RegistryView view in new[] { RegistryView.Registry64, RegistryView.Registry32 })
             {
-                @"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall",
-                @"SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall",
-            };
-
-            foreach (string root in uninstallRoots)
-            {
-                using (RegistryKey key = Registry.LocalMachine.OpenSubKey(root))
+                using (RegistryKey baseKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, view))
+                using (RegistryKey key = baseKey.OpenSubKey(uninstallSubKey))
                 {
                     if (key == null) continue;
                     string found = FindInUninstallKey(key, softwareName);

Ink Canvas/Helpers/TimeMachine.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Ink;
@@ -100,8 +100,8 @@ namespace Ink_Canvas.Helpers
             var item = _currentStrokeHistory[_currentIndex];
             item.StrokeHasBeenCleared = !item.StrokeHasBeenCleared;
             _currentIndex--;
-            OnUndoStateChanged?.Invoke(_currentIndex > -1);
-            OnRedoStateChanged?.Invoke(_currentStrokeHistory.Count - _currentIndex - 1 > 0);
+            OnUndoStateChanged?.Invoke(CanUndo);
+            OnRedoStateChanged?.Invoke(CanRedo);
             return item;
         }
 
@@ -137,9 +137,15 @@ namespace Ink_Canvas.Helpers
         }
         private void NotifyUndoRedoState()
         {
-            OnUndoStateChanged?.Invoke(_currentIndex > -1);
-            OnRedoStateChanged?.Invoke(_currentStrokeHistory.Count - _currentIndex - 1 > 0);
+            OnUndoStateChanged?.Invoke(CanUndo);
+            OnRedoStateChanged?.Invoke(CanRedo);
         }
+
+        /// <summary>当前历史是否允许撤销。</summary>
+        public bool CanUndo => _currentIndex > -1;
+
+        /// <summary>当前历史是否允许重做。</summary>
+        public bool CanRedo => _currentStrokeHistory.Count > 0 && _currentStrokeHistory.Count - _currentIndex - 1 > 0;
     }
 
     public class TimeMachineHistory

Ink Canvas/Helpers/UIAccessDllExtractor.cs

@@ -1,165 +0,0 @@
-using System;
-using System.IO;
-using System.Reflection;
-
-namespace Ink_Canvas.Helpers
-{
-    /// <summary>
-    /// UIAccess DLL释放器
-    /// </summary>
-    public static class UIAccessDllExtractor
-    {
-        private static readonly string[] RequiredDlls = {
-            "UIAccessDLL_x64.dll",
-            "UIAccessDLL_x86.dll"
-        };
-
-        /// <summary>
-        /// 在应用启动时释放UIAccess相关DLL
-        /// </summary>
-        public static void ExtractUIAccessDlls()
-        {
-            try
-            {
-                string appDirectory = AppDomain.CurrentDomain.BaseDirectory;
-                LogHelper.WriteLogToFile("开始检查并释放UIAccess相关DLL文件");
-
-                foreach (string dllName in RequiredDlls)
-                {
-                    string targetPath = Path.Combine(appDirectory, dllName);
-
-                    // 检查文件是否已存在且有效
-                    if (File.Exists(targetPath) && IsValidDll(targetPath))
-                    {
-                        LogHelper.WriteLogToFile($"{dllName} 已存在且有效，跳过释放");
-                        continue;
-                    }
-
-                    // 从嵌入资源中释放DLL
-                    if (ExtractDllFromResource(dllName, targetPath))
-                    {
-                        LogHelper.WriteLogToFile($"成功释放 {dllName} 到 {targetPath}");
-                    }
-                    else
-                    {
-                        LogHelper.WriteLogToFile($"警告：无法释放 {dllName}，可能影响UIA置顶功能", LogHelper.LogType.Warning);
-                    }
-                }
-
-                LogHelper.WriteLogToFile("UIAccess DLL释放检查完成");
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"释放UIAccess DLL时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 从嵌入资源中提取DLL文件
-        /// </summary>
-        private static bool ExtractDllFromResource(string dllName, string targetPath)
-        {
-            try
-            {
-                Assembly assembly = Assembly.GetExecutingAssembly();
-                string resourceName = $"Ink_Canvas.{dllName}";
-
-                using (Stream resourceStream = assembly.GetManifestResourceStream(resourceName))
-                {
-                    if (resourceStream == null)
-                    {
-                        LogHelper.WriteLogToFile($"未找到嵌入资源: {resourceName}", LogHelper.LogType.Warning);
-                        return false;
-                    }
-
-                    // 确保目标目录存在
-                    string targetDirectory = Path.GetDirectoryName(targetPath);
-                    if (!Directory.Exists(targetDirectory))
-                    {
-                        Directory.CreateDirectory(targetDirectory);
-                    }
-
-                    // 写入文件
-                    using (FileStream fileStream = new FileStream(targetPath, FileMode.Create, FileAccess.Write))
-                    {
-                        resourceStream.CopyTo(fileStream);
-                    }
-
-                    return true;
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"从资源提取 {dllName} 失败: {ex.Message}", LogHelper.LogType.Error);
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// 检查DLL文件是否有效
-        /// </summary>
-        private static bool IsValidDll(string filePath)
-        {
-            try
-            {
-                if (!File.Exists(filePath))
-                    return false;
-
-                FileInfo fileInfo = new FileInfo(filePath);
-
-                // 检查文件大小（空文件或过小的文件可能无效）
-                if (fileInfo.Length < 1024) // 小于1KB可能无效
-                    return false;
-
-                // 简单检查PE头（DLL文件应该以MZ开头）
-                using (FileStream fs = new FileStream(filePath, FileMode.Open, FileAccess.Read))
-                {
-                    byte[] buffer = new byte[2];
-                    if (fs.Read(buffer, 0, 2) == 2)
-                    {
-                        return buffer[0] == 0x4D && buffer[1] == 0x5A; // "MZ"
-                    }
-                }
-
-                return false;
-            }
-            catch
-            {
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// 清理释放的DLL文件（可选，在应用退出时调用）
-        /// </summary>
-        public static void CleanupExtractedDlls()
-        {
-            try
-            {
-                string appDirectory = AppDomain.CurrentDomain.BaseDirectory;
-
-                foreach (string dllName in RequiredDlls)
-                {
-                    string filePath = Path.Combine(appDirectory, dllName);
-
-                    if (File.Exists(filePath))
-                    {
-                        try
-                        {
-                            File.Delete(filePath);
-                            LogHelper.WriteLogToFile($"已清理 {dllName}");
-                        }
-                        catch (Exception ex)
-                        {
-                            LogHelper.WriteLogToFile($"清理 {dllName} 失败: {ex.Message}", LogHelper.LogType.Warning);
-                        }
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"清理UIAccess DLL时出错: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-    }
-}

Ink Canvas/Helpers/UIAccessHelper.cs

@@ -0,0 +1,672 @@
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace Ink_Canvas.Helpers
+{
+    /// <summary>
+    /// 通过 Winlogon 令牌模拟实现 UIAccess 提权重启。
+    /// 1. 找到当前会话中 winlogon.exe 的令牌，复制为模拟令牌；
+    /// 2. SetThreadToken 暂时模拟 winlogon（拥有 TCB 权限）；
+    /// 3. 在自身令牌副本上 SetTokenInformation(TokenUIAccess, TRUE)；
+    /// 4. RevertToSelf 后用 CreateProcessWithTokenW 启动新进程；
+    /// 5. 新进程具有 UIAccess 权限，可置顶于 UAC 提示之上。
+    /// </summary>
+    public static class UIAccessHelper
+    {
+        #region Constants
+
+        private const uint TOKEN_QUERY = 0x0008;
+        private const uint TOKEN_DUPLICATE = 0x0002;
+        private const uint TOKEN_IMPERSONATE = 0x0004;
+        private const uint TOKEN_ASSIGN_PRIMARY = 0x0001;
+        private const uint TOKEN_ADJUST_DEFAULT = 0x0080;
+        private const uint TOKEN_ADJUST_SESSIONID = 0x0100;
+        private const uint TOKEN_ADJUST_PRIVILEGES = 0x0020;
+
+        private const int SecurityAnonymous = 0;
+        private const int SecurityImpersonation = 2;
+        private const int TokenPrimary = 1;
+        private const int TokenImpersonation = 2;
+
+        // TOKEN_INFORMATION_CLASS
+        private const int TokenSessionId = 12;
+        private const int TokenElevationType = 18;
+        private const int TokenUIAccess = 26;
+
+        // TOKEN_ELEVATION_TYPE
+        private const int TokenElevationTypeDefault = 1;
+        private const int TokenElevationTypeFull = 2;
+        private const int TokenElevationTypeLimited = 3;
+
+        private const uint PROCESS_QUERY_LIMITED_INFORMATION = 0x1000;
+        private const uint TH32CS_SNAPPROCESS = 0x00000002;
+
+        private const uint LOGON_WITH_PROFILE = 0x00000001;
+        private const uint CREATE_NEW_CONSOLE = 0x00000010;
+        private const uint CREATE_UNICODE_ENVIRONMENT = 0x00000400;
+
+        private const uint SE_PRIVILEGE_ENABLED = 0x00000002;
+        private const string SE_ASSIGNPRIMARYTOKEN_NAME = "SeAssignPrimaryTokenPrivilege";
+
+        private static readonly IntPtr INVALID_HANDLE_VALUE = new IntPtr(-1);
+
+        #endregion
+
+        #region Structs
+
+        [StructLayout(LayoutKind.Sequential)]
+        private struct LUID
+        {
+            public uint LowPart;
+            public int HighPart;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        private struct LUID_AND_ATTRIBUTES
+        {
+            public LUID Luid;
+            public uint Attributes;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        private struct TOKEN_PRIVILEGES
+        {
+            public uint PrivilegeCount;
+            public LUID_AND_ATTRIBUTES Privilege;
+        }
+
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        private struct PROCESSENTRY32W
+        {
+            public uint dwSize;
+            public uint cntUsage;
+            public uint th32ProcessID;
+            public IntPtr th32DefaultHeapID;
+            public uint th32ModuleID;
+            public uint cntThreads;
+            public uint th32ParentProcessID;
+            public int pcPriClassBase;
+            public uint dwFlags;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 260)]
+            public string szExeFile;
+        }
+
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        private struct STARTUPINFOW
+        {
+            public uint cb;
+            public IntPtr lpReserved;
+            public IntPtr lpDesktop;
+            public IntPtr lpTitle;
+            public uint dwX, dwY, dwXSize, dwYSize;
+            public uint dwXCountChars, dwYCountChars;
+            public uint dwFillAttribute;
+            public uint dwFlags;
+            public ushort wShowWindow;
+            public ushort cbReserved2;
+            public IntPtr lpReserved2;
+            public IntPtr hStdInput, hStdOutput, hStdError;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        private struct PROCESS_INFORMATION
+        {
+            public IntPtr hProcess;
+            public IntPtr hThread;
+            public uint dwProcessId;
+            public uint dwThreadId;
+        }
+
+        #endregion
+
+        #region P/Invoke
+
+        [DllImport("kernel32.dll")]
+        private static extern IntPtr GetCurrentProcess();
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool CloseHandle(IntPtr hObject);
+
+        [DllImport("advapi32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool OpenProcessToken(IntPtr ProcessHandle, uint DesiredAccess, out IntPtr TokenHandle);
+
+        [DllImport("advapi32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool DuplicateTokenEx(
+            IntPtr hExistingToken,
+            uint dwDesiredAccess,
+            IntPtr lpTokenAttributes,
+            int ImpersonationLevel,
+            int TokenType,
+            out IntPtr phNewToken);
+
+        [DllImport("advapi32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool GetTokenInformation(
+            IntPtr TokenHandle,
+            int TokenInformationClass,
+            IntPtr TokenInformation,
+            uint TokenInformationLength,
+            out uint ReturnLength);
+
+        [DllImport("advapi32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool SetTokenInformation(
+            IntPtr TokenHandle,
+            int TokenInformationClass,
+            IntPtr TokenInformation,
+            uint TokenInformationLength);
+
+        [DllImport("advapi32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool SetThreadToken(IntPtr Thread, IntPtr Token);
+
+        [DllImport("advapi32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool RevertToSelf();
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        private static extern IntPtr OpenProcess(uint dwDesiredAccess, bool bInheritHandle, uint dwProcessId);
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        private static extern IntPtr CreateToolhelp32Snapshot(uint dwFlags, uint th32ProcessID);
+
+        [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool Process32FirstW(IntPtr hSnapshot, ref PROCESSENTRY32W lppe);
+
+        [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool Process32NextW(IntPtr hSnapshot, ref PROCESSENTRY32W lppe);
+
+        [DllImport("advapi32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool LookupPrivilegeValueW(string lpSystemName, string lpName, out LUID lpLuid);
+
+        [DllImport("advapi32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool AdjustTokenPrivileges(
+            IntPtr TokenHandle,
+            [MarshalAs(UnmanagedType.Bool)] bool DisableAllPrivileges,
+            ref TOKEN_PRIVILEGES NewState,
+            uint BufferLength,
+            IntPtr PreviousState,
+            IntPtr ReturnLength);
+
+        [DllImport("advapi32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool CreateProcessWithTokenW(
+            IntPtr hToken,
+            uint dwLogonFlags,
+            string lpApplicationName,
+            StringBuilder lpCommandLine,
+            uint dwCreationFlags,
+            IntPtr lpEnvironment,
+            string lpCurrentDirectory,
+            ref STARTUPINFOW lpStartupInfo,
+            out PROCESS_INFORMATION lpProcessInformation);
+
+        [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        private static extern void GetStartupInfoW(ref STARTUPINFOW lpStartupInfo);
+
+        #endregion
+
+        #region Public API
+
+        /// <summary>
+        /// 检查当前进程是否已具有 UIAccess 标志。
+        /// </summary>
+        public static bool HasUIAccess()
+        {
+            if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, out IntPtr hToken))
+                return false;
+
+            try
+            {
+                IntPtr buf = Marshal.AllocHGlobal(sizeof(uint));
+                try
+                {
+                    Marshal.WriteInt32(buf, 0);
+                    if (!GetTokenInformation(hToken, TokenUIAccess, buf, sizeof(uint), out _))
+                        return false;
+                    return Marshal.ReadInt32(buf) != 0;
+                }
+                finally
+                {
+                    Marshal.FreeHGlobal(buf);
+                }
+            }
+            finally
+            {
+                CloseHandle(hToken);
+            }
+        }
+
+        /// <summary>
+        /// 以 UIAccess 令牌重启自身。当前进程必须已经以管理员身份运行。
+        /// 成功时新进程已启动，调用方应立即退出当前进程。
+        /// </summary>
+        /// <param name="extraArgs">追加到新进程的额外命令行参数（例如 --skip-mutex-check）。</param>
+        public static bool RestartWithUIAccess(string extraArgs = null)
+        {
+            try
+            {
+                if (HasUIAccess())
+                {
+                    LogHelper.WriteLogToFile("UIAccess | 当前进程已具有 UIAccess，跳过重启");
+                    return true;
+                }
+
+                if (!CreateUIAccessToken(out IntPtr uiaToken))
+                {
+                    LogHelper.WriteLogToFile($"UIAccess | 创建 UIAccess 令牌失败 (LastError={Marshal.GetLastWin32Error()})", LogHelper.LogType.Error);
+                    return false;
+                }
+
+                try
+                {
+                    return LaunchWithToken(uiaToken, extraArgs);
+                }
+                finally
+                {
+                    CloseHandle(uiaToken);
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"UIAccess | RestartWithUIAccess 异常: {ex}", LogHelper.LogType.Error);
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// 以普通用户权限（非提升）重启自身。
+        /// 通过获取 explorer.exe / ctfmon.exe 的非特权令牌，再用 CreateProcessWithTokenW 启动新进程，
+        /// 避免经由 explorer.exe 中转可能产生的 UAC 提示或丢失参数问题。
+        /// 成功时调用方应立即退出当前进程。
+        /// </summary>
+        /// <param name="extraArgs">追加到新进程的额外命令行参数。</param>
+        public static bool RestartAsNormalUser(string extraArgs = null)
+        {
+            try
+            {
+                if (!GetUserPrimaryToken(out IntPtr userToken))
+                {
+                    LogHelper.WriteLogToFile($"UIAccess | 获取用户令牌失败 (LastError={Marshal.GetLastWin32Error()})", LogHelper.LogType.Error);
+                    return false;
+                }
+
+                try
+                {
+                    return LaunchWithToken(userToken, extraArgs);
+                }
+                finally
+                {
+                    CloseHandle(userToken);
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"UIAccess | RestartAsNormalUser 异常: {ex}", LogHelper.LogType.Error);
+                return false;
+            }
+        }
+
+        #endregion
+
+        #region Token Manipulation
+
+        private static bool CreateUIAccessToken(out IntPtr uiaToken)
+        {
+            uiaToken = IntPtr.Zero;
+
+            // 1. 获取当前进程的 session id
+            if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, out IntPtr hSelfQuery))
+            {
+                LogHelper.WriteLogToFile($"UIAccess | OpenProcessToken(query) 失败: {Marshal.GetLastWin32Error()}", LogHelper.LogType.Error);
+                return false;
+            }
+
+            uint sessionId;
+            try
+            {
+                IntPtr sesBuf = Marshal.AllocHGlobal(sizeof(uint));
+                try
+                {
+                    if (!GetTokenInformation(hSelfQuery, TokenSessionId, sesBuf, sizeof(uint), out _))
+                    {
+                        LogHelper.WriteLogToFile($"UIAccess | GetTokenInformation(SessionId) 失败: {Marshal.GetLastWin32Error()}", LogHelper.LogType.Error);
+                        return false;
+                    }
+                    sessionId = (uint)Marshal.ReadInt32(sesBuf);
+                }
+                finally { Marshal.FreeHGlobal(sesBuf); }
+            }
+            finally { CloseHandle(hSelfQuery); }
+
+            // 2. 找到同一会话的 winlogon 模拟令牌
+            if (!GetWinlogonImpersonationToken(sessionId, out IntPtr winlogonToken))
+            {
+                LogHelper.WriteLogToFile("UIAccess | 未能获取 winlogon 模拟令牌（需要管理员权限）", LogHelper.LogType.Error);
+                return false;
+            }
+
+            try
+            {
+                // 3. 模拟 winlogon
+                if (!SetThreadToken(IntPtr.Zero, winlogonToken))
+                {
+                    LogHelper.WriteLogToFile($"UIAccess | SetThreadToken(winlogon) 失败: {Marshal.GetLastWin32Error()}", LogHelper.LogType.Error);
+                    return false;
+                }
+
+                try
+                {
+                    // 4. 复制自身令牌为主令牌
+                    if (!OpenProcessToken(GetCurrentProcess(), TOKEN_DUPLICATE, out IntPtr hSelfDup))
+                    {
+                        LogHelper.WriteLogToFile($"UIAccess | OpenProcessToken(dup) 失败: {Marshal.GetLastWin32Error()}", LogHelper.LogType.Error);
+                        return false;
+                    }
+
+                    IntPtr dupToken;
+                    try
+                    {
+                        bool ok = DuplicateTokenEx(
+                            hSelfDup,
+                            TOKEN_ASSIGN_PRIMARY | TOKEN_DUPLICATE | TOKEN_QUERY | TOKEN_ADJUST_DEFAULT | TOKEN_ADJUST_SESSIONID,
+                            IntPtr.Zero,
+                            SecurityAnonymous,
+                            TokenPrimary,
+                            out dupToken);
+
+                        if (!ok)
+                        {
+                            LogHelper.WriteLogToFile($"UIAccess | DuplicateTokenEx 失败: {Marshal.GetLastWin32Error()}", LogHelper.LogType.Error);
+                            return false;
+                        }
+                    }
+                    finally { CloseHandle(hSelfDup); }
+
+                    // 5. 在副本上设置 UIAccess = TRUE
+                    IntPtr uiBuf = Marshal.AllocHGlobal(sizeof(uint));
+                    try
+                    {
+                        Marshal.WriteInt32(uiBuf, 1);
+                        if (!SetTokenInformation(dupToken, TokenUIAccess, uiBuf, sizeof(uint)))
+                        {
+                            int err = Marshal.GetLastWin32Error();
+                            LogHelper.WriteLogToFile($"UIAccess | SetTokenInformation(UIAccess) 失败: {err}", LogHelper.LogType.Error);
+                            CloseHandle(dupToken);
+                            return false;
+                        }
+                    }
+                    finally { Marshal.FreeHGlobal(uiBuf); }
+
+                    uiaToken = dupToken;
+                    return true;
+                }
+                finally
+                {
+                    RevertToSelf();
+                }
+            }
+            finally
+            {
+                CloseHandle(winlogonToken);
+            }
+        }
+
+        private static bool GetWinlogonImpersonationToken(uint sessionId, out IntPtr winlogonToken)
+        {
+            winlogonToken = IntPtr.Zero;
+
+            IntPtr snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+            if (snapshot == INVALID_HANDLE_VALUE || snapshot == IntPtr.Zero)
+            {
+                LogHelper.WriteLogToFile($"UIAccess | CreateToolhelp32Snapshot 失败: {Marshal.GetLastWin32Error()}", LogHelper.LogType.Error);
+                return false;
+            }
+
+            try
+            {
+                var pe = new PROCESSENTRY32W { dwSize = (uint)Marshal.SizeOf(typeof(PROCESSENTRY32W)) };
+                bool more = Process32FirstW(snapshot, ref pe);
+
+                while (more)
+                {
+                    if (string.Equals(pe.szExeFile, "winlogon.exe", StringComparison.OrdinalIgnoreCase))
+                    {
+                        if (TryDuplicateWinlogonToken(pe.th32ProcessID, sessionId, out winlogonToken))
+                            return true;
+                    }
+                    more = Process32NextW(snapshot, ref pe);
+                }
+            }
+            finally { CloseHandle(snapshot); }
+
+            return false;
+        }
+
+        private static bool TryDuplicateWinlogonToken(uint pid, uint sessionId, out IntPtr dupToken)
+        {
+            dupToken = IntPtr.Zero;
+
+            IntPtr hProc = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, false, pid);
+            if (hProc == IntPtr.Zero) return false;
+
+            try
+            {
+                if (!OpenProcessToken(hProc, TOKEN_QUERY | TOKEN_DUPLICATE, out IntPtr hToken))
+                    return false;
+
+                try
+                {
+                    // 检查 session id 匹配
+                    IntPtr sesBuf = Marshal.AllocHGlobal(sizeof(uint));
+                    try
+                    {
+                        if (!GetTokenInformation(hToken, TokenSessionId, sesBuf, sizeof(uint), out _))
+                            return false;
+                        if ((uint)Marshal.ReadInt32(sesBuf) != sessionId)
+                            return false;
+                    }
+                    finally { Marshal.FreeHGlobal(sesBuf); }
+
+                    if (!DuplicateTokenEx(
+                        hToken,
+                        TOKEN_IMPERSONATE | TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY | TOKEN_DUPLICATE,
+                        IntPtr.Zero,
+                        SecurityImpersonation,
+                        TokenImpersonation,
+                        out dupToken))
+                    {
+                        return false;
+                    }
+
+                    // 启用 SeAssignPrimaryTokenPrivilege（Inkeys 行为）
+                    var tkp = new TOKEN_PRIVILEGES
+                    {
+                        PrivilegeCount = 1,
+                        Privilege = new LUID_AND_ATTRIBUTES { Attributes = SE_PRIVILEGE_ENABLED }
+                    };
+                    if (LookupPrivilegeValueW(null, SE_ASSIGNPRIMARYTOKEN_NAME, out tkp.Privilege.Luid))
+                    {
+                        AdjustTokenPrivileges(dupToken, false, ref tkp, (uint)Marshal.SizeOf(tkp), IntPtr.Zero, IntPtr.Zero);
+                    }
+
+                    return true;
+                }
+                finally { CloseHandle(hToken); }
+            }
+            finally { CloseHandle(hProc); }
+        }
+
+        /// <summary>
+        /// 从 explorer.exe / ctfmon.exe 取得普通用户（非提升）令牌的主令牌副本，用于降权启动。
+        /// 仅当当前进程为管理员时才能成功。
+        /// </summary>
+        private static bool GetUserPrimaryToken(out IntPtr userToken)
+        {
+            userToken = IntPtr.Zero;
+
+            string[] candidates = { "explorer.exe", "ctfmon.exe" };
+            foreach (var name in candidates)
+            {
+                IntPtr snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+                if (snapshot == INVALID_HANDLE_VALUE || snapshot == IntPtr.Zero) continue;
+
+                try
+                {
+                    var pe = new PROCESSENTRY32W { dwSize = (uint)Marshal.SizeOf(typeof(PROCESSENTRY32W)) };
+                    bool more = Process32FirstW(snapshot, ref pe);
+                    while (more)
+                    {
+                        if (string.Equals(pe.szExeFile, name, StringComparison.OrdinalIgnoreCase))
+                        {
+                            if (TryDuplicateUserPrimaryToken(pe.th32ProcessID, out userToken))
+                            {
+                                LogHelper.WriteLogToFile($"UIAccess | 已从 {name} (PID={pe.th32ProcessID}) 取得用户令牌");
+                                return true;
+                            }
+                        }
+                        more = Process32NextW(snapshot, ref pe);
+                    }
+                }
+                finally { CloseHandle(snapshot); }
+            }
+
+            return false;
+        }
+
+        private static bool TryDuplicateUserPrimaryToken(uint pid, out IntPtr dupToken)
+        {
+            dupToken = IntPtr.Zero;
+
+            IntPtr hProc = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, false, pid);
+            if (hProc == IntPtr.Zero) return false;
+
+            try
+            {
+                if (!OpenProcessToken(hProc, TOKEN_QUERY | TOKEN_DUPLICATE, out IntPtr hToken))
+                    return false;
+
+                try
+                {
+                    // 仅接受非提升令牌（否则降权失败）
+                    IntPtr elevBuf = Marshal.AllocHGlobal(sizeof(int));
+                    try
+                    {
+                        if (!GetTokenInformation(hToken, TokenElevationType, elevBuf, sizeof(int), out _))
+                            return false;
+                        int elev = Marshal.ReadInt32(elevBuf);
+                        if (elev == TokenElevationTypeFull)
+                            return false; // 该进程是提升令牌，跳过
+                    }
+                    finally { Marshal.FreeHGlobal(elevBuf); }
+
+                    return DuplicateTokenEx(
+                        hToken,
+                        TOKEN_ASSIGN_PRIMARY | TOKEN_DUPLICATE | TOKEN_QUERY | TOKEN_ADJUST_DEFAULT | TOKEN_ADJUST_SESSIONID,
+                        IntPtr.Zero,
+                        SecurityAnonymous,
+                        TokenPrimary,
+                        out dupToken);
+                }
+                finally { CloseHandle(hToken); }
+            }
+            finally { CloseHandle(hProc); }
+        }
+
+        #endregion
+
+        #region Process Launch
+
+        private static bool LaunchWithToken(IntPtr token, string extraArgs)
+        {
+            string exePath = Process.GetCurrentProcess().MainModule.FileName;
+            string workDir = System.IO.Path.GetDirectoryName(exePath);
+
+            // 重建命令行：保留原始参数，追加 --skip-mutex-check 防止单实例阻塞
+            var cmdBuilder = new StringBuilder(32768);
+            cmdBuilder.Append('"').Append(exePath).Append('"');
+
+            string[] args = Environment.GetCommandLineArgs();
+            for (int i = 1; i < args.Length; i++)
+            {
+                cmdBuilder.Append(' ');
+                AppendQuoted(cmdBuilder, args[i]);
+            }
+
+            if (!string.IsNullOrEmpty(extraArgs))
+                cmdBuilder.Append(' ').Append(extraArgs);
+
+            // 防止单实例 Mutex 阻塞新进程
+            if (Array.IndexOf(args, "--skip-mutex-check") < 0
+                && (extraArgs == null || extraArgs.IndexOf("--skip-mutex-check", StringComparison.Ordinal) < 0))
+            {
+                cmdBuilder.Append(" --skip-mutex-check");
+            }
+
+            var si = new STARTUPINFOW { cb = (uint)Marshal.SizeOf(typeof(STARTUPINFOW)) };
+            GetStartupInfoW(ref si);
+
+            bool ok = CreateProcessWithTokenW(
+                token,
+                LOGON_WITH_PROFILE,
+                null,
+                cmdBuilder,
+                CREATE_UNICODE_ENVIRONMENT,
+                IntPtr.Zero,
+                workDir,
+                ref si,
+                out PROCESS_INFORMATION pi);
+
+            if (!ok)
+            {
+                int err = Marshal.GetLastWin32Error();
+                LogHelper.WriteLogToFile($"UIAccess | CreateProcessWithTokenW 失败: {err}", LogHelper.LogType.Error);
+                return false;
+            }
+
+            CloseHandle(pi.hProcess);
+            CloseHandle(pi.hThread);
+            LogHelper.WriteLogToFile($"UIAccess | 已使用 UIAccess 令牌启动新进程 (PID={pi.dwProcessId})");
+            return true;
+        }
+
+        private static void AppendQuoted(StringBuilder sb, string arg)
+        {
+            if (arg == null) { sb.Append("\"\""); return; }
+
+            bool needQuote = arg.Length == 0 || arg.IndexOfAny(new[] { ' ', '\t', '"' }) >= 0;
+            if (!needQuote) { sb.Append(arg); return; }
+
+            sb.Append('"');
+            int backslashes = 0;
+            foreach (char c in arg)
+            {
+                if (c == '\\') { backslashes++; continue; }
+                if (c == '"')
+                {
+                    sb.Append('\\', backslashes * 2 + 1);
+                    sb.Append('"');
+                }
+                else
+                {
+                    sb.Append('\\', backslashes);
+                    sb.Append(c);
+                }
+                backslashes = 0;
+            }
+            sb.Append('\\', backslashes * 2);
+            sb.Append('"');
+        }
+
+        #endregion
+    }
+}

Ink Canvas/Helpers/WinRtHandwritingRecognizer.cs

@@ -3,7 +3,6 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Runtime.InteropServices.WindowsRuntime;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Ink;
@@ -19,6 +18,9 @@ namespace Ink_Canvas.Helpers
     /// </summary>
     internal static class WinRtHandwritingRecognizer
     {
+        private static WinRtInk.InkRecognizer _preferredHandwritingRecognizer;
+        private static bool _preferredHandwritingRecognizerResolved;
+
         private static void LogHandwriting(string message, LogHelper.LogType logType = LogHelper.LogType.Info)
         {
             LogHelper.WriteLogToFile("[手写体] " + message, logType);
@@ -27,29 +29,13 @@ namespace Ink_Canvas.Helpers
         public static bool IsApiAvailable =>
             OSVersion.GetOperatingSystem() >= OSVersionExtension.OperatingSystem.Windows10;
 
+        /// <summary>
+        /// 启动阶段不再预热线程内 WinRT 手写管线。历史上曾用 <see cref="WinRtInkShapeRecognizer.CreateMinimalWarmupStrokeCollection"/> 跑全链路，
+        /// 会显著拖慢启动；与更早的「空 <see cref="StrokeCollection"/>」一样，此处不再在 Idle 上做任何工作。
+        /// 首次真正需要手写识别时由 <see cref="RecognizeHandwritingAsync"/> 承担冷启动成本。
+        /// </summary>
         public static void Warmup()
         {
-            if (!IsApiAvailable || !Environment.Is64BitProcess) return;
-            try
-            {
-                var d = Application.Current?.Dispatcher;
-                if (d == null) return;
-                d.BeginInvoke(new Action(async () =>
-                {
-                    try
-                    {
-                        await RecognizeHandwritingAsync(new StrokeCollection()).ConfigureAwait(true);
-                    }
-                    catch
-                    {
-                        // ignore
-                    }
-                }));
-            }
-            catch
-            {
-                // ignore
-            }
         }
 
         /// <summary>
@@ -57,15 +43,21 @@ namespace Ink_Canvas.Helpers
         /// 再对每一分词用 <see cref="WinRtInk.InkRecognizerContainer"/> 取 <c>GetTextCandidates</c>（与当前 SDK 中部分版本的
         /// <see cref="WinRtInk.InkRecognitionResult"/> 未暴露笔画映射的局限兼容）。
         /// </summary>
-        public static async Task<HandwritingRecognitionResult> RecognizeHandwritingAsync(StrokeCollection strokes)
+        /// <param name="verboseTrace">为 false 时跳过详细识别日志（用于 <see cref="Warmup"/> 等）。</param>
+        public static async Task<HandwritingRecognitionResult> RecognizeHandwritingAsync(
+            StrokeCollection strokes,
+            bool verboseTrace = true)
         {
             if (!IsApiAvailable || strokes == null || strokes.Count == 0)
                 return HandwritingRecognitionResult.Empty;
 
-            var traceRecognition = strokes.Count > 0;
+            var traceRecognition = verboseTrace;
 
             try
             {
+                var recognizer = new WinRtInk.InkRecognizerContainer();
+                TryApplyPreferredHandwritingRecognizer(recognizer, traceRecognition);
+
                 var analyzer = new WinAnalysis.InkAnalyzer();
                 var idToWpf = new Dictionary<uint, Stroke>();
 
@@ -92,19 +84,21 @@ namespace Ink_Canvas.Helpers
                         LogHandwriting(
                             "识别：AnalyzeAsync 未得到 Updated，Status=" +
                             (analysisResult == null ? "null" : analysisResult.Status.ToString()) +
-                            "，有效笔画数=" + idToWpf.Count);
-                    return HandwritingRecognitionResult.Empty;
+                            "，有效笔画数=" + idToWpf.Count +
+                            "，尝试整批 RecognizeAsync 回退。");
+                    return await RecognizeHandwritingWholeInkAsync(strokes, traceRecognition).ConfigureAwait(true);
                 }
 
                 var wordNodes = analyzer.AnalysisRoot?.FindNodes(WinAnalysis.InkAnalysisNodeKind.InkWord);
                 if (wordNodes == null || wordNodes.Count == 0)
                 {
                     if (traceRecognition)
-                        LogHandwriting("识别：未找到 InkWord 节点（可能被判为绘图或非书写），有效笔画数=" + idToWpf.Count);
-                    return HandwritingRecognitionResult.Empty;
+                        LogHandwriting(
+                            "识别：未找到 InkWord 节点（墨迹分析常将非横平笔划判为绘图），有效笔画数=" + idToWpf.Count +
+                            "，改用整批 RecognizeAsync 回退。");
+                    return await RecognizeHandwritingWholeInkAsync(strokes, traceRecognition).ConfigureAwait(true);
                 }
 
-                var recognizer = new WinRtInk.InkRecognizerContainer();
                 var segments = new List<HandwritingWordSegment>();
 
                 foreach (var node in wordNodes)
@@ -232,6 +226,243 @@ namespace Ink_Canvas.Helpers
             }
         }
 
+        private static void TryApplyPreferredHandwritingRecognizer(
+            WinRtInk.InkRecognizerContainer container,
+            bool logDetail)
+        {
+            if (container == null)
+                return;
+            try
+            {
+                if (!_preferredHandwritingRecognizerResolved)
+                {
+                    _preferredHandwritingRecognizerResolved = true;
+                    var all = container.GetRecognizers();
+                    _preferredHandwritingRecognizer = SelectBestInkRecognizer(all);
+                    if (logDetail)
+                    {
+                        if (_preferredHandwritingRecognizer != null)
+                            LogHandwriting("识别器：已选用 \"" + _preferredHandwritingRecognizer.Name + "\"。");
+                        else if (all != null && all.Count > 0)
+                            LogHandwriting("识别器：未匹配到与 UI/区域语言对应的引擎，使用系统默认（共 " + all.Count + " 个）。");
+                    }
+                }
+
+                if (_preferredHandwritingRecognizer != null)
+                    container.SetDefaultRecognizer(_preferredHandwritingRecognizer);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile("[手写体] 设置默认手写识别器失败: " + ex.Message, LogHelper.LogType.Warning);
+            }
+        }
+
+        private static WinRtInk.InkRecognizer SelectBestInkRecognizer(
+            IReadOnlyList<WinRtInk.InkRecognizer> list)
+        {
+            if (list == null || list.Count == 0)
+                return null;
+
+            var culture = PrimaryHandwritingCulture();
+            var lang = (culture?.TwoLetterISOLanguageName ?? string.Empty).ToLowerInvariant();
+            var name = culture?.Name ?? string.Empty;
+
+            bool wantZhHans = lang == "zh" &&
+                              (name.IndexOf("hans", StringComparison.OrdinalIgnoreCase) >= 0 ||
+                               name.Equals("zh-cn", StringComparison.OrdinalIgnoreCase) ||
+                               name.Equals("zh-sg", StringComparison.OrdinalIgnoreCase) ||
+                               (name.IndexOf("hant", StringComparison.OrdinalIgnoreCase) < 0 &&
+                                !name.Equals("zh-tw", StringComparison.OrdinalIgnoreCase) &&
+                                !name.Equals("zh-hk", StringComparison.OrdinalIgnoreCase) &&
+                                !name.Equals("zh-mo", StringComparison.OrdinalIgnoreCase)));
+
+            bool wantZhHant = lang == "zh" &&
+                              (name.IndexOf("hant", StringComparison.OrdinalIgnoreCase) >= 0 ||
+                               name.Equals("zh-tw", StringComparison.OrdinalIgnoreCase) ||
+                               name.Equals("zh-hk", StringComparison.OrdinalIgnoreCase) ||
+                               name.Equals("zh-mo", StringComparison.OrdinalIgnoreCase));
+
+            WinRtInk.InkRecognizer Pick(Func<string, bool> match)
+            {
+                foreach (var r in list)
+                {
+                    var n = r?.Name;
+                    if (string.IsNullOrEmpty(n))
+                        continue;
+                    if (match(n))
+                        return r;
+                }
+
+                return null;
+            }
+
+            if (wantZhHans)
+            {
+                var r = Pick(n =>
+                    n.IndexOf("简体", StringComparison.OrdinalIgnoreCase) >= 0 ||
+                    n.IndexOf("簡體", StringComparison.OrdinalIgnoreCase) >= 0 ||
+                    (n.IndexOf("中文", StringComparison.OrdinalIgnoreCase) >= 0 &&
+                     (n.IndexOf("简体", StringComparison.OrdinalIgnoreCase) >= 0 ||
+                      n.IndexOf("簡體", StringComparison.OrdinalIgnoreCase) >= 0)) ||
+                    (n.IndexOf("Chinese", StringComparison.OrdinalIgnoreCase) >= 0 &&
+                     (n.IndexOf("Simplified", StringComparison.OrdinalIgnoreCase) >= 0 ||
+                      n.IndexOf("Hans", StringComparison.OrdinalIgnoreCase) >= 0 ||
+                      n.IndexOf("PRC", StringComparison.OrdinalIgnoreCase) >= 0)));
+                if (r != null)
+                    return r;
+                r = Pick(n =>
+                    n.IndexOf("中文", StringComparison.OrdinalIgnoreCase) >= 0 ||
+                    n.IndexOf("Chinese", StringComparison.OrdinalIgnoreCase) >= 0);
+                if (r != null)
+                    return r;
+            }
+            else if (wantZhHant)
+            {
+                var r = Pick(n =>
+                    n.IndexOf("繁体", StringComparison.OrdinalIgnoreCase) >= 0 ||
+                    n.IndexOf("繁體", StringComparison.OrdinalIgnoreCase) >= 0 ||
+                    (n.IndexOf("中文", StringComparison.OrdinalIgnoreCase) >= 0 &&
+                     (n.IndexOf("繁体", StringComparison.OrdinalIgnoreCase) >= 0 ||
+                      n.IndexOf("繁體", StringComparison.OrdinalIgnoreCase) >= 0)) ||
+                    (n.IndexOf("Chinese", StringComparison.OrdinalIgnoreCase) >= 0 &&
+                     (n.IndexOf("Traditional", StringComparison.OrdinalIgnoreCase) >= 0 ||
+                      n.IndexOf("Hant", StringComparison.OrdinalIgnoreCase) >= 0 ||
+                      n.IndexOf("Taiwan", StringComparison.OrdinalIgnoreCase) >= 0 ||
+                      n.IndexOf("Hong Kong", StringComparison.OrdinalIgnoreCase) >= 0)));
+                if (r != null)
+                    return r;
+                r = Pick(n =>
+                    n.IndexOf("中文", StringComparison.OrdinalIgnoreCase) >= 0 ||
+                    n.IndexOf("Chinese", StringComparison.OrdinalIgnoreCase) >= 0);
+                if (r != null)
+                    return r;
+            }
+            else if (lang == "ja")
+            {
+                var r = Pick(n =>
+                    n.IndexOf("Japanese", StringComparison.OrdinalIgnoreCase) >= 0 ||
+                    n.IndexOf("日本語", StringComparison.OrdinalIgnoreCase) >= 0 ||
+                    n.IndexOf("日语", StringComparison.OrdinalIgnoreCase) >= 0);
+                if (r != null)
+                    return r;
+            }
+            else if (lang == "en")
+            {
+                var r = Pick(n => n.IndexOf("English", StringComparison.OrdinalIgnoreCase) >= 0);
+                if (r != null)
+                    return r;
+            }
+
+            if (lang == "zh")
+            {
+                var r = Pick(n =>
+                    n.IndexOf("中文", StringComparison.OrdinalIgnoreCase) >= 0 ||
+                    n.IndexOf("Chinese", StringComparison.OrdinalIgnoreCase) >= 0);
+                if (r != null)
+                    return r;
+            }
+
+            return null;
+        }
+
+        private static CultureInfo PrimaryHandwritingCulture()
+        {
+            var ui = CultureInfo.CurrentUICulture;
+            var ct = CultureInfo.CurrentCulture;
+            if (string.Equals(ui.TwoLetterISOLanguageName, "zh", StringComparison.OrdinalIgnoreCase))
+                return ui;
+            if (string.Equals(ct.TwoLetterISOLanguageName, "zh", StringComparison.OrdinalIgnoreCase))
+                return ct;
+            return ui;
+        }
+
+        private static async Task<HandwritingRecognitionResult> RecognizeHandwritingWholeInkAsync(
+            StrokeCollection strokes,
+            bool traceRecognition)
+        {
+            if (strokes == null || strokes.Count == 0)
+                return HandwritingRecognitionResult.Empty;
+
+            var container = new WinRtInk.InkStrokeContainer();
+            foreach (Stroke s in strokes)
+            {
+                var ink = WinRtInkShapeRecognizer.CreateInkStrokeFromWpf(s);
+                if (ink != null)
+                    container.AddStroke(ink);
+            }
+
+            var winStrokes = container.GetStrokes();
+            if (winStrokes == null || winStrokes.Count == 0)
+            {
+                if (traceRecognition)
+                    LogHandwriting("整批回退：无有效 WinRT 笔画。");
+                return HandwritingRecognitionResult.Empty;
+            }
+
+            var reco = new WinRtInk.InkRecognizerContainer();
+            TryApplyPreferredHandwritingRecognizer(reco, false);
+
+            IReadOnlyList<WinRtInk.InkRecognitionResult> rr;
+            try
+            {
+                rr = await reco
+                    .RecognizeAsync(container, WinRtInk.InkRecognitionTarget.All)
+                    .AsTask()
+                    .ConfigureAwait(true);
+            }
+            catch (Exception ex)
+            {
+                if (traceRecognition)
+                    LogHandwriting("整批回退：RecognizeAsync 异常：" + ex.Message);
+                return HandwritingRecognitionResult.Empty;
+            }
+
+            if (rr == null || rr.Count == 0 || rr[0] == null)
+            {
+                if (traceRecognition)
+                    LogHandwriting("整批回退：RecognizeAsync 无结果。");
+                return HandwritingRecognitionResult.Empty;
+            }
+
+            var cands = rr[0].GetTextCandidates();
+            var primary = (cands != null && cands.Count > 0) ? cands[0] : string.Empty;
+            if (string.IsNullOrWhiteSpace(primary))
+            {
+                if (traceRecognition)
+                    LogHandwriting("整批回退：候选文本为空。");
+                return HandwritingRecognitionResult.Empty;
+            }
+
+            var merged = new List<string>();
+            if (cands != null)
+            {
+                foreach (var c in cands)
+                {
+                    if (!string.IsNullOrEmpty(c) && !merged.Contains(c))
+                        merged.Add(c);
+                }
+            }
+
+            var bounds = UnionStrokeBounds(strokes);
+            var group = new List<Stroke>();
+            foreach (Stroke s in strokes)
+                group.Add(s);
+
+            var seg = new HandwritingWordSegment(primary, merged, bounds, group);
+            return new HandwritingRecognitionResult(new List<HandwritingWordSegment> { seg });
+        }
+
+        private static Rect UnionStrokeBounds(StrokeCollection strokes)
+        {
+            if (strokes == null || strokes.Count == 0)
+                return Rect.Empty;
+
+            var r = strokes[0].GetBounds();
+            for (var i = 1; i < strokes.Count; i++)
+                r = Rect.Union(r, strokes[i].GetBounds());
+            return r;
+        }
+
         private const string DefaultHandwritingFontFamilyList = "Ink Free,KaiTi,Segoe Script";
 
         /// <summary>

Ink Canvas/Helpers/WinRtInkShapeRecognizer.cs

@@ -1,6 +1,7 @@
 using OSVersionExtension;
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Ink;
@@ -11,6 +12,128 @@ using WinRtInkAnalyzer = global::Windows.UI.Input.Inking.Analysis.InkAnalyzer;
 
 namespace Ink_Canvas.Helpers
 {
+    internal class ModernInkAnalyzer : IDisposable
+    {
+        public static readonly Guid ShapeStrokePropertyGuid = new Guid("11111111-2222-3333-4444-555555555555");
+
+        private global::Windows.UI.Input.Inking.Analysis.InkAnalyzer _internalAnalyzer;
+        private readonly Dictionary<Stroke, uint> _strokeIdMap = new Dictionary<Stroke, uint>();
+        private readonly Dictionary<uint, Stroke> _reverseIdMap = new Dictionary<uint, Stroke>();
+        private readonly object _syncLock = new object();
+
+        public ModernInkAnalyzer()
+        {
+            if (!WinRtInkShapeRecognizer.IsApiAvailable)
+                return;
+
+            _internalAnalyzer = new global::Windows.UI.Input.Inking.Analysis.InkAnalyzer();
+        }
+
+        private void AddStrokeInternal(Stroke stroke)
+        {
+            if (stroke.ContainsPropertyData(ShapeStrokePropertyGuid))
+                return;
+
+            var inkStroke = WinRtInkShapeRecognizer.CreateInkStrokeFromWpf(stroke);
+            if (inkStroke == null) return;
+
+            _internalAnalyzer.AddDataForStroke(inkStroke);
+            _internalAnalyzer.SetStrokeDataKind(
+                inkStroke.Id,
+                global::Windows.UI.Input.Inking.Analysis.InkAnalysisStrokeKind.Drawing);
+
+            _strokeIdMap[stroke] = inkStroke.Id;
+            _reverseIdMap[inkStroke.Id] = stroke;
+        }
+
+        private CancellationTokenSource _cts;
+
+        public async Task<InkShapeRecognitionResult> AnalyzeAsync(StrokeCollection strokes)
+        {
+            if (_internalAnalyzer == null || strokes == null || strokes.Count == 0)
+                return InkShapeRecognitionResult.Empty;
+
+            _cts?.Cancel();
+            _cts = new CancellationTokenSource();
+            var token = _cts.Token;
+
+            try
+            {
+                lock (_syncLock)
+                {
+                    _internalAnalyzer.ClearDataForAllStrokes();
+                    _strokeIdMap.Clear();
+                    _reverseIdMap.Clear();
+
+                    foreach (var stroke in strokes)
+                    {
+                        AddStrokeInternal(stroke);
+                    }
+                }
+
+                if (_strokeIdMap.Count == 0)
+                    return InkShapeRecognitionResult.Empty;
+
+                var result = await _internalAnalyzer.AnalyzeAsync().AsTask(token).ConfigureAwait(true);
+
+                if (token.IsCancellationRequested) return InkShapeRecognitionResult.Empty;
+
+                // Use the internal method from WinRtInkShapeRecognizer to find the primary drawing
+                var drawing = WinRtInkShapeRecognizer.FindPrimaryDrawing(_internalAnalyzer);
+                if (drawing == null)
+                    return InkShapeRecognitionResult.Empty;
+
+                if (drawing.DrawingKind == global::Windows.UI.Input.Inking.Analysis.InkAnalysisDrawingKind.Drawing)
+                    return InkShapeRecognitionResult.Empty;
+
+                var name = WinRtInkShapeRecognizer.MapDrawingKindToShapeName(drawing.DrawingKind);
+                if (string.IsNullOrEmpty(name) || name == "Drawing")
+                    return InkShapeRecognitionResult.Empty;
+
+                var winPts = WinRtInkShapeRecognizer.CopyWinRtPoints(drawing);
+                var hot = WinRtInkShapeRecognizer.ToWpfPointCollection(winPts);
+                var c = drawing.Center;
+                var centroid = new SysPoint(c.X, c.Y);
+                WinRtInkShapeRecognizer.BoundsFromPoints(winPts, out double w, out double h);
+
+                var toRemove = new StrokeCollection();
+                lock (_syncLock)
+                {
+                    foreach (var id in drawing.GetStrokeIds())
+                    {
+                        if (_reverseIdMap.TryGetValue(id, out var stroke))
+                        {
+                            toRemove.Add(stroke);
+                        }
+                    }
+                }
+
+                if (toRemove.Count == 0)
+                    return InkShapeRecognitionResult.Empty;
+
+                return new InkShapeRecognitionResult(name, centroid, hot, w, h, toRemove);
+            }
+            catch (Exception)
+            {
+                return InkShapeRecognitionResult.Empty;
+            }
+        }
+
+        public Task<StrokeCollection> AnalyzeAndCorrectAsync(
+            StrokeCollection strokes,
+            string handwritingFontFamilyList)
+        {
+            return WinRtHandwritingRecognizer.ConvertRecognizedTextToHandwritingInkAsync(
+                strokes,
+                handwritingFontFamilyList);
+        }
+
+        public void Dispose()
+        {
+            _internalAnalyzer = null;
+        }
+    }
+
     /// <summary>基于 Windows.UI.Input.Inking.Analysis 的形状识别（适用于 64 位进程等场景）。</summary>
     internal static class WinRtInkShapeRecognizer
     {
@@ -28,7 +151,8 @@ namespace Ink_Canvas.Helpers
                 {
                     try
                     {
-                        await RecognizeShapeAsync(new StrokeCollection());
+                        // 空 StrokeCollection 在 RecognizeShapeAsync 入口会直接返回，无法预热 WinRT InkAnalyzer。
+                        await RecognizeShapeAsync(CreateMinimalWarmupStrokeCollection()).ConfigureAwait(true);
                     }
                     catch
                     {
@@ -99,6 +223,23 @@ namespace Ink_Canvas.Helpers
             }
         }
 
+        /// <summary>
+        /// 极短合成笔画，供 <see cref="Warmup"/> 等场景走完整 WinRT 转换与分析管线（空集合在入口处会被直接返回）。
+        /// </summary>
+        internal static StrokeCollection CreateMinimalWarmupStrokeCollection()
+        {
+            var da = new DrawingAttributes { Color = Colors.Black, Width = 2, Height = 2 };
+            var pts = new StylusPointCollection
+            {
+                new StylusPoint(8, 8),
+                new StylusPoint(14, 10),
+                new StylusPoint(20, 8),
+            };
+            var col = new StrokeCollection();
+            col.Add(new Stroke(pts, da));
+            return col;
+        }
+
         /// <summary>供 WinRT 手写等模块复用：将 WPF <see cref="Stroke"/> 转为 WinRT <see cref="global::Windows.UI.Input.Inking.InkStroke"/>。</summary>
         internal static global::Windows.UI.Input.Inking.InkStroke CreateInkStrokeFromWpf(Stroke stroke)
         {
@@ -106,6 +247,9 @@ namespace Ink_Canvas.Helpers
                 return null;
 
             var da = stroke.DrawingAttributes;
+            if (da == null)
+                return null;
+
             var wda = new global::Windows.UI.Input.Inking.InkDrawingAttributes
             {
                 PenTip = global::Windows.UI.Input.Inking.PenTipShape.Circle,
@@ -129,8 +273,8 @@ namespace Ink_Canvas.Helpers
             return builder.CreateStroke(points);
         }
 
-        private static global::Windows.UI.Input.Inking.Analysis.InkAnalysisInkDrawing FindPrimaryDrawing(
-            WinRtInkAnalyzer analyzer)
+        internal static global::Windows.UI.Input.Inking.Analysis.InkAnalysisInkDrawing FindPrimaryDrawing(
+            global::Windows.UI.Input.Inking.Analysis.InkAnalyzer analyzer)
         {
             global::Windows.UI.Input.Inking.Analysis.InkAnalysisInkDrawing best = null;
             double bestArea = -1;
@@ -169,7 +313,7 @@ namespace Ink_Canvas.Helpers
             return w * h;
         }
 
-        private static global::Windows.Foundation.Point[] CopyWinRtPoints(
+        internal static global::Windows.Foundation.Point[] CopyWinRtPoints(
             global::Windows.UI.Input.Inking.Analysis.InkAnalysisInkDrawing drawing)
         {
             var src = drawing?.Points;
@@ -186,7 +330,7 @@ namespace Ink_Canvas.Helpers
             return arr;
         }
 
-        private static void BoundsFromPoints(
+        internal static void BoundsFromPoints(
             System.Collections.Generic.IReadOnlyList<global::Windows.Foundation.Point> points,
             out double w,
             out double h)
@@ -211,7 +355,7 @@ namespace Ink_Canvas.Helpers
             h = Math.Max(0, maxY - minY);
         }
 
-        private static PointCollection ToWpfPointCollection(
+        internal static PointCollection ToWpfPointCollection(
             System.Collections.Generic.IReadOnlyList<global::Windows.Foundation.Point> points)
         {
             var hot = new PointCollection();
@@ -225,7 +369,7 @@ namespace Ink_Canvas.Helpers
             return hot;
         }
 
-        private static string MapDrawingKindToShapeName(
+        internal static string MapDrawingKindToShapeName(
             global::Windows.UI.Input.Inking.Analysis.InkAnalysisDrawingKind kind)
         {
             switch (kind)

Ink Canvas/Helpers/WindowsNotificationHelper.cs

@@ -1,4 +1,4 @@
-using Hardcodet.Wpf.TaskbarNotification;
+using H.NotifyIcon;
 using Microsoft.Toolkit.Uwp.Notifications;
 using System;
 using System.Windows;
@@ -40,10 +40,9 @@ namespace Ink_Canvas.Helpers
 
                     taskbar.Visibility = Visibility.Visible;
 
-                    taskbar.ShowBalloonTip(
+                    taskbar.ShowNotification(
                         "InkCanvasForClass CE",
-                        $"发现新版本！：{version}",
-                        BalloonIcon.Info);
+                        $"发现新版本！：{version}");
                 }
                 catch
                 {

Ink Canvas/InkCanvasForClass.csproj

@@ -1,10 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <RuntimeIdentifiers>win;win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Ink_Canvas</RootNamespace>
     <AssemblyName>InkCanvasForClass</AssemblyName>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
+    <Nullable>disable</Nullable>
+    <ImplicitUsings>disable</ImplicitUsings>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -25,8 +27,15 @@
     <BootstrapperEnabled>false</BootstrapperEnabled>
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
     <UseWPF>true</UseWPF>
+    <UseWindowsForms>true</UseWindowsForms>
+    <EnableWindowsTargeting>true</EnableWindowsTargeting>
     <Configurations>Debug;Release</Configurations>
-    <Platforms>AnyCPU;x86;x64;ARM64</Platforms>
+    <Platforms>AnyCPU;x86;x64</Platforms>
+    <LangVersion>10</LangVersion>
+    <NoWarn>$(NoWarn);CA1416;NU1701;MSB3270;CS8012;NETSDK1138</NoWarn>
+    <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+    <ApplicationHighDpiMode>PerMonitorV2</ApplicationHighDpiMode>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugType>embedded</DebugType>
@@ -46,14 +55,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <OutputPath>bin\$(Configuration)\$(Platform)\</OutputPath>
     <DebugType>embedded</DebugType>
-    <LangVersion>7.3</LangVersion>
     <PlatformTarget>x86</PlatformTarget>
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\$(Configuration)\$(Platform)\</OutputPath>
     <DebugType>embedded</DebugType>
-    <LangVersion>7.3</LangVersion>
     <PlatformTarget>x86</PlatformTarget>
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
@@ -71,14 +78,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
     <OutputPath>bin\$(Configuration)\$(Platform)\</OutputPath>
     <DebugType>full</DebugType>
-    <LangVersion>7.3</LangVersion>
     <PlatformTarget>ARM64</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
     <OutputPath>bin\$(Configuration)\$(Platform)\</OutputPath>
     <DebugType>pdbonly</DebugType>
-    <LangVersion>7.3</LangVersion>
     <PlatformTarget>ARM64</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -86,7 +91,6 @@
     <OutputPath>bin\$(Configuration)\$(Platform)\</OutputPath>
     <DebugType>none</DebugType>
     <DebugSymbols>false</DebugSymbols>
-    <LangVersion>7.3</LangVersion>
     <PlatformTarget>x64</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -94,7 +98,6 @@
     <OutputPath>bin\$(Configuration)\$(Platform)\</OutputPath>
     <DebugType>none</DebugType>
     <DebugSymbols>false</DebugSymbols>
-    <LangVersion>7.3</LangVersion>
     <PlatformTarget>x64</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -111,22 +114,6 @@
       <HintPath>.\IAWinFX.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Microsoft.VisualBasic" />
-    <Reference Include="netstandard" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Management" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="UIAutomationClient" />
-    <Reference Include="UIAutomationTypes" />
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.IO.Compression.FileSystem" />
-    <Reference Include="WindowsFormsIntegration" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.manifest" />
@@ -135,19 +122,23 @@
     <PackageReference Include="Costura.Fody" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="2.0.1" />
+    <PackageReference Include="gong-wpf-dragdrop" Version="4.0.0" />
+    <PackageReference Include="H.NotifyIcon.Wpf" Version="2.0.131" />
     <PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.10.2.1" />
     <PackageReference Include="iNKORE.UI.WPF" Version="1.2.8" />
     <PackageReference Include="MdXaml" Version="1.27.0" />
     <PackageReference Include="Microsoft.Office.Interop.PowerPoint" Version="15.0.4420.1018" />
-    <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.2" />
     <PackageReference Include="MicrosoftOfficeCore" Version="15.0.0" />
     <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
     <PackageReference Include="Microsoft.International.Converters.PinYinConverter" Version="1.0.0" />
-    <PackageReference Include="Sentry" Version="6.2.0" />
+    <PackageReference Include="Sentry" Version="6.3.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
+    <PackageReference Include="System.ComponentModel.Composition" Version="10.0.5" />
+    <PackageReference Include="System.Composition.AttributedModel" Version="10.0.5" />
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
+    <PackageReference Include="System.Management" Version="10.0.5" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageReference Include="NHotkey.Wpf" Version="4.0.0" />
     <PackageReference Include="OSVersionExt" Version="4.1.0" />
@@ -155,7 +146,13 @@
     <PackageReference Include="AForge.Video.DirectShow" Version="2.2.5" />
     <PackageReference Include="AForge.Imaging" Version="2.2.5" />
     <PackageReference Include="AForge.Math" Version="2.2.5" />
+    <PackageReference Include="System.Private.Uri" Version="4.3.2" />
     <PackageReference Include="WebDav.Client" Version="2.9.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\InkCanvas.PluginSdk\InkCanvas.PluginSdk.csproj" />
+    <ProjectReference Include="..\InkCanvas.Controls\InkCanvas.Controls.csproj" />
   </ItemGroup>
   <ItemGroup Condition="'$(MSBuildRuntimeType)' == 'Full'">
     <COMReference Include="IWshRuntimeLibrary">
@@ -197,8 +194,6 @@
     <EmbeddedResource Include="Resources\IACore\IACore.dll" />
     <EmbeddedResource Include="Resources\IACore\IALoader.dll" />
     <EmbeddedResource Include="Resources\IACore\IAWinFX.dll" />
-    <EmbeddedResource Include="UIAccessDLL_x64.dll" />
-    <EmbeddedResource Include="UIAccessDLL_x86.dll" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\Cursors\Cursor.cur" />
@@ -563,14 +558,7 @@
   <ItemGroup>
     <Compile Remove="AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Remove="Properties\Strings.en-US.resx" />
-    <EmbeddedResource Remove="**\Strings.en-US.resx" />
-    <None Include="Properties\Strings.en-US.resx" />
-    <EmbeddedResource Include="Properties\Strings.enUS.xml">
-      <LogicalName>Ink_Canvas.Properties.Strings.enUS.xml</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
+
   <ItemGroup>
     <None Remove="MainWindow.xaml~RF6c3144.TMP" />
     <None Remove="Resources\Cursors\Cursor.cur" />

Ink Canvas/MainWindow_cs/MW_AutoFold.cs

@@ -4,7 +4,6 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
@@ -64,7 +63,7 @@ namespace Ink_Canvas
         /// 处理折叠浮动栏的鼠标点击事件。
         /// </summary>
         /// <param name="sender">事件发送者。</param>
-        /// <param name="e">鼠标按钮事件参数。</param>
+        /// <param name="e">路由事件参数。</param>
         public async void FoldFloatingBar_MouseUp(object sender, MouseButtonEventArgs e)
         {
             await FoldFloatingBar(sender);
@@ -91,19 +90,6 @@ namespace Ink_Canvas
         /// </remarks>
         public async Task FoldFloatingBar(object sender, bool isAutoFoldCommand = false)
         {
-            var isShouldRejectAction = false;
-
-            await Dispatcher.InvokeAsync(() =>
-            {
-                if (lastBorderMouseDownObject != null && lastBorderMouseDownObject is Panel)
-                    ((Panel)lastBorderMouseDownObject).Background = new SolidColorBrush(Colors.Transparent);
-                if (sender == Fold_Icon && lastBorderMouseDownObject != Fold_Icon) isShouldRejectAction = true;
-            });
-
-            if (isShouldRejectAction)
-            {
-                return;
-            }
 
             // FloatingBarIcons_MouseUp_New(sender);
             if (sender == null)
@@ -338,7 +324,7 @@ namespace Ink_Canvas
         /// 处理展开浮动栏的鼠标点击事件。
         /// </summary>
         /// <param name="sender">事件发送者。</param>
-        /// <param name="e">鼠标按钮事件参数。</param>
+        /// <param name="e">路由事件参数。</param>
         public async void UnFoldFloatingBar_MouseUp(object sender, MouseButtonEventArgs e)
         {
             await UnFoldFloatingBar(sender);

Ink Canvas/MainWindow_cs/MW_AutoStart.cs

@@ -1,76 +0,0 @@
-using IWshRuntimeLibrary;
-using System;
-using System.Windows;
-using Application = System.Windows.Forms.Application;
-using File = System.IO.File;
-
-namespace Ink_Canvas
-{
-    public partial class MainWindow : Window
-    {
-        /// <summary>
-        /// 创建开机自启动快捷方式。
-        /// </summary>
-        /// <param name="exeName">可执行文件名，用于命名快捷方式。</param>
-        /// <returns>创建成功返回true，失败返回false。</returns>
-        /// <remarks>
-        /// 操作包括：
-        /// 1. 创建Windows Shell对象
-        /// 2. 在启动文件夹中创建快捷方式
-        /// 3. 设置快捷方式的目标路径为当前可执行文件路径
-        /// 4. 设置工作目录为当前目录
-        /// 5. 设置窗口样式为普通窗口
-        /// 6. 设置快捷方式描述
-        /// 7. 保存快捷方式
-        /// 8. 捕获可能的异常，确保方法不会因异常而崩溃
-        /// </remarks>
-        public static bool StartAutomaticallyCreate(string exeName)
-        {
-            try
-            {
-                var shell = new WshShell();
-                var shortcut = (IWshShortcut)shell.CreateShortcut(
-                    Environment.GetFolderPath(Environment.SpecialFolder.Startup) + "\\" + exeName + ".lnk");
-                //设置快捷方式的目标所在的位置(源程序完整路径)
-                shortcut.TargetPath = Application.ExecutablePath;
-                //应用程序的工作目录
-                //当用户没有指定一个具体的目录时，快捷方式的目标应用程序将使用该属性所指定的目录来装载或保存文件。
-                shortcut.WorkingDirectory = Environment.CurrentDirectory;
-                //目标应用程序窗口类型(1.Normal window普通窗口,3.Maximized最大化窗口,7.Minimized最小化)
-                shortcut.WindowStyle = 1;
-                //快捷方式的描述
-                shortcut.Description = exeName + "_Ink";
-                //设置快捷键(如果有必要的话.)
-                //shortcut.Hotkey = "CTRL+ALT+D";
-                shortcut.Save();
-                return true;
-            }
-            catch (Exception) { }
-
-            return false;
-        }
-
-        /// <summary>
-        /// 删除开机自启动快捷方式。
-        /// </summary>
-        /// <param name="exeName">可执行文件名，用于定位要删除的快捷方式。</param>
-        /// <returns>删除成功返回true，失败返回false。</returns>
-        /// <remarks>
-        /// 操作包括：
-        /// 1. 在启动文件夹中删除指定名称的快捷方式
-        /// 2. 捕获可能的异常，确保方法不会因异常而崩溃
-        /// </remarks>
-        public static bool StartAutomaticallyDel(string exeName)
-        {
-            try
-            {
-                File.Delete(Environment.GetFolderPath(Environment.SpecialFolder.Startup) + "\\" + exeName +
-                            ".lnk");
-                return true;
-            }
-            catch (Exception) { }
-
-            return false;
-        }
-    }
-}

Ink Canvas/MainWindow_cs/MW_AutoTheme.cs

@@ -14,19 +14,18 @@ namespace Ink_Canvas
 {
     public partial class MainWindow : Window
     {
-        /// <summary>
-        /// 浮动栏前景色，根据当前主题动态更新。
-        /// </summary>
+        private const string ThemeLight = "Light";
+        private const string ThemeDark = "Dark";
+        private const string LightThemePath = "Resources/Styles/Light.xaml";
+        private const string DarkThemePath = "Resources/Styles/Dark.xaml";
+        private const string DrawShapeImagePath = "Resources/DrawShapeImageDictionary.xaml";
+        private const string SeewoImagePath = "Resources/SeewoImageDictionary.xaml";
+        private const string IconImagePath = "Resources/IconImageDictionary.xaml";
+
         private Color FloatBarForegroundColor;
 
-        /// <summary>
-        /// 应用并切换到指定的主题（"Light" 或 "Dark"），更新主题资源并刷新相关 UI 元素以反映主题变化。
-        /// </summary>
-        /// <param name="theme">主题标识，支持 "Light" 或 "Dark"（区分大小写）。</param>
-        /// <param name="autoSwitchIcon">若为 true，则根据主题自动切换并保存浮动工具栏的图标设置。</param>
         private void SetTheme(string theme, bool autoSwitchIcon = false)
         {
-            // 清理现有的主题资源
             var resourcesToRemove = new List<ResourceDictionary>();
             foreach (var dict in Application.Current.Resources.MergedDictionaries)
             {
@@ -43,195 +42,85 @@ namespace Ink_Canvas
                 Application.Current.Resources.MergedDictionaries.Remove(dict);
             }
 
-            if (theme == "Light")
+            var isLightTheme = theme == ThemeLight;
+            var themePath = isLightTheme ? LightThemePath : DarkThemePath;
+            var elementTheme = isLightTheme ? ElementTheme.Light : ElementTheme.Dark;
+
+            var rd1 = new ResourceDictionary { Source = new Uri(themePath, UriKind.Relative) };
+            Application.Current.Resources.MergedDictionaries.Add(rd1);
+
+            _ = Task.Run(async () =>
             {
-                // 先加载主题
-                var rd1 = new ResourceDictionary
+                await Task.Delay(100);
+                Dispatcher.Invoke(() =>
                 {
-                    Source = new Uri("Resources/Styles/Light.xaml", UriKind.Relative)
-                };
-                Application.Current.Resources.MergedDictionaries.Add(rd1);
-
-                // 异步加载图形资源，避免阻塞启动
-                _ = Task.Run(async () =>
-                {
-                    await Task.Delay(100);
-                    Dispatcher.Invoke(() =>
-                    {
-                        var rd2 = new ResourceDictionary
-                        {
-                            Source = new Uri("Resources/DrawShapeImageDictionary.xaml", UriKind.Relative)
-                        };
-                        Application.Current.Resources.MergedDictionaries.Add(rd2);
-
-                        var rd3 = new ResourceDictionary
-                        {
-                            Source = new Uri("Resources/SeewoImageDictionary.xaml", UriKind.Relative)
-                        };
-                        Application.Current.Resources.MergedDictionaries.Add(rd3);
-
-                        var rd4 = new ResourceDictionary
-                        {
-                            Source = new Uri("Resources/IconImageDictionary.xaml", UriKind.Relative)
-                        };
-                        Application.Current.Resources.MergedDictionaries.Add(rd4);
-                    });
+                    LoadImageResourceDictionary(DrawShapeImagePath);
+                    LoadImageResourceDictionary(SeewoImagePath);
+                    LoadImageResourceDictionary(IconImagePath);
                 });
+            });
 
-                ThemeManager.SetRequestedTheme(window, ElementTheme.Light);
+            ThemeManager.SetRequestedTheme(window, elementTheme);
 
-                InitializeFloatBarForegroundColor();
+            InitializeFloatBarForegroundColor();
+            RefreshQuickPanelIcons();
+            RefreshStrokeSelectionIcons();
+            RefreshImageSelectionIcons();
+            RefreshGestureButtonIcon();
+            RefreshFloatingBarHighlightColors();
 
-                // 刷新快速面板图标
-                RefreshQuickPanelIcons();
-
-                // 刷新墨迹选中栏图标
-                RefreshStrokeSelectionIcons();
-
-                // 刷新图片选中栏图标
-                RefreshImageSelectionIcons();
-
-                // 刷新手势按钮图标
-                RefreshGestureButtonIcon();
-
-                RefreshFloatingBarHighlightColors();
-
-                if (autoSwitchIcon)
-                {
-                    AutoSwitchFloatingBarIconForTheme("Light");
-                }
-
-                // 强制刷新UI
-                window.InvalidateVisual();
-
-                // 通知其他窗口刷新主题
-                RefreshOtherWindowsTheme();
-            }
-            else if (theme == "Dark")
+            if (autoSwitchIcon)
             {
-                // 先加载主题
-                var rd1 = new ResourceDictionary { Source = new Uri("Resources/Styles/Dark.xaml", UriKind.Relative) };
-                Application.Current.Resources.MergedDictionaries.Add(rd1);
-
-                // 异步加载图形资源，避免阻塞启动
-                _ = Task.Run(async () =>
-                {
-                    await Task.Delay(100);
-                    Dispatcher.Invoke(() =>
-                    {
-                        var rd2 = new ResourceDictionary
-                        {
-                            Source = new Uri("Resources/DrawShapeImageDictionary.xaml", UriKind.Relative)
-                        };
-                        Application.Current.Resources.MergedDictionaries.Add(rd2);
-
-                        var rd3 = new ResourceDictionary
-                        {
-                            Source = new Uri("Resources/SeewoImageDictionary.xaml", UriKind.Relative)
-                        };
-                        Application.Current.Resources.MergedDictionaries.Add(rd3);
-
-                        var rd4 = new ResourceDictionary
-                        {
-                            Source = new Uri("Resources/IconImageDictionary.xaml", UriKind.Relative)
-                        };
-                        Application.Current.Resources.MergedDictionaries.Add(rd4);
-                    });
-                });
-
-                ThemeManager.SetRequestedTheme(window, ElementTheme.Dark);
-
-                InitializeFloatBarForegroundColor();
-
-                // 刷新快速面板图标
-                RefreshQuickPanelIcons();
-
-                // 刷新墨迹选中栏图标
-                RefreshStrokeSelectionIcons();
-
-                // 刷新图片选中栏图标
-                RefreshImageSelectionIcons();
-
-                // 刷新手势按钮图标
-                RefreshGestureButtonIcon();
-
-                RefreshFloatingBarHighlightColors();
-
-                if (autoSwitchIcon)
-                {
-                    AutoSwitchFloatingBarIconForTheme("Dark");
-                }
-
-                // 强制刷新UI
-                window.InvalidateVisual();
-
-                // 通知其他窗口刷新主题
-                RefreshOtherWindowsTheme();
+                AutoSwitchFloatingBarIconForTheme(theme);
             }
+
+            window.InvalidateVisual();
+            RefreshOtherWindowsTheme();
+        }
+
+        void LoadImageResourceDictionary(string path)
+        {
+            var rd = new ResourceDictionary { Source = new Uri(path, UriKind.Relative) };
+            Application.Current.Resources.MergedDictionaries.Add(rd);
         }
 
-        /// <summary>
-        /// 初始化FloatBarForegroundColor，从当前主题资源中加载颜色
-        /// </summary>
         private void InitializeFloatBarForegroundColor()
         {
             try
             {
                 FloatBarForegroundColor = (Color)Application.Current.FindResource("FloatBarForegroundColor");
-
-                // 强制刷新浮动工具栏按钮颜色
                 RefreshFloatingBarButtonColors();
             }
             catch (Exception)
             {
-                // 如果无法从资源中加载，使用默认颜色
                 FloatBarForegroundColor = Color.FromRgb(0, 0, 0);
             }
         }
 
-        /// <summary>
-        /// 刷新快速面板图标
-        /// </summary>
         private void RefreshQuickPanelIcons()
         {
             try
             {
-                if (LeftUnFoldButtonQuickPanel != null)
-                {
-                    LeftUnFoldButtonQuickPanel.InvalidateVisual();
-                }
-                if (RightUnFoldButtonQuickPanel != null)
-                {
-                    RightUnFoldButtonQuickPanel.InvalidateVisual();
-                }
-                if (LeftSidePanel != null)
-                {
-                    LeftSidePanel.InvalidateVisual();
-                }
-                if (RightSidePanel != null)
-                {
-                    RightSidePanel.InvalidateVisual();
-                }
+                LeftUnFoldButtonQuickPanel?.InvalidateVisual();
+                RightUnFoldButtonQuickPanel?.InvalidateVisual();
+                LeftSidePanel?.InvalidateVisual();
+                RightSidePanel?.InvalidateVisual();
             }
             catch (Exception)
             {
             }
         }
 
-        /// <summary>
-        /// 刷新浮动栏高光条颜色
-        /// </summary>
         private void RefreshFloatingBarHighlightColors()
         {
             try
             {
                 if (FloatingbarSelectionBG != null && FloatingbarSelectionBG.Visibility == Visibility.Visible)
                 {
-                    // 根据主题设置高光颜色
+                    bool isDarkTheme = IsCurrentThemeDark();
+
                     Color highlightBackgroundColor;
                     Color highlightBarColor;
-                    bool isDarkTheme = Settings.Appearance.Theme == 1 ||
-                                       (Settings.Appearance.Theme == 2 && !IsSystemThemeLight());
 
                     if (isDarkTheme)
                     {
@@ -244,7 +133,6 @@ namespace Ink_Canvas
                         highlightBarColor = Color.FromRgb(37, 99, 235);
                     }
 
-                    // 设置高光背景颜色
                     FloatingbarSelectionBG.Background = new SolidColorBrush(highlightBackgroundColor);
                     if (FloatingbarSelectionBG.Child is System.Windows.Controls.Canvas canvas && canvas.Children.Count > 0)
                     {
@@ -261,73 +149,67 @@ namespace Ink_Canvas
             }
         }
 
-        /// <summary>
-        /// 刷新浮动工具栏按钮颜色
-        /// </summary>
+        private bool IsCurrentThemeDark()
+        {
+            return Settings.Appearance.Theme == 1 ||
+                   (Settings.Appearance.Theme == 2 && !IsSystemThemeLight());
+        }
+
         private void RefreshFloatingBarButtonColors()
         {
             try
             {
-                // 根据主题选择高光颜色
-                Color selectedColor;
-                bool isDarkTheme = Settings.Appearance.Theme == 1 ||
-                                   (Settings.Appearance.Theme == 2 && !IsSystemThemeLight());
+                SymbolIconDelete.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.DeleteIcon);
+                ShapeDrawFloatingBarBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.ShapesIcon);
+                SymbolIconUndo.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.UndoIcon);
+                SymbolIconRedo.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.RedoIcon);
+                CursorWithDelFloatingBarBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.CursorWithDelFloatingBarBtnIcon);
+                WhiteboardFloatingBarBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.WhiteboardFloatingBarBtnIcon);
+                ToolsFloatingBarBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.ToolsFloatingBarBtnIcon);
+                Fold_Icon.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.FoldIcon);
 
-                if (isDarkTheme)
-                {
-                    selectedColor = Color.FromRgb(102, 204, 255);
-                }
-                else
-                {
-                    selectedColor = Color.FromRgb(30, 58, 138);
-                }
+                TimerToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.TimerIconGeometry);
+                RandomDrawToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.RandomDrawIconGeometry);
+                SingleDrawToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.SingleDrawIconGeometry);
+                SaveToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.SaveIconGeometry);
+                OpenToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.OpenIconGeometry);
+                ReplayToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.ReplayIconGeometry);
+                ScreenshotToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.ScreenshotIconGeometry);
+                ManualToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.ManualIconGeometry);
+                SettingsToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.SettingsIconGeometry);
+
+                BoardTimerToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.TimerIconGeometry);
+                BoardRandomDrawToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.RandomDrawIconGeometry);
+                BoardSingleDrawToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.SingleDrawIconGeometry);
+                BoardSaveToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.SaveIconGeometry);
+                BoardOpenToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.OpenIconGeometry);
+                BoardReplayToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.ReplayIconGeometry);
+                BoardScreenshotToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.ScreenshotIconGeometry);
+                BoardManualToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.ManualIconGeometry);
+                BoardSettingsToolBtn.Icon.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.SettingsIconGeometry);
+
+                bool isDarkTheme = IsCurrentThemeDark();
+                Color selectedColor = isDarkTheme ? Color.FromRgb(102, 204, 255) : Color.FromRgb(30, 58, 138);
+
+                SetAllFloatingBarButtonsToColor(FloatBarForegroundColor);
 
-                // 根据当前模式设置按钮颜色
                 switch (_currentToolMode)
                 {
                     case "cursor":
-                        CursorIconGeometry.Brush = new SolidColorBrush(selectedColor);
-                        PenIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
-                        StrokeEraserIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
-                        CircleEraserIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
-                        LassoSelectIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        Cursor_Icon.Icon.Brush = new SolidColorBrush(selectedColor);
                         break;
                     case "pen":
                     case "color":
-                        CursorIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
-                        PenIconGeometry.Brush = new SolidColorBrush(selectedColor);
-                        StrokeEraserIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
-                        CircleEraserIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
-                        LassoSelectIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        Pen_Icon.Icon.Brush = new SolidColorBrush(selectedColor);
                         break;
                     case "eraser":
-                        CursorIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
-                        PenIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
-                        StrokeEraserIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
-                        CircleEraserIconGeometry.Brush = new SolidColorBrush(selectedColor);
-                        LassoSelectIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        Eraser_Icon.Icon.Brush = new SolidColorBrush(selectedColor);
                         break;
                     case "eraserByStrokes":
-                        CursorIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
-                        PenIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
-                        StrokeEraserIconGeometry.Brush = new SolidColorBrush(selectedColor);
-                        CircleEraserIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
-                        LassoSelectIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        EraserByStrokes_Icon.Icon.Brush = new SolidColorBrush(selectedColor);
                         break;
                     case "select":
-                        CursorIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
-                        PenIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
-                        StrokeEraserIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
-                        CircleEraserIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
-                        LassoSelectIconGeometry.Brush = new SolidColorBrush(selectedColor);
-                        break;
-                    default:
-                        // 默认情况，所有按钮都使用主题颜色
-                        CursorIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
-                        PenIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
-                        StrokeEraserIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
-                        CircleEraserIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
-                        LassoSelectIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
+                        SymbolIconSelect.Icon.Brush = new SolidColorBrush(selectedColor);
                         break;
                 }
             }
@@ -336,79 +218,60 @@ namespace Ink_Canvas
             }
         }
 
-        /// <summary>
-        /// 处理系统主题偏好变化事件，根据当前设置更新应用主题。
-        /// </summary>
-        /// <param name="sender">事件发送者。</param>
-        /// <param name="e">用户偏好变化事件参数。</param>
-        /// <remarks>
-        /// 操作包括：
-        /// 1. 根据当前主题设置（Settings.Appearance.Theme）决定使用哪种主题
-        /// 2. 如果设置为0（浅色主题），则设置为Light主题
-        /// 3. 如果设置为1（深色主题），则设置为Dark主题
-        /// 4. 如果设置为2（跟随系统主题），则根据系统主题设置应用相应的主题
-        /// </remarks>
+        void SetAllFloatingBarButtonsToColor(Color color)
+        {
+            var brush = new SolidColorBrush(color);
+            Cursor_Icon.Icon.Brush = brush;
+            Pen_Icon.Icon.Brush = brush;
+            EraserByStrokes_Icon.Icon.Brush = brush;
+            Eraser_Icon.Icon.Brush = brush;
+            SymbolIconSelect.Icon.Brush = brush;
+            ShapeDrawFloatingBarBtn.Icon.Brush = brush;
+            SymbolIconUndo.Icon.Brush = brush;
+            SymbolIconRedo.Icon.Brush = brush;
+            CursorWithDelFloatingBarBtn.Icon.Brush = brush;
+            WhiteboardFloatingBarBtn.Icon.Brush = brush;
+            ToolsFloatingBarBtn.Icon.Brush = brush;
+            Fold_Icon.Icon.Brush = brush;
+        }
+
         private void SystemEvents_UserPreferenceChanged(object sender, UserPreferenceChangedEventArgs e)
         {
             switch (Settings.Appearance.Theme)
             {
                 case 0:
-                    SetTheme("Light");
+                    SetTheme(ThemeLight);
                     break;
                 case 1:
-                    SetTheme("Dark");
+                    SetTheme(ThemeDark);
                     break;
                 case 2:
-                    if (IsSystemThemeLight()) SetTheme("Light");
-                    else SetTheme("Dark");
+                    SetTheme(IsSystemThemeLight() ? ThemeLight : ThemeDark);
                     break;
             }
         }
 
-        /// <summary>
-        /// 检查系统主题是否为浅色主题。
-        /// </summary>
-        /// <returns>系统主题为浅色返回true，深色返回false。</returns>
-        /// <remarks>
-        /// 操作包括：
-        /// 1. 从注册表中读取系统主题设置
-        /// 2. 检查"SystemUsesLightTheme"键的值
-        /// 3. 如果值为1，则表示系统使用浅色主题
-        /// 4. 捕获可能的异常，确保方法不会因异常而崩溃
-        /// </remarks>
         private bool IsSystemThemeLight()
         {
-            var light = false;
             try
             {
                 var registryKey = Registry.CurrentUser;
-                var themeKey =
-                    registryKey.OpenSubKey("software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize");
-                var keyValue = 0;
-                if (themeKey != null) keyValue = (int)themeKey.GetValue("SystemUsesLightTheme");
-                if (keyValue == 1) light = true;
+                var themeKey = registryKey.OpenSubKey("software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize");
+                if (themeKey != null)
+                {
+                    int keyValue = (int)themeKey.GetValue("SystemUsesLightTheme");
+                    return keyValue == 1;
+                }
             }
             catch (Exception ex) { System.Diagnostics.Debug.WriteLine(ex); }
-
-            return light;
+            return false;
         }
 
-        /// <summary>
-        /// 根据主题自动切换浮动栏图标
-        /// </summary>
         private void AutoSwitchFloatingBarIconForTheme(string theme)
         {
             try
             {
-                if (theme == "Light")
-                {
-                    Settings.Appearance.FloatingBarImg = 0;
-                }
-                else if (theme == "Dark")
-                {
-                    Settings.Appearance.FloatingBarImg = 3;
-                }
-
+                Settings.Appearance.FloatingBarImg = theme == ThemeLight ? 0 : 3;
                 UpdateFloatingBarIcon();
                 UpdateFloatingBarIconComboBox();
             }
@@ -417,111 +280,49 @@ namespace Ink_Canvas
             }
         }
 
-        /// <summary>
-        /// 更新设置界面中的浮动栏图标选择下拉框显示
-        /// </summary>
         private void UpdateFloatingBarIconComboBox()
         {
-            try
-            {
-                if (ComboBoxFloatingBarImg != null)
-                {
-                    ComboBoxFloatingBarImg.SelectedIndex = Settings.Appearance.FloatingBarImg;
-                }
-            }
-            catch (Exception)
-            {
-            }
         }
 
-        /// <summary>
-        /// 刷新墨迹选中栏图标
-        /// </summary>
         private void RefreshStrokeSelectionIcons()
         {
             try
             {
                 if (BorderStrokeSelectionControl != null)
                 {
-                    // 强制刷新墨迹选中栏的视觉状态
                     BorderStrokeSelectionControl.InvalidateVisual();
-
-                    // 刷新墨迹选中栏内的所有图标
                     var viewbox = BorderStrokeSelectionControl.Child as Viewbox;
                     if (viewbox?.Child is ui.SimpleStackPanel stackPanel)
                     {
-                        RefreshStrokeSelectionIconsRecursive(stackPanel);
+                        RefreshIconsRecursive(stackPanel);
                     }
                 }
             }
             catch (Exception)
             {
-                // 忽略异常，确保主题切换不会因为图标刷新失败而中断
             }
         }
 
-        /// <summary>
-        /// 递归刷新墨迹选中栏内的图标
-        /// </summary>
-        private void RefreshStrokeSelectionIconsRecursive(System.Windows.Controls.Panel panel)
-        {
-            try
-            {
-                foreach (var child in panel.Children)
-                {
-                    if (child is Image image)
-                    {
-                        // 强制刷新图像
-                        image.InvalidateVisual();
-                    }
-                    else if (child is System.Windows.Controls.Panel childPanel)
-                    {
-                        // 递归处理子面板
-                        RefreshStrokeSelectionIconsRecursive(childPanel);
-                    }
-                    else if (child is Border border && border.Child is System.Windows.Controls.Panel borderPanel)
-                    {
-                        // 处理Border内的面板
-                        RefreshStrokeSelectionIconsRecursive(borderPanel);
-                    }
-                }
-            }
-            catch (Exception)
-            {
-                // 忽略异常
-            }
-        }
-
-        /// <summary>
-        /// 刷新图片选中栏图标
-        /// </summary>
         private void RefreshImageSelectionIcons()
         {
             try
             {
                 if (BorderImageSelectionControl != null)
                 {
-                    // 强制刷新图片选中栏的视觉状态
                     BorderImageSelectionControl.InvalidateVisual();
-
-                    // 刷新图片选中栏内的所有图标
                     var viewbox = BorderImageSelectionControl.Child as Viewbox;
                     if (viewbox?.Child is ui.SimpleStackPanel stackPanel)
                     {
-                        RefreshImageSelectionIconsRecursive(stackPanel);
+                        RefreshIconsRecursive(stackPanel);
                     }
                 }
             }
             catch (Exception)
             {
-                // 忽略异常，确保主题切换不会因为图标刷新失败而中断
             }
         }
 
-        /// <summary>
-        /// 递归刷新图片选中栏内的图标
-        /// </summary>
-        private void RefreshImageSelectionIconsRecursive(System.Windows.Controls.Panel panel)
+        private void RefreshIconsRecursive(System.Windows.Controls.Panel panel)
         {
             try
             {
@@ -529,22 +330,18 @@ namespace Ink_Canvas
                 {
                     if (child is Image image)
                     {
-                        // 强制刷新图像
                         image.InvalidateVisual();
                     }
                     else if (child is System.Windows.Controls.Panel childPanel)
                     {
-                        // 递归处理子面板
-                        RefreshImageSelectionIconsRecursive(childPanel);
+                        RefreshIconsRecursive(childPanel);
                     }
                     else if (child is Border border && border.Child is System.Windows.Controls.Panel borderPanel)
                     {
-                        // 处理Border内的面板
-                        RefreshImageSelectionIconsRecursive(borderPanel);
+                        RefreshIconsRecursive(borderPanel);
                     }
                     else if (child is Grid grid)
                     {
-                        // 处理Grid内的子元素
                         foreach (var gridChild in grid.Children)
                         {
                             if (gridChild is Image gridImage)
@@ -557,18 +354,13 @@ namespace Ink_Canvas
             }
             catch (Exception)
             {
-                // 忽略异常
             }
         }
 
-        /// <summary>
-        /// 刷新手势按钮图标
-        /// </summary>
         private void RefreshGestureButtonIcon()
         {
             try
             {
-                // 调用手势按钮颜色和图标更新方法，该方法会根据当前主题和手势状态设置正确的图标
                 CheckEnableTwoFingerGestureBtnColorPrompt();
             }
             catch (Exception)
@@ -576,14 +368,10 @@ namespace Ink_Canvas
             }
         }
 
-        /// <summary>
-        /// 刷新其他窗口的主题
-        /// </summary>
         private void RefreshOtherWindowsTheme()
         {
             try
             {
-                // 刷新所有打开的窗口
                 foreach (Window window in Application.Current.Windows)
                 {
                     if (window is CountdownTimerWindow timerWindow)
@@ -598,22 +386,18 @@ namespace Ink_Canvas
                     {
                         operatingGuideWindow.RefreshTheme();
                     }
+                    else if (window is Windows.SettingsViews.SettingsWindow settingsWindow)
+                    {
+                        settingsWindow.RefreshTheme();
+                    }
                 }
 
-                // 刷新计时器控件
-                if (TimerControl != null)
-                {
-                    TimerControl.RefreshTheme();
-                }
-
-                if (MinimizedTimerControl != null)
-                {
-                    MinimizedTimerControl.RefreshTheme();
-                }
+                TimerControl?.RefreshTheme();
+                MinimizedTimerControl?.RefreshTheme();
             }
             catch (Exception)
             {
             }
         }
     }
-}
+}

Ink Canvas/MainWindow_cs/MW_BoardControls.cs

@@ -1,3 +1,4 @@
+using Ink_Canvas.Controls;
 using Ink_Canvas.Helpers;
 using System;
 using System.Collections.Generic;
@@ -5,6 +6,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Ink;
+using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Threading;
 
@@ -81,7 +83,7 @@ namespace Ink_Canvas
             var missingElements = 0;
             foreach (UIElement child in inkCanvas.Children)
             {
-                if (child is Image || child is MediaElement)
+                if (child is Image || child is MediaElement || child is PdfEmbeddedView)
                 {
                     if (child is Image img && img.Tag is string tag && tag == VideoPresenterLiveFrameTag)
                     {
@@ -225,6 +227,7 @@ namespace Ink_Canvas
                 if (TimeMachineHistories[targetIndex] == null)
                 {
                     timeMachine.ClearStrokeHistory();
+                    SyncPdfPageSidebarWithCanvas();
                     return;
                 }
 
@@ -281,7 +284,11 @@ namespace Ink_Canvas
         /// </summary>
         private void ProcessElementsAfterRestore(List<UIElement> elements)
         {
-            if (elements == null || elements.Count == 0) return;
+            if (elements == null || elements.Count == 0)
+            {
+                SyncPdfPageSidebarWithCanvas();
+                return;
+            }
 
             // 使用低优先级异步处理，让 UI 先响应，图片位置和事件绑定稍后完成
             Dispatcher.BeginInvoke(DispatcherPriority.Loaded, new Action(() =>
@@ -310,7 +317,19 @@ namespace Ink_Canvas
                         }
                         BindElementEvents(media);
                     }
+                    else if (element is PdfEmbeddedView pdf)
+                    {
+                        double left = InkCanvas.GetLeft(pdf);
+                        double top = InkCanvas.GetTop(pdf);
+                        if (double.IsNaN(left) || double.IsNaN(top))
+                        {
+                            CenterAndScaleElement(pdf);
+                        }
+                        BindElementEvents(pdf);
+                    }
                 }
+
+                SyncPdfPageSidebarWithCanvas();
             }));
         }
 
@@ -408,7 +427,10 @@ namespace Ink_Canvas
         /// <remarks>
         /// 该方法在切换前会取消当前选中元素（同时保留并恢复编辑模式）、调用视频呈现器的离开页前钩子、保存当前页的笔迹与元素、清空画布；切换到前一页后恢复该页内容、调用视频呈现器的页已更改钩子并刷新页面索引显示。
         /// </remarks>
-        private void BtnWhiteBoardSwitchPrevious_Click(object sender, EventArgs e)
+        private void BoardBtnWhiteBoardSwitchPrevious_MouseUp(object sender, MouseButtonEventArgs e)
+            => BtnWhiteBoardSwitchPrevious_Click(sender, e);
+
+        private void BtnWhiteBoardSwitchPrevious_Click(object sender, RoutedEventArgs e)
         {
             if (CurrentWhiteboardIndex <= 1) return;
 
@@ -440,7 +462,10 @@ namespace Ink_Canvas
         /// </summary>
         /// <param name="sender">触发事件的源对象（通常为按钮）。</param>
         /// <param name="e">事件参数。</param>
-        private void BtnWhiteBoardSwitchNext_Click(object sender, EventArgs e)
+        private void BoardBtnWhiteBoardSwitchNext_MouseUp(object sender, MouseButtonEventArgs e)
+            => BtnWhiteBoardSwitchNext_Click(sender, e);
+
+        private void BtnWhiteBoardSwitchNext_Click(object sender, RoutedEventArgs e)
         {
             if (CurrentWhiteboardIndex < WhiteboardTotalCount &&
                 Settings.Automation.IsAutoSaveStrokesAtClear &&
@@ -487,7 +512,10 @@ namespace Ink_Canvas
         /// - 将当前页面的历史保存到时间轴并清空画布，然后在白板集合中插入一个空白页面（其历史为 null），随后恢复该页面并触发页面变更回调。  
         /// - 更新页码显示并在达到上限时禁用添加按钮；若侧边页列表可见，则刷新该列表。  
         /// </remarks>
-        private void BtnWhiteBoardAdd_Click(object sender, EventArgs e)
+        private void BoardBtnWhiteBoardAdd_MouseUp(object sender, MouseButtonEventArgs e)
+            => BtnWhiteBoardAdd_Click(sender, e);
+
+        private void BtnWhiteBoardAdd_Click(object sender, RoutedEventArgs e)
         {
             if (WhiteboardTotalCount >= 99) return;
             if (Settings.Automation.IsAutoSaveStrokesAtClear &&
@@ -634,8 +662,8 @@ namespace Ink_Canvas
             bool isMaxPage = WhiteboardTotalCount >= 99;
 
             // 设置按钮文本
-            BtnLeftWhiteBoardSwitchNextLabel.Text = isLastPage ? "新页面" : "下一页";
-            BtnRightWhiteBoardSwitchNextLabel.Text = isLastPage ? "新页面" : "下一页";
+            BtnLeftWhiteBoardSwitchNext.LabelTextBlockControl.Text = isLastPage ? "新页面" : "下一页";
+            BtnRightWhiteBoardSwitchNext.LabelTextBlockControl.Text = isLastPage ? "新页面" : "下一页";
 
             if (isLastPage)
             {
@@ -652,11 +680,11 @@ namespace Ink_Canvas
             // 设置下一页按钮颜色
             if (iconForegroundBrush != null)
             {
-                BtnLeftWhiteBoardSwitchNextGeometry.Brush = iconForegroundBrush;
-                BtnRightWhiteBoardSwitchNextGeometry.Brush = iconForegroundBrush;
+                BtnLeftWhiteBoardSwitchNext.IconGeometryDrawing.Brush = iconForegroundBrush;
+                BtnRightWhiteBoardSwitchNext.IconGeometryDrawing.Brush = iconForegroundBrush;
             }
-            BtnLeftWhiteBoardSwitchNextLabel.Opacity = 1;
-            BtnRightWhiteBoardSwitchNextLabel.Opacity = 1;
+            BtnLeftWhiteBoardSwitchNext.LabelTextBlockControl.Opacity = 1;
+            BtnRightWhiteBoardSwitchNext.LabelTextBlockControl.Opacity = 1;
 
             BtnWhiteBoardSwitchPrevious.IsEnabled = true;
 
@@ -666,21 +694,21 @@ namespace Ink_Canvas
                 if (iconForegroundBrush != null)
                 {
                     var disabledBrush = new SolidColorBrush(Color.FromArgb(127, iconForegroundBrush.Color.R, iconForegroundBrush.Color.G, iconForegroundBrush.Color.B));
-                    BtnLeftWhiteBoardSwitchPreviousGeometry.Brush = disabledBrush;
-                    BtnRightWhiteBoardSwitchPreviousGeometry.Brush = disabledBrush;
+                    BtnLeftWhiteBoardSwitchPrevious.IconGeometryDrawing.Brush = disabledBrush;
+                    BtnRightWhiteBoardSwitchPrevious.IconGeometryDrawing.Brush = disabledBrush;
                 }
-                BtnLeftWhiteBoardSwitchPreviousLabel.Opacity = 0.5;
-                BtnRightWhiteBoardSwitchPreviousLabel.Opacity = 0.5;
+                BtnLeftWhiteBoardSwitchPrevious.LabelTextBlockControl.Opacity = 0.5;
+                BtnRightWhiteBoardSwitchPrevious.LabelTextBlockControl.Opacity = 0.5;
             }
             else
             {
                 if (iconForegroundBrush != null)
                 {
-                    BtnLeftWhiteBoardSwitchPreviousGeometry.Brush = iconForegroundBrush;
-                    BtnRightWhiteBoardSwitchPreviousGeometry.Brush = iconForegroundBrush;
+                    BtnLeftWhiteBoardSwitchPrevious.IconGeometryDrawing.Brush = iconForegroundBrush;
+                    BtnRightWhiteBoardSwitchPrevious.IconGeometryDrawing.Brush = iconForegroundBrush;
                 }
-                BtnLeftWhiteBoardSwitchPreviousLabel.Opacity = 1;
-                BtnRightWhiteBoardSwitchPreviousLabel.Opacity = 1;
+                BtnLeftWhiteBoardSwitchPrevious.LabelTextBlockControl.Opacity = 1;
+                BtnRightWhiteBoardSwitchPrevious.LabelTextBlockControl.Opacity = 1;
             }
 
             BtnWhiteBoardDelete.IsEnabled = WhiteboardTotalCount != 1;

Ink Canvas/MainWindow_cs/MW_BoardIcons.cs

@@ -3,10 +3,8 @@ using System;
 using System.Diagnostics;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
 
 namespace Ink_Canvas
 {
@@ -29,594 +27,159 @@ namespace Ink_Canvas
         {
             if (!isLoaded) return;
 
-            // 创建背景选项面板（如果不存在）
-            if (BackgroundPalette == null)
+            if (BackgroundPalette.Visibility == Visibility.Visible)
             {
-                CreateBackgroundPalette();
-            }
-
-            // 显示或隐藏背景选项面板
-            if (BackgroundPalette != null)
-            {
-                if (BackgroundPalette.Visibility == Visibility.Visible)
-                {
-                    // 如果面板已经显示，则隐藏它
-                    AnimationsHelper.HideWithSlideAndFade(BackgroundPalette);
-                }
-                else
-                {
-                    // 隐藏其他可能显示的面板
-                    AnimationsHelper.HideWithSlideAndFade(EraserSizePanel);
-                    AnimationsHelper.HideWithSlideAndFade(BorderTools);
-                    AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
-                    AnimationsHelper.HideWithSlideAndFade(PenPalette);
-                    AnimationsHelper.HideWithSlideAndFade(BoardPenPalette);
-                    AnimationsHelper.HideWithSlideAndFade(BorderDrawShape);
-                    AnimationsHelper.HideWithSlideAndFade(BoardBorderDrawShape);
-                    AnimationsHelper.HideWithSlideAndFade(BoardEraserSizePanel);
-                    AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder);
-                    AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder);
-                    AnimationsHelper.HideWithSlideAndFade(BoardImageOptionsPanel);
-
-                    // 显示背景选项面板
-                    AnimationsHelper.ShowWithSlideFromBottomAndFade(BackgroundPalette);
-                }
-                return;
-            }
-
-            // 原有的背景切换代码
-            Settings.Canvas.UsingWhiteboard = !Settings.Canvas.UsingWhiteboard;
-            SaveSettingsToFile();
-            if (Settings.Canvas.UsingWhiteboard)
-            {
-                if (inkColor == 5) lastBoardInkColor = 0;
-                ICCWaterMarkDark.Visibility = Visibility.Visible;
-                ICCWaterMarkWhite.Visibility = Visibility.Collapsed;
-
-                // 设置为白板默认背景色
-                Color defaultWhiteboardColor = Color.FromRgb(255, 255, 255);
-
-                if (currentMode == 1) // 白板模式
-                {
-                    // 设置背景为默认白板背景色
-                    GridBackgroundCover.Background = new SolidColorBrush(defaultWhiteboardColor);
-
-                    // 更新RGB滑块的值为默认白板背景色
-                    if (BackgroundPalette != null && BackgroundPalette.Visibility == Visibility.Visible)
-                    {
-                        UpdateRGBSliders(defaultWhiteboardColor);
-                    }
-
-                    // 更新自定义背景色为默认白板背景色
-                    CustomBackgroundColor = defaultWhiteboardColor;
-
-                    // 保存到设置
-                    string colorHex = $"#{defaultWhiteboardColor.R:X2}{defaultWhiteboardColor.G:X2}{defaultWhiteboardColor.B:X2}";
-                    Settings.Canvas.CustomBackgroundColor = colorHex;
-                    SaveSettingsToFile();
-                }
-
-                // 设置墨迹颜色为黑色
-                CheckLastColor(0);
-                forceEraser = false;
+                AnimationsHelper.HideWithSlideAndFade(BackgroundPalette);
             }
             else
             {
-                if (inkColor == 0) lastBoardInkColor = 5;
-                ICCWaterMarkWhite.Visibility = Visibility.Visible;
-                ICCWaterMarkDark.Visibility = Visibility.Collapsed;
+                AnimationsHelper.HideWithSlideAndFade(EraserSizePanel);
+                AnimationsHelper.HideWithSlideAndFade(BorderTools);
+                AnimationsHelper.HideWithSlideAndFade(BoardBorderTools);
+                AnimationsHelper.HideWithSlideAndFade(PenPalette);
+                AnimationsHelper.HideWithSlideAndFade(BoardPenPalette);
+                AnimationsHelper.HideWithSlideAndFade(BorderDrawShape);
+                AnimationsHelper.HideWithSlideAndFade(BoardBorderDrawShape);
+                AnimationsHelper.HideWithSlideAndFade(BoardEraserSizePanel);
+                AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder);
+                AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder);
+                AnimationsHelper.HideWithSlideAndFade(BoardImageOptionsPanel);
 
-                // 设置为黑板默认背景色
-                Color defaultBlackboardColor = Color.FromRgb(22, 41, 36);
-
-                if (currentMode == 1) // 黑板模式
-                {
-                    // 设置背景为默认黑板背景色
-                    GridBackgroundCover.Background = new SolidColorBrush(defaultBlackboardColor);
-
-                    // 更新RGB滑块的值为默认黑板背景色
-                    if (BackgroundPalette != null && BackgroundPalette.Visibility == Visibility.Visible)
-                    {
-                        UpdateRGBSliders(defaultBlackboardColor);
-                    }
-
-                    // 更新自定义背景色为默认黑板背景色
-                    CustomBackgroundColor = defaultBlackboardColor;
-
-                    // 保存到设置
-                    string colorHex = $"#{defaultBlackboardColor.R:X2}{defaultBlackboardColor.G:X2}{defaultBlackboardColor.B:X2}";
-                    Settings.Canvas.CustomBackgroundColor = colorHex;
-                    SaveSettingsToFile();
-                }
-
-                // 设置墨迹颜色为白色
-                CheckLastColor(5);
-                forceEraser = false;
+                LoadCustomBackgroundColor();
+                UpdateBackgroundButtonsState();
+                AnimationsHelper.ShowWithSlideFromBottomAndFade(BackgroundPalette);
             }
-
-            CheckColorTheme(true);
         }
 
-        /// <summary>
-        /// 创建背景颜色选项面板
-        /// </summary>
-        /// <remarks>
-        /// - 加载自定义背景色
-        /// - 创建背景选项面板UI
-        /// - 添加标题栏和关闭按钮
-        /// - 添加白板/黑板模式选择按钮
-        /// - 添加RGB颜色选择器
-        /// - 添加颜色预览和应用按钮
-        /// - 将面板添加到主网格
-        /// </remarks>
-        private void CreateBackgroundPalette()
+        private void WhiteboardModeBtn_MouseUp(object sender, MouseButtonEventArgs e)
         {
-            // 确保加载自定义背景色
-            LoadCustomBackgroundColor();
+            Settings.Canvas.UsingWhiteboard = true;
+            SaveSettingsToFile();
+            ICCWaterMarkDark.Visibility = Visibility.Visible;
+            ICCWaterMarkWhite.Visibility = Visibility.Collapsed;
 
-            // 创建一个类似于PenPalette的面板
-            BackgroundPalette = new Border
+            Color defaultWhiteboardColor = Color.FromRgb(255, 255, 255);
+
+            if (currentMode == 1)
             {
-                Name = "BackgroundPalette",
-                Visibility = Visibility.Collapsed,
-                Background = (SolidColorBrush)Application.Current.FindResource("SettingsPageBackground"),
-                Opacity = 1,
-                BorderBrush = new SolidColorBrush(Color.FromRgb(0x25, 0x63, 0xeb)),
-                BorderThickness = new Thickness(1),
-                CornerRadius = new CornerRadius(8),
-                Width = 300,
-                MaxHeight = 400
-            };
-
-            // 确保面板显示在顶层
-            Panel.SetZIndex(BackgroundPalette, 1000);
-
-            // 创建面板内容
-            var stackPanel = new StackPanel();
-
-            // 创建标题栏
-            var titleBorder = new Border
-            {
-                BorderBrush = new SolidColorBrush(Color.FromRgb(0x1e, 0x3a, 0x8a)),
-                Height = 32,
-                BorderThickness = new Thickness(0, 0, 0, 1),
-                CornerRadius = new CornerRadius(8, 8, 0, 0),
-                Background = new SolidColorBrush(Color.FromRgb(0x25, 0x63, 0xeb)),
-                Margin = new Thickness(-1, -1, -1, 0),
-                Padding = new Thickness(1, 1, 1, 0)
-            };
-
-            var titleCanvas = new System.Windows.Controls.Canvas { Height = 24, ClipToBounds = true };
-            var titleText = new TextBlock
-            {
-                Text = "背景设置",
-                Foreground = (SolidColorBrush)Application.Current.FindResource("FloatBarForeground"),
-                Padding = new Thickness(0, 5, 0, 0),
-                FontSize = 11,
-                FontWeight = FontWeights.Bold,
-                TextAlignment = TextAlignment.Center
-            };
-            System.Windows.Controls.Canvas.SetLeft(titleText, 8);
-            titleCanvas.Children.Add(titleText);
-
-            // 关闭按钮
-            var closeImage = new Image
-            {
-                Source = new BitmapImage(new Uri("/Resources/new-icons/close-white.png", UriKind.Relative)),
-                Height = 16,
-                Width = 16
-            };
-            RenderOptions.SetBitmapScalingMode(closeImage, BitmapScalingMode.HighQuality);
-            closeImage.MouseUp += CloseBordertools_MouseUp;
-            System.Windows.Controls.Canvas.SetRight(closeImage, 8);
-            System.Windows.Controls.Canvas.SetTop(closeImage, 4);
-            titleCanvas.Children.Add(closeImage);
-
-            titleBorder.Child = titleCanvas;
-            stackPanel.Children.Add(titleBorder);
-
-            // 创建背景选项内容区域
-            var contentPanel = new StackPanel { Margin = new Thickness(8) };
-
-            // 黑板/白板选择
-            var modeTitle = new TextBlock
-            {
-                Text = "白板模式",
-                Foreground = (SolidColorBrush)Application.Current.FindResource("TextForeground"),
-                FontSize = 10,
-                FontWeight = FontWeights.Bold,
-                HorizontalAlignment = HorizontalAlignment.Center,
-                Margin = new Thickness(0, 4, 0, 8)
-            };
-            contentPanel.Children.Add(modeTitle);
-
-            var modePanel = new StackPanel { Orientation = Orientation.Horizontal, HorizontalAlignment = HorizontalAlignment.Center };
-
-            // 白板按钮
-            var whiteboardButton = new Border
-            {
-                Width = 60,
-                Height = 30,
-                Background = Settings.Canvas.UsingWhiteboard ? new SolidColorBrush(Color.FromRgb(0x25, 0x63, 0xeb)) : new SolidColorBrush(Colors.LightGray),
-                CornerRadius = new CornerRadius(4),
-                Margin = new Thickness(0, 0, 8, 0)
-            };
-            var whiteboardText = new TextBlock
-            {
-                Text = "白板",
-                Foreground = Settings.Canvas.UsingWhiteboard ? new SolidColorBrush(Colors.White) : new SolidColorBrush(Colors.Black),
-                HorizontalAlignment = HorizontalAlignment.Center,
-                VerticalAlignment = VerticalAlignment.Center
-            };
-            whiteboardButton.Child = whiteboardText;
-            whiteboardButton.MouseUp += (s, args) =>
-            {
-                Settings.Canvas.UsingWhiteboard = true;
+                GridBackgroundCover.Background = new SolidColorBrush(defaultWhiteboardColor);
+                UpdateRGBSliders(defaultWhiteboardColor);
+                CustomBackgroundColor = defaultWhiteboardColor;
+                string colorHex = $"#{defaultWhiteboardColor.R:X2}{defaultWhiteboardColor.G:X2}{defaultWhiteboardColor.B:X2}";
+                Settings.Canvas.CustomBackgroundColor = colorHex;
                 SaveSettingsToFile();
-                ICCWaterMarkDark.Visibility = Visibility.Visible;
-                ICCWaterMarkWhite.Visibility = Visibility.Collapsed;
-
-                // 设置为白板默认背景色
-                Color defaultWhiteboardColor = Color.FromRgb(255, 255, 255);
-
-                if (currentMode == 1) // 白板模式
-                {
-                    // 设置背景为默认白板背景色
-                    GridBackgroundCover.Background = new SolidColorBrush(defaultWhiteboardColor);
-
-                    // 更新RGB滑块的值为默认白板背景色
-                    UpdateRGBSliders(defaultWhiteboardColor);
-
-                    // 更新自定义背景色为默认白板背景色
-                    CustomBackgroundColor = defaultWhiteboardColor;
-
-                    // 保存到设置
-                    string colorHex = $"#{defaultWhiteboardColor.R:X2}{defaultWhiteboardColor.G:X2}{defaultWhiteboardColor.B:X2}";
-                    Settings.Canvas.CustomBackgroundColor = colorHex;
-                    SaveSettingsToFile();
-                }
-
-                // 设置墨迹颜色为黑色
-                CheckLastColor(0);
-                forceEraser = false;
-
-                CheckColorTheme(true);
-                UpdateBackgroundButtonsState();
-            };
-            modePanel.Children.Add(whiteboardButton);
-
-            // 黑板按钮
-            var blackboardButton = new Border
-            {
-                Width = 60,
-                Height = 30,
-                Background = !Settings.Canvas.UsingWhiteboard ? new SolidColorBrush(Color.FromRgb(0x25, 0x63, 0xeb)) : new SolidColorBrush(Colors.LightGray),
-                CornerRadius = new CornerRadius(4)
-            };
-            var blackboardText = new TextBlock
-            {
-                Text = "黑板",
-                Foreground = !Settings.Canvas.UsingWhiteboard ? new SolidColorBrush(Colors.White) : new SolidColorBrush(Colors.Black),
-                HorizontalAlignment = HorizontalAlignment.Center,
-                VerticalAlignment = VerticalAlignment.Center
-            };
-            blackboardButton.Child = blackboardText;
-            blackboardButton.MouseUp += (s, args) =>
-            {
-                Settings.Canvas.UsingWhiteboard = false;
-                SaveSettingsToFile();
-                ICCWaterMarkWhite.Visibility = Visibility.Visible;
-                ICCWaterMarkDark.Visibility = Visibility.Collapsed;
-
-                // 设置为黑板默认背景色
-                Color defaultBlackboardColor = Color.FromRgb(22, 41, 36);
-
-                if (currentMode == 1) // 黑板模式
-                {
-                    // 设置背景为默认黑板背景色
-                    GridBackgroundCover.Background = new SolidColorBrush(defaultBlackboardColor);
-
-                    // 更新RGB滑块的值为默认黑板背景色
-                    UpdateRGBSliders(defaultBlackboardColor);
-
-                    // 更新自定义背景色为默认黑板背景色
-                    CustomBackgroundColor = defaultBlackboardColor;
-
-                    // 保存到设置
-                    string colorHex = $"#{defaultBlackboardColor.R:X2}{defaultBlackboardColor.G:X2}{defaultBlackboardColor.B:X2}";
-                    Settings.Canvas.CustomBackgroundColor = colorHex;
-                    SaveSettingsToFile();
-                }
-
-                // 设置墨迹颜色为白色
-                CheckLastColor(5);
-                forceEraser = false;
-
-                CheckColorTheme(true);
-                UpdateBackgroundButtonsState();
-            };
-            modePanel.Children.Add(blackboardButton);
-
-            contentPanel.Children.Add(modePanel);
-
-            // 添加一条分隔线
-            var separator = new Border
-            {
-                Height = 1,
-                Background = (SolidColorBrush)Application.Current.FindResource("SettingsPageBorderBrush"),
-                Margin = new Thickness(0, 12, 0, 12)
-            };
-            contentPanel.Children.Add(separator);
-
-            // 添加RGB颜色选择器部分
-            var colorTitle = new TextBlock
-            {
-                Text = "背景颜色",
-                Foreground = (SolidColorBrush)Application.Current.FindResource("TextForeground"),
-                FontSize = 10,
-                FontWeight = FontWeights.Bold,
-                HorizontalAlignment = HorizontalAlignment.Center,
-                Margin = new Thickness(0, 4, 0, 8)
-            };
-            contentPanel.Children.Add(colorTitle);
-
-            // 创建颜色预览
-            Border colorPreview = new Border
-            {
-                Width = 100,
-                Height = 40,
-                BorderThickness = new Thickness(1),
-                BorderBrush = (SolidColorBrush)Application.Current.FindResource("SettingsPageBorderBrush"),
-                Background = new SolidColorBrush(Colors.White),
-                CornerRadius = new CornerRadius(4),
-                Margin = new Thickness(0, 0, 0, 10),
-                HorizontalAlignment = HorizontalAlignment.Center
-            };
-            contentPanel.Children.Add(colorPreview);
-
-            // 获取当前背景颜色
-            Color currentBackgroundColor;
-            if (currentMode == 1) // 白板或黑板模式
-            {
-                if (GridBackgroundCover.Background is SolidColorBrush brush)
-                {
-                    currentBackgroundColor = brush.Color;
-                }
-                else
-                {
-                    // 默认颜色
-                    currentBackgroundColor = Settings.Canvas.UsingWhiteboard ?
-                        Color.FromRgb(234, 235, 237) : // 白板默认颜色
-                        Color.FromRgb(22, 41, 36);    // 黑板默认颜色
-                }
-            }
-            else
-            {
-                // 默认白色
-                currentBackgroundColor = Colors.White;
             }
 
-            // 更新颜色预览
-            colorPreview.Background = new SolidColorBrush(currentBackgroundColor);
+            CheckLastColor(0);
+            forceEraser = false;
+            CheckColorTheme(true);
+            UpdateBackgroundButtonsState();
+        }
 
-            // 先创建所有滑块控件
-            // R滑块和文本框
-            var rPanel = new StackPanel { Orientation = Orientation.Horizontal, Margin = new Thickness(10, 0, 10, 5) };
-            var rLabel = new TextBlock { Text = "R:", Width = 20, VerticalAlignment = VerticalAlignment.Center, Foreground = (SolidColorBrush)Application.Current.FindResource("TextForeground") };
-            var rSlider = new Slider
+        private void BlackboardModeBtn_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            Settings.Canvas.UsingWhiteboard = false;
+            SaveSettingsToFile();
+            ICCWaterMarkWhite.Visibility = Visibility.Visible;
+            ICCWaterMarkDark.Visibility = Visibility.Collapsed;
+
+            Color defaultBlackboardColor = Color.FromRgb(22, 41, 36);
+
+            if (currentMode == 1)
             {
-                Minimum = 0,
-                Maximum = 255,
-                Value = currentBackgroundColor.R,
-                Width = 150,
-                Margin = new Thickness(5, 0, 5, 0),
-                VerticalAlignment = VerticalAlignment.Center
-            };
-            var rValueText = new TextBlock
+                GridBackgroundCover.Background = new SolidColorBrush(defaultBlackboardColor);
+                UpdateRGBSliders(defaultBlackboardColor);
+                CustomBackgroundColor = defaultBlackboardColor;
+                string colorHex = $"#{defaultBlackboardColor.R:X2}{defaultBlackboardColor.G:X2}{defaultBlackboardColor.B:X2}";
+                Settings.Canvas.CustomBackgroundColor = colorHex;
+                SaveSettingsToFile();
+            }
+
+            CheckLastColor(5);
+            forceEraser = false;
+            CheckColorTheme(true);
+            UpdateBackgroundButtonsState();
+        }
+
+        private void BackgroundRSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        {
+            if (BackgroundRValue != null)
             {
-                Text = currentBackgroundColor.R.ToString(),
-                Width = 30,
-                VerticalAlignment = VerticalAlignment.Center,
-                TextAlignment = TextAlignment.Right,
-                Foreground = (SolidColorBrush)Application.Current.FindResource("TextForeground")
-            };
-
-            // G滑块和文本框
-            var gPanel = new StackPanel { Orientation = Orientation.Horizontal, Margin = new Thickness(10, 0, 10, 5) };
-            var gLabel = new TextBlock { Text = "G:", Width = 20, VerticalAlignment = VerticalAlignment.Center, Foreground = (SolidColorBrush)Application.Current.FindResource("TextForeground") };
-            var gSlider = new Slider
-            {
-                Minimum = 0,
-                Maximum = 255,
-                Value = currentBackgroundColor.G,
-                Width = 150,
-                Margin = new Thickness(5, 0, 5, 0),
-                VerticalAlignment = VerticalAlignment.Center
-            };
-            var gValueText = new TextBlock
-            {
-                Text = currentBackgroundColor.G.ToString(),
-                Width = 30,
-                VerticalAlignment = VerticalAlignment.Center,
-                TextAlignment = TextAlignment.Right,
-                Foreground = (SolidColorBrush)Application.Current.FindResource("TextForeground")
-            };
-
-            // B滑块和文本框
-            var bPanel = new StackPanel { Orientation = Orientation.Horizontal, Margin = new Thickness(10, 0, 10, 5) };
-            var bLabel = new TextBlock { Text = "B:", Width = 20, VerticalAlignment = VerticalAlignment.Center, Foreground = (SolidColorBrush)Application.Current.FindResource("TextForeground") };
-            var bSlider = new Slider
-            {
-                Minimum = 0,
-                Maximum = 255,
-                Value = currentBackgroundColor.B,
-                Width = 150,
-                Margin = new Thickness(5, 0, 5, 0),
-                VerticalAlignment = VerticalAlignment.Center
-            };
-            var bValueText = new TextBlock
-            {
-                Text = currentBackgroundColor.B.ToString(),
-                Width = 30,
-                VerticalAlignment = VerticalAlignment.Center,
-                TextAlignment = TextAlignment.Right,
-                Foreground = (SolidColorBrush)Application.Current.FindResource("TextForeground")
-            };
-
-            // 现在添加事件处理程序
-            rSlider.ValueChanged += (s, e) =>
-            {
-                int value = (int)e.NewValue;
-                rValueText.Text = value.ToString();
-                UpdateColorPreview(colorPreview, rSlider, gSlider, bSlider);
-            };
-
-            gSlider.ValueChanged += (s, e) =>
-            {
-                int value = (int)e.NewValue;
-                gValueText.Text = value.ToString();
-                UpdateColorPreview(colorPreview, rSlider, gSlider, bSlider);
-            };
-
-            bSlider.ValueChanged += (s, e) =>
-            {
-                int value = (int)e.NewValue;
-                bValueText.Text = value.ToString();
-                UpdateColorPreview(colorPreview, rSlider, gSlider, bSlider);
-            };
-
-            // 添加控件到面板
-            rPanel.Children.Add(rLabel);
-            rPanel.Children.Add(rSlider);
-            rPanel.Children.Add(rValueText);
-            contentPanel.Children.Add(rPanel);
-
-            gPanel.Children.Add(gLabel);
-            gPanel.Children.Add(gSlider);
-            gPanel.Children.Add(gValueText);
-            contentPanel.Children.Add(gPanel);
-
-            bPanel.Children.Add(bLabel);
-            bPanel.Children.Add(bSlider);
-            bPanel.Children.Add(bValueText);
-            contentPanel.Children.Add(bPanel);
-
-            // 应用按钮
-            var applyButton = new Button
-            {
-                Content = "应用颜色",
-                Margin = new Thickness(0, 10, 0, 0),
-                Padding = new Thickness(10, 5, 10, 5),
-                Background = new SolidColorBrush(Color.FromRgb(0x25, 0x63, 0xeb)),
-                Foreground = new SolidColorBrush(Colors.White),
-                BorderThickness = new Thickness(0),
-                HorizontalAlignment = HorizontalAlignment.Center
-            };
-
-            applyButton.Click += (s, e) =>
-            {
-                Color selectedColor = Color.FromRgb(
-                    (byte)rSlider.Value,
-                    (byte)gSlider.Value,
-                    (byte)bSlider.Value
-                );
-                ApplyCustomBackgroundColor(selectedColor);
-            };
-
-            contentPanel.Children.Add(applyButton);
-
-            stackPanel.Children.Add(contentPanel);
-
-            // 将面板添加到父容器
-            BackgroundPalette.Child = stackPanel;
-
-            // 获取主窗口中的根网格，确保面板添加到顶层
-            Grid mainGrid = FindName("Main_Grid") as Grid;
-            if (mainGrid != null)
-            {
-                // 删除可能已存在的BackgroundPalette
-                foreach (UIElement element in mainGrid.Children)
-                {
-                    if (element is Border border && border.Name == "BackgroundPalette")
-                    {
-                        mainGrid.Children.Remove(border);
-                        break;
-                    }
-                }
-
-                // 重新定位面板
-                BackgroundPalette.HorizontalAlignment = HorizontalAlignment.Center;
-                BackgroundPalette.VerticalAlignment = VerticalAlignment.Center;
-                BackgroundPalette.Margin = new Thickness(0, 0, 0, 0);
-
-                // 添加到主网格
-                mainGrid.Children.Add(BackgroundPalette);
-
-                // 设置面板位置
-                var clickElement = FindName("BoardChangeBackgroundColorBtn") as FrameworkElement;
-                if (clickElement != null)
-                {
-                    Point position = clickElement.TranslatePoint(new Point(0, 0), mainGrid);
-                    BackgroundPalette.Margin = new Thickness(
-                        position.X - 150,
-                        position.Y + clickElement.ActualHeight + 5,
-                        0, 0);
-                    BackgroundPalette.HorizontalAlignment = HorizontalAlignment.Left;
-                    BackgroundPalette.VerticalAlignment = VerticalAlignment.Top;
-                }
+                BackgroundRValue.Text = ((int)e.NewValue).ToString();
+                UpdateColorPreviewFromSliders();
+            }
+        }
+
+        private void BackgroundGSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        {
+            if (BackgroundGValue != null)
+            {
+                BackgroundGValue.Text = ((int)e.NewValue).ToString();
+                UpdateColorPreviewFromSliders();
+            }
+        }
+
+        private void BackgroundBSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        {
+            if (BackgroundBValue != null)
+            {
+                BackgroundBValue.Text = ((int)e.NewValue).ToString();
+                UpdateColorPreviewFromSliders();
+            }
+        }
+
+        private void ApplyBackgroundColorBtn_Click(object sender, RoutedEventArgs e)
+        {
+            Color selectedColor = Color.FromRgb(
+                (byte)BackgroundRSlider.Value,
+                (byte)BackgroundGSlider.Value,
+                (byte)BackgroundBSlider.Value
+            );
+            ApplyCustomBackgroundColor(selectedColor);
+        }
+
+        private void UpdateColorPreviewFromSliders()
+        {
+            if (BackgroundColorPreview != null)
+            {
+                Color previewColor = Color.FromRgb(
+                    (byte)BackgroundRSlider.Value,
+                    (byte)BackgroundGSlider.Value,
+                    (byte)BackgroundBSlider.Value
+                );
+                BackgroundColorPreview.Background = new SolidColorBrush(previewColor);
             }
         }
 
-        /// <summary>
-        /// 更新背景颜色选项面板中的按钮状态
-        /// </summary>
-        /// <remarks>
-        /// - 更新白板和黑板按钮的背景和前景色
-        /// - 根据当前使用的模式设置按钮状态
-        /// </remarks>
         private void UpdateBackgroundButtonsState()
         {
-            if (BackgroundPalette != null && BackgroundPalette.Child is StackPanel stackPanel)
+            if (WhiteboardModeBtn != null)
             {
-                if (stackPanel.Children.Count > 1 && stackPanel.Children[1] is StackPanel contentPanel)
+                WhiteboardModeBtn.Background = Settings.Canvas.UsingWhiteboard ?
+                    new SolidColorBrush(Color.FromRgb(0x25, 0x63, 0xeb)) :
+                    new SolidColorBrush(Colors.LightGray);
+                if (WhiteboardModeBtn.Child is TextBlock whiteboardText)
                 {
-                    if (contentPanel.Children.Count > 1 && contentPanel.Children[1] is StackPanel modePanel)
-                    {
-                        if (modePanel.Children.Count > 1)
-                        {
-                            var whiteboardButton = modePanel.Children[0] as Border;
-                            var blackboardButton = modePanel.Children[1] as Border;
+                    whiteboardText.Foreground = Settings.Canvas.UsingWhiteboard ?
+                        new SolidColorBrush(Colors.White) :
+                        new SolidColorBrush(Colors.Black);
+                }
+            }
 
-                            if (whiteboardButton != null && whiteboardButton.Child is TextBlock whiteboardText)
-                            {
-                                whiteboardButton.Background = Settings.Canvas.UsingWhiteboard ?
-                                    new SolidColorBrush(Color.FromRgb(0x25, 0x63, 0xeb)) :
-                                    new SolidColorBrush(Colors.LightGray);
-                                whiteboardText.Foreground = Settings.Canvas.UsingWhiteboard ?
-                                    new SolidColorBrush(Colors.White) :
-                                    new SolidColorBrush(Colors.Black);
-                            }
-
-                            if (blackboardButton != null && blackboardButton.Child is TextBlock blackboardText)
-                            {
-                                blackboardButton.Background = !Settings.Canvas.UsingWhiteboard ?
-                                    new SolidColorBrush(Color.FromRgb(0x25, 0x63, 0xeb)) :
-                                    new SolidColorBrush(Colors.LightGray);
-                                blackboardText.Foreground = !Settings.Canvas.UsingWhiteboard ?
-                                    new SolidColorBrush(Colors.White) :
-                                    new SolidColorBrush(Colors.Black);
-                            }
-                        }
-                    }
+            if (BlackboardModeBtn != null)
+            {
+                BlackboardModeBtn.Background = !Settings.Canvas.UsingWhiteboard ?
+                    new SolidColorBrush(Color.FromRgb(0x25, 0x63, 0xeb)) :
+                    new SolidColorBrush(Colors.LightGray);
+                if (BlackboardModeBtn.Child is TextBlock blackboardText)
+                {
+                    blackboardText.Foreground = !Settings.Canvas.UsingWhiteboard ?
+                        new SolidColorBrush(Colors.White) :
+                        new SolidColorBrush(Colors.Black);
                 }
             }
         }
 
-        /// <summary>
-        /// 背景颜色选项面板
-        /// </summary>
-        private Border BackgroundPalette { get; set; }
-
         /// <summary>
         /// 当前自定义背景色
         /// </summary>
@@ -767,41 +330,7 @@ namespace Ink_Canvas
         /// - 启用橡皮擦模式
         /// - 设置橡皮擦形状为圆形
         /// - 设置当前工具模式为按笔画擦除
-        /// - 禁用形状绘制模式
-        /// - 重置钢笔类型和属性
-        /// - 触发编辑模式变更事件
-        /// - 取消单指拖动模式
-        /// - 隐藏子面板
-        /// </remarks>
-        private void BoardEraserIconByStrokes_Click(object sender, RoutedEventArgs e)
-        {
-            //if (BoardEraserByStrokes.Background.ToString() == "#FF679CF4") {
-            //    AnimationsHelper.ShowWithSlideFromBottomAndFade(BoardDeleteIcon);
-            //}
-            //else {
-            // 禁用高级橡皮擦系统
-            DisableEraserOverlay();
 
-            forceEraser = true;
-            forcePointEraser = false;
-
-            inkCanvas.EraserShape = new EllipseStylusShape(5, 5);
-            // 使用集中化的工具模式切换方法
-            SetCurrentToolMode(InkCanvasEditingMode.EraseByStroke);
-            drawingShapeMode = 0;
-
-            penType = 0;
-            drawingAttributes.IsHighlighter = false;
-            drawingAttributes.StylusTip = StylusTip.Ellipse;
-
-            inkCanvas_EditingModeChanged(inkCanvas, null);
-            CancelSingleFingerDragMode();
-
-            HideSubPanels("eraserByStrokes");
-            //}
-        }
-
-        /// <summary>
         /// 处理删除图标点击事件，清空画布内容
         /// </summary>
         /// <param name="sender">事件发送者</param>
@@ -913,53 +442,9 @@ namespace Ink_Canvas
         /// </summary>
         private void UpdateRGBSliders(Color color)
         {
-            if (BackgroundPalette != null && BackgroundPalette.Child is StackPanel stackPanel)
-            {
-                if (stackPanel.Children.Count > 1 && stackPanel.Children[1] is StackPanel contentPanel)
-                {
-                    // 查找RGB滑块
-                    Slider rSlider = null;
-                    Slider gSlider = null;
-                    Slider bSlider = null;
-
-                    // 遍历面板查找RGB滑块
-                    foreach (var child in contentPanel.Children)
-                    {
-                        if (child is StackPanel panel && panel.Orientation == Orientation.Horizontal)
-                        {
-                            foreach (var panelChild in panel.Children)
-                            {
-                                if (panelChild is Slider slider)
-                                {
-                                    if (panel.Children.Count > 0 && panel.Children[0] is TextBlock label)
-                                    {
-                                        if (label.Text == "R:")
-                                        {
-                                            rSlider = slider;
-                                        }
-                                        else if (label.Text == "G:")
-                                        {
-                                            gSlider = slider;
-                                        }
-                                        else if (label.Text == "B:")
-                                        {
-                                            bSlider = slider;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    // 更新滑块值
-                    if (rSlider != null && gSlider != null && bSlider != null)
-                    {
-                        rSlider.Value = color.R;
-                        gSlider.Value = color.G;
-                        bSlider.Value = color.B;
-                    }
-                }
-            }
+            if (BackgroundRSlider != null) BackgroundRSlider.Value = color.R;
+            if (BackgroundGSlider != null) BackgroundGSlider.Value = color.G;
+            if (BackgroundBSlider != null) BackgroundBSlider.Value = color.B;
         }
     }
 }

Ink Canvas/MainWindow_cs/MW_Colors.cs

@@ -1,13 +1,11 @@
 using Ink_Canvas.Helpers;
 using System;
 using System.Collections.Generic;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
 
 namespace Ink_Canvas
@@ -52,6 +50,7 @@ namespace Ink_Canvas
                     AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder);
                     AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder);
                     EnableTwoFingerGestureBorder.Visibility = Visibility.Collapsed;
+                    SyncPdfPageSidebarWithCanvas();
                 }
 
                 BtnHideInkCanvas_Click(BtnHideInkCanvas, null);
@@ -282,26 +281,26 @@ namespace Ink_Canvas
             {
                 // 亮系
                 // 亮色的红色
-                BorderPenColorRed.Background = new SolidColorBrush(Color.FromRgb(239, 68, 68));
-                BoardBorderPenColorRed.Background = new SolidColorBrush(Color.FromRgb(239, 68, 68));
+                BorderPenColorRed.Color = Color.FromRgb(239, 68, 68);
+                BoardBorderPenColorRed.Color = Color.FromRgb(239, 68, 68);
                 // 亮色的绿色
-                BorderPenColorGreen.Background = new SolidColorBrush(Color.FromRgb(34, 197, 94));
-                BoardBorderPenColorGreen.Background = new SolidColorBrush(Color.FromRgb(34, 197, 94));
+                BorderPenColorGreen.Color = Color.FromRgb(34, 197, 94);
+                BoardBorderPenColorGreen.Color = Color.FromRgb(34, 197, 94);
                 // 亮色的蓝色
-                BorderPenColorBlue.Background = new SolidColorBrush(Color.FromRgb(59, 130, 246));
-                BoardBorderPenColorBlue.Background = new SolidColorBrush(Color.FromRgb(59, 130, 246));
+                BorderPenColorBlue.Color = Color.FromRgb(59, 130, 246);
+                BoardBorderPenColorBlue.Color = Color.FromRgb(59, 130, 246);
                 // 亮色的黄色
-                BorderPenColorYellow.Background = new SolidColorBrush(Color.FromRgb(250, 204, 21));
-                BoardBorderPenColorYellow.Background = new SolidColorBrush(Color.FromRgb(250, 204, 21));
+                BorderPenColorYellow.Color = Color.FromRgb(250, 204, 21);
+                BoardBorderPenColorYellow.Color = Color.FromRgb(250, 204, 21);
                 // 亮色的粉色
-                BorderPenColorPink.Background = new SolidColorBrush(Color.FromRgb(236, 72, 153));
-                BoardBorderPenColorPink.Background = new SolidColorBrush(Color.FromRgb(236, 72, 153));
+                BorderPenColorPink.Color = Color.FromRgb(236, 72, 153);
+                BoardBorderPenColorPink.Color = Color.FromRgb(236, 72, 153);
                 // 亮色的Teal
-                BorderPenColorTeal.Background = new SolidColorBrush(Color.FromRgb(20, 184, 166));
-                BoardBorderPenColorTeal.Background = new SolidColorBrush(Color.FromRgb(20, 184, 166));
+                BorderPenColorTeal.Color = Color.FromRgb(20, 184, 166);
+                BoardBorderPenColorTeal.Color = Color.FromRgb(20, 184, 166);
                 // 亮色的Orange
-                BorderPenColorOrange.Background = new SolidColorBrush(Color.FromRgb(249, 115, 22));
-                BoardBorderPenColorOrange.Background = new SolidColorBrush(Color.FromRgb(249, 115, 22));
+                BorderPenColorOrange.Color = Color.FromRgb(249, 115, 22);
+                BoardBorderPenColorOrange.Color = Color.FromRgb(249, 115, 22);
 
                 var newImageSource = new BitmapImage();
                 newImageSource.BeginInit();
@@ -318,26 +317,26 @@ namespace Ink_Canvas
             {
                 // 暗系
                 // 暗色的红色
-                BorderPenColorRed.Background = new SolidColorBrush(Color.FromRgb(220, 38, 38));
-                BoardBorderPenColorRed.Background = new SolidColorBrush(Color.FromRgb(220, 38, 38));
+                BorderPenColorRed.Color = Color.FromRgb(220, 38, 38);
+                BoardBorderPenColorRed.Color = Color.FromRgb(220, 38, 38);
                 // 暗色的绿色
-                BorderPenColorGreen.Background = new SolidColorBrush(Color.FromRgb(22, 163, 74));
-                BoardBorderPenColorGreen.Background = new SolidColorBrush(Color.FromRgb(22, 163, 74));
+                BorderPenColorGreen.Color = Color.FromRgb(22, 163, 74);
+                BoardBorderPenColorGreen.Color = Color.FromRgb(22, 163, 74);
                 // 暗色的蓝色
-                BorderPenColorBlue.Background = new SolidColorBrush(Color.FromRgb(37, 99, 235));
-                BoardBorderPenColorBlue.Background = new SolidColorBrush(Color.FromRgb(37, 99, 235));
+                BorderPenColorBlue.Color = Color.FromRgb(37, 99, 235);
+                BoardBorderPenColorBlue.Color = Color.FromRgb(37, 99, 235);
                 // 暗色的黄色
-                BorderPenColorYellow.Background = new SolidColorBrush(Color.FromRgb(234, 179, 8));
-                BoardBorderPenColorYellow.Background = new SolidColorBrush(Color.FromRgb(234, 179, 8));
+                BorderPenColorYellow.Color = Color.FromRgb(234, 179, 8);
+                BoardBorderPenColorYellow.Color = Color.FromRgb(234, 179, 8);
                 // 暗色的紫色对应亮色的粉色
-                BorderPenColorPink.Background = new SolidColorBrush(Color.FromRgb(147, 51, 234));
-                BoardBorderPenColorPink.Background = new SolidColorBrush(Color.FromRgb(147, 51, 234));
+                BorderPenColorPink.Color = Color.FromRgb(147, 51, 234);
+                BoardBorderPenColorPink.Color = Color.FromRgb(147, 51, 234);
                 // 暗色的Teal
-                BorderPenColorTeal.Background = new SolidColorBrush(Color.FromRgb(13, 148, 136));
-                BoardBorderPenColorTeal.Background = new SolidColorBrush(Color.FromRgb(13, 148, 136));
+                BorderPenColorTeal.Color = Color.FromRgb(13, 148, 136);
+                BoardBorderPenColorTeal.Color = Color.FromRgb(13, 148, 136);
                 // 暗色的Orange
-                BorderPenColorOrange.Background = new SolidColorBrush(Color.FromRgb(234, 88, 12));
-                BoardBorderPenColorOrange.Background = new SolidColorBrush(Color.FromRgb(234, 88, 12));
+                BorderPenColorOrange.Color = Color.FromRgb(234, 88, 12);
+                BoardBorderPenColorOrange.Color = Color.FromRgb(234, 88, 12);
 
                 var newImageSource = new BitmapImage();
                 newImageSource.BeginInit();
@@ -352,127 +351,129 @@ namespace Ink_Canvas
             }
 
             // 改变选中提示
-            ViewboxBtnColorBlackContent.Visibility = Visibility.Collapsed;
-            ViewboxBtnColorBlueContent.Visibility = Visibility.Collapsed;
-            ViewboxBtnColorGreenContent.Visibility = Visibility.Collapsed;
-            ViewboxBtnColorRedContent.Visibility = Visibility.Collapsed;
-            ViewboxBtnColorYellowContent.Visibility = Visibility.Collapsed;
-            ViewboxBtnColorWhiteContent.Visibility = Visibility.Collapsed;
-            ViewboxBtnColorPinkContent.Visibility = Visibility.Collapsed;
-            ViewboxBtnColorTealContent.Visibility = Visibility.Collapsed;
-            ViewboxBtnColorOrangeContent.Visibility = Visibility.Collapsed;
+            BorderPenColorBlack.IsChecked = false;
+            BorderPenColorBlue.IsChecked = false;
+            BorderPenColorGreen.IsChecked = false;
+            BorderPenColorRed.IsChecked = false;
+            BorderPenColorYellow.IsChecked = false;
+            BorderPenColorWhite.IsChecked = false;
+            BorderPenColorPink.IsChecked = false;
+            BorderPenColorTeal.IsChecked = false;
+            BorderPenColorOrange.IsChecked = false;
 
-            BoardViewboxBtnColorBlackContent.Visibility = Visibility.Collapsed;
-            BoardViewboxBtnColorBlueContent.Visibility = Visibility.Collapsed;
-            BoardViewboxBtnColorGreenContent.Visibility = Visibility.Collapsed;
-            BoardViewboxBtnColorRedContent.Visibility = Visibility.Collapsed;
-            BoardViewboxBtnColorYellowContent.Visibility = Visibility.Collapsed;
-            BoardViewboxBtnColorWhiteContent.Visibility = Visibility.Collapsed;
-            BoardViewboxBtnColorPinkContent.Visibility = Visibility.Collapsed;
-            BoardViewboxBtnColorTealContent.Visibility = Visibility.Collapsed;
-            BoardViewboxBtnColorOrangeContent.Visibility = Visibility.Collapsed;
+            BoardBorderPenColorBlack.IsChecked = false;
+            BoardBorderPenColorBlue.IsChecked = false;
+            BoardBorderPenColorGreen.IsChecked = false;
+            BoardBorderPenColorRed.IsChecked = false;
+            BoardBorderPenColorYellow.IsChecked = false;
+            BoardBorderPenColorWhite.IsChecked = false;
+            BoardBorderPenColorPink.IsChecked = false;
+            BoardBorderPenColorTeal.IsChecked = false;
+            BoardBorderPenColorOrange.IsChecked = false;
 
-            HighlighterPenViewboxBtnColorBlackContent.Visibility = Visibility.Collapsed;
-            HighlighterPenViewboxBtnColorBlueContent.Visibility = Visibility.Collapsed;
-            HighlighterPenViewboxBtnColorGreenContent.Visibility = Visibility.Collapsed;
-            HighlighterPenViewboxBtnColorOrangeContent.Visibility = Visibility.Collapsed;
-            HighlighterPenViewboxBtnColorPurpleContent.Visibility = Visibility.Collapsed;
-            HighlighterPenViewboxBtnColorRedContent.Visibility = Visibility.Collapsed;
-            HighlighterPenViewboxBtnColorTealContent.Visibility = Visibility.Collapsed;
-            HighlighterPenViewboxBtnColorWhiteContent.Visibility = Visibility.Collapsed;
-            HighlighterPenViewboxBtnColorYellowContent.Visibility = Visibility.Collapsed;
-            HighlighterPenViewboxBtnColorZincContent.Visibility = Visibility.Collapsed;
+            HighlighterPenColorBlack.IsChecked = false;
+            HighlighterPenColorBlue.IsChecked = false;
+            HighlighterPenColorGreen.IsChecked = false;
+            HighlighterPenColorOrange.IsChecked = false;
+            HighlighterPenPenColorPurple.IsChecked = false;
+            HighlighterPenColorRed.IsChecked = false;
+            HighlighterPenColorTeal.IsChecked = false;
+            HighlighterPenColorWhite.IsChecked = false;
+            HighlighterPenColorYellow.IsChecked = false;
+            HighlighterPenColorZinc.IsChecked = false;
 
-            BoardHighlighterPenViewboxBtnColorBlackContent.Visibility = Visibility.Collapsed;
-            BoardHighlighterPenViewboxBtnColorBlueContent.Visibility = Visibility.Collapsed;
-            BoardHighlighterPenViewboxBtnColorGreenContent.Visibility = Visibility.Collapsed;
-            BoardHighlighterPenViewboxBtnColorOrangeContent.Visibility = Visibility.Collapsed;
-            BoardHighlighterPenViewboxBtnColorPurpleContent.Visibility = Visibility.Collapsed;
-            BoardHighlighterPenViewboxBtnColorRedContent.Visibility = Visibility.Collapsed;
-            BoardHighlighterPenViewboxBtnColorTealContent.Visibility = Visibility.Collapsed;
-            BoardHighlighterPenViewboxBtnColorWhiteContent.Visibility = Visibility.Collapsed;
-            BoardHighlighterPenViewboxBtnColorYellowContent.Visibility = Visibility.Collapsed;
-            BoardHighlighterPenViewboxBtnColorZincContent.Visibility = Visibility.Collapsed;
+            BoardHighlighterPenColorBlack.IsChecked = false;
+            BoardHighlighterPenColorBlue.IsChecked = false;
+            BoardHighlighterPenColorGreen.IsChecked = false;
+            BoardHighlighterPenColorOrange.IsChecked = false;
+            BoardHighlighterPenPenColorPurple.IsChecked = false;
+            BoardHighlighterPenColorRed.IsChecked = false;
+            BoardHighlighterPenColorTeal.IsChecked = false;
+            BoardHighlighterPenColorWhite.IsChecked = false;
+            BoardHighlighterPenColorYellow.IsChecked = false;
+            BoardHighlighterPenColorZinc.IsChecked = false;
 
             switch (inkColor)
             {
                 case 0:
-                    ViewboxBtnColorBlackContent.Visibility = Visibility.Visible;
-                    BoardViewboxBtnColorBlackContent.Visibility = Visibility.Visible;
+                    BorderPenColorBlack.IsChecked = true;
+                    BoardBorderPenColorBlack.IsChecked = true;
                     break;
                 case 1:
-                    ViewboxBtnColorRedContent.Visibility = Visibility.Visible;
-                    BoardViewboxBtnColorRedContent.Visibility = Visibility.Visible;
+                    BorderPenColorRed.IsChecked = true;
+                    BoardBorderPenColorRed.IsChecked = true;
                     break;
                 case 2:
-                    ViewboxBtnColorGreenContent.Visibility = Visibility.Visible;
-                    BoardViewboxBtnColorGreenContent.Visibility = Visibility.Visible;
+                    BorderPenColorGreen.IsChecked = true;
+                    BoardBorderPenColorGreen.IsChecked = true;
                     break;
                 case 3:
-                    ViewboxBtnColorBlueContent.Visibility = Visibility.Visible;
-                    BoardViewboxBtnColorBlueContent.Visibility = Visibility.Visible;
+                    BorderPenColorBlue.IsChecked = true;
+                    BoardBorderPenColorBlue.IsChecked = true;
                     break;
                 case 4:
-                    ViewboxBtnColorYellowContent.Visibility = Visibility.Visible;
-                    BoardViewboxBtnColorYellowContent.Visibility = Visibility.Visible;
+                    BorderPenColorYellow.IsChecked = true;
+                    BoardBorderPenColorYellow.IsChecked = true;
                     break;
                 case 5:
-                    ViewboxBtnColorWhiteContent.Visibility = Visibility.Visible;
-                    BoardViewboxBtnColorWhiteContent.Visibility = Visibility.Visible;
+                    BorderPenColorWhite.IsChecked = true;
+                    BoardBorderPenColorWhite.IsChecked = true;
                     break;
                 case 6:
-                    ViewboxBtnColorPinkContent.Visibility = Visibility.Visible;
-                    BoardViewboxBtnColorPinkContent.Visibility = Visibility.Visible;
+                    BorderPenColorPink.IsChecked = true;
+                    BoardBorderPenColorPink.IsChecked = true;
                     break;
                 case 7:
-                    ViewboxBtnColorTealContent.Visibility = Visibility.Visible;
+                    BorderPenColorTeal.IsChecked = true;
+                    BoardBorderPenColorTeal.IsChecked = true;
                     break;
                 case 8:
-                    ViewboxBtnColorOrangeContent.Visibility = Visibility.Visible;
+                    BorderPenColorOrange.IsChecked = true;
+                    BoardBorderPenColorOrange.IsChecked = true;
                     break;
             }
 
             switch (highlighterColor)
             {
                 case 100:
-                    HighlighterPenViewboxBtnColorBlackContent.Visibility = Visibility.Visible;
-                    BoardHighlighterPenViewboxBtnColorBlackContent.Visibility = Visibility.Visible;
+                    HighlighterPenColorBlack.IsChecked = true;
+                    BoardHighlighterPenColorBlack.IsChecked = true;
                     break;
                 case 101:
-                    HighlighterPenViewboxBtnColorWhiteContent.Visibility = Visibility.Visible;
-                    BoardHighlighterPenViewboxBtnColorWhiteContent.Visibility = Visibility.Visible;
+                    HighlighterPenColorWhite.IsChecked = true;
+                    BoardHighlighterPenColorWhite.IsChecked = true;
                     break;
                 case 102:
-                    HighlighterPenViewboxBtnColorRedContent.Visibility = Visibility.Visible;
-                    BoardHighlighterPenViewboxBtnColorRedContent.Visibility = Visibility.Visible;
+                    HighlighterPenColorRed.IsChecked = true;
+                    BoardHighlighterPenColorRed.IsChecked = true;
                     break;
                 case 103:
-                    HighlighterPenViewboxBtnColorYellowContent.Visibility = Visibility.Visible;
-                    BoardHighlighterPenViewboxBtnColorYellowContent.Visibility = Visibility.Visible;
+                    HighlighterPenColorYellow.IsChecked = true;
+                    BoardHighlighterPenColorYellow.IsChecked = true;
                     break;
                 case 104:
-                    HighlighterPenViewboxBtnColorGreenContent.Visibility = Visibility.Visible;
-                    BoardHighlighterPenViewboxBtnColorGreenContent.Visibility = Visibility.Visible;
+                    HighlighterPenColorGreen.IsChecked = true;
+                    BoardHighlighterPenColorGreen.IsChecked = true;
                     break;
                 case 105:
-                    HighlighterPenViewboxBtnColorZincContent.Visibility = Visibility.Visible;
-                    BoardHighlighterPenViewboxBtnColorZincContent.Visibility = Visibility.Visible;
+                    HighlighterPenColorZinc.IsChecked = true;
+                    BoardHighlighterPenColorZinc.IsChecked = true;
                     break;
                 case 106:
-                    HighlighterPenViewboxBtnColorBlueContent.Visibility = Visibility.Visible;
-                    BoardHighlighterPenViewboxBtnColorBlueContent.Visibility = Visibility.Visible;
+                    HighlighterPenColorBlue.IsChecked = true;
+                    BoardHighlighterPenColorBlue.IsChecked = true;
                     break;
                 case 107:
-                    HighlighterPenViewboxBtnColorPurpleContent.Visibility = Visibility.Visible;
-                    BoardHighlighterPenViewboxBtnColorPurpleContent.Visibility = Visibility.Visible;
+                    HighlighterPenPenColorPurple.IsChecked = true;
+                    BoardHighlighterPenPenColorPurple.IsChecked = true;
                     break;
                 case 108:
-                    HighlighterPenViewboxBtnColorTealContent.Visibility = Visibility.Visible;
-                    BoardHighlighterPenViewboxBtnColorTealContent.Visibility = Visibility.Visible;
+                    HighlighterPenColorTeal.IsChecked = true;
+                    BoardHighlighterPenColorTeal.IsChecked = true;
                     break;
                 case 109:
-                    HighlighterPenViewboxBtnColorOrangeContent.Visibility = Visibility.Visible;
-                    BoardHighlighterPenViewboxBtnColorOrangeContent.Visibility = Visibility.Visible;
+                    HighlighterPenColorOrange.IsChecked = true;
+                    BoardHighlighterPenColorOrange.IsChecked = true;
                     break;
             }
 
@@ -553,37 +554,15 @@ namespace Ink_Canvas
                 BoardHighlightPenTabButton.Background = new SolidColorBrush(Colors.Transparent);
                 BoardHighlightPenTabButtonIndicator.Visibility = Visibility.Collapsed;
 
-                // PenPalette.Margin = new Thickness(-160, -200, -33, 32);
+                // 动态计算面板位置，使其对齐笔按钮（考虑快捷调色盘等动态宽度）
                 await Dispatcher.InvokeAsync(() =>
                 {
-                    var marginAnimation = new ThicknessAnimation
-                    {
-                        Duration = TimeSpan.FromSeconds(0.1),
-                        From = PenPalette.Margin,
-                        To = new Thickness(-160, -200, -33, 32),
-                        EasingFunction = new CubicEase()
-                    };
-                    PenPalette.BeginAnimation(MarginProperty, marginAnimation);
+                    PenPalette.BeginAnimation(MarginProperty, null);
+                    var currentMargin = PenPalette.Margin;
+                    // 先设置正确的Top/Bottom，保持当前Left/Right
+                    PenPalette.Margin = new Thickness(currentMargin.Left, -200, currentMargin.Right, 32);
+                    UpdatePenPalettePosition();
                 });
-
-                await Dispatcher.InvokeAsync(() =>
-                {
-                    var marginAnimation = new ThicknessAnimation
-                    {
-                        Duration = TimeSpan.FromSeconds(0.1),
-                        From = PenPalette.Margin,
-                        To = new Thickness(-160, -200, -33, 50),
-                        EasingFunction = new CubicEase()
-                    };
-                    BoardPenPaletteGrid.BeginAnimation(MarginProperty, marginAnimation);
-                });
-
-
-                await Task.Delay(100);
-
-                await Dispatcher.InvokeAsync(() => { PenPalette.Margin = new Thickness(-160, -200, -33, 32); });
-
-                await Dispatcher.InvokeAsync(() => { BoardPenPaletteGrid.Margin = new Thickness(-160, -200, -33, 50); });
             }
             else if (penType == 1)
             {
@@ -621,36 +600,15 @@ namespace Ink_Canvas
                 BoardHighlightPenTabButton.Background = new SolidColorBrush(Color.FromArgb(72, 219, 234, 254));
                 BoardHighlightPenTabButtonIndicator.Visibility = Visibility.Visible;
 
-                // PenPalette.Margin = new Thickness(-160, -157, -33, 32);
+                // 动态计算面板位置，使其对齐笔按钮（考虑快捷调色盘等动态宽度）
                 await Dispatcher.InvokeAsync(() =>
                 {
-                    var marginAnimation = new ThicknessAnimation
-                    {
-                        Duration = TimeSpan.FromSeconds(0.1),
-                        From = PenPalette.Margin,
-                        To = new Thickness(-160, -157, -33, 32),
-                        EasingFunction = new CubicEase()
-                    };
-                    PenPalette.BeginAnimation(MarginProperty, marginAnimation);
+                    PenPalette.BeginAnimation(MarginProperty, null);
+                    var currentMargin = PenPalette.Margin;
+                    // 荧光笔模式面板稍小，使用不同的Top/Bottom
+                    PenPalette.Margin = new Thickness(currentMargin.Left, -157, currentMargin.Right, 32);
+                    UpdatePenPalettePosition();
                 });
-
-                await Dispatcher.InvokeAsync(() =>
-                {
-                    var marginAnimation = new ThicknessAnimation
-                    {
-                        Duration = TimeSpan.FromSeconds(0.1),
-                        From = PenPalette.Margin,
-                        To = new Thickness(-160, -154, -33, 50),
-                        EasingFunction = new CubicEase()
-                    };
-                    BoardPenPaletteGrid.BeginAnimation(MarginProperty, marginAnimation);
-                });
-
-                await Task.Delay(100);
-
-                await Dispatcher.InvokeAsync(() => { PenPalette.Margin = new Thickness(-160, -157, -33, 32); });
-
-                await Dispatcher.InvokeAsync(() => { BoardPenPaletteGrid.Margin = new Thickness(-160, -154, -33, 50); });
             }
         }
 

Ink Canvas/MainWindow_cs/MW_ElementsControls.cs

@@ -1,3 +1,4 @@
+using Ink_Canvas.Controls;
 using Ink_Canvas.Helpers;
 using Microsoft.Win32;
 using System;
@@ -34,6 +35,14 @@ namespace Ink_Canvas
         /// </summary>
         private Point dragStartPoint;
 
+        /// <summary>页码侧栏当前订阅 <see cref="PdfEmbeddedView.PageNavigationStateChanged"/> 的 PDF 视图。</summary>
+        private PdfEmbeddedView _pdfPageSidebarEventSource;
+
+        private bool _pdfSidebarPositionRefreshPending;
+
+        /// <summary>为 true 时，下一次成功算出 PDF 边界后的侧栏定位使用宿主 Visual 变换（仅用于刚插入/恢复 PDF 的首帧对齐）。</summary>
+        private bool _pdfSidebarNextPositionUseHostTransform;
+
         #region Image
         /// <summary>
         /// 处理图片插入按钮点击事件
@@ -56,48 +65,52 @@ namespace Ink_Canvas
         private async void BtnImageInsert_Click(object sender, RoutedEventArgs e)
         {
             OpenFileDialog openFileDialog = new OpenFileDialog();
-            openFileDialog.Filter = "Image files (*.jpg; *.jpeg; *.png; *.bmp)|*.jpg;*.jpeg;*.png;*.bmp";
+            openFileDialog.Filter = "图片与 PDF|*.jpg;*.jpeg;*.png;*.bmp;*.gif;*.pdf|图片文件|*.jpg;*.jpeg;*.png;*.bmp;*.gif|PDF|*.pdf";
 
             if (openFileDialog.ShowDialog() == true)
             {
                 string filePath = openFileDialog.FileName;
 
-                Image image = await CreateAndCompressImageAsync(filePath);
+                FrameworkElement element = await CreateAndCompressImageAsync(filePath);
 
-                if (image != null)
+                if (element != null)
                 {
                     string timestamp = "img_" + DateTime.Now.ToString("yyyyMMdd_HH_mm_ss_fff");
-                    image.Name = timestamp;
+                    element.Name = timestamp;
 
                     // 设置图片属性，避免被InkCanvas选择系统处理
-                    image.IsHitTestVisible = true;
-                    image.Focusable = false;
+                    element.IsHitTestVisible = true;
+                    element.Focusable = false;
 
                     // 初始化InkCanvas选择设置
                     InitializeInkCanvasSelectionSettings();
 
                     // 先添加到画布
-                    inkCanvas.Children.Add(image);
+                    inkCanvas.Children.Add(element);
 
                     // 等待图片加载完成后再进行后续处理
-                    image.Loaded += (s, args) =>
+                    element.Loaded += (s, args) =>
                     {
                         Dispatcher.BeginInvoke(new Action(() =>
                         {
                             // 初始化TransformGroup
-                            InitializeElementTransform(image);
+                            InitializeElementTransform(element);
 
                             // 居中缩放
-                            CenterAndScaleElement(image);
+                            CenterAndScaleElement(element);
 
                             // 最后绑定事件处理器
-                            BindElementEvents(image);
+                            BindElementEvents(element);
 
-                            LogHelper.WriteLogToFile($"图片插入完成: {image.Name}");
+                            if (element is PdfEmbeddedView)
+                                _pdfSidebarNextPositionUseHostTransform = true;
+                            SyncPdfPageSidebarWithCanvas();
+
+                            LogHelper.WriteLogToFile($"图片插入完成: {element.Name}");
                         }), DispatcherPriority.Loaded);
                     };
 
-                    timeMachine.CommitElementInsertHistory(image);
+                    timeMachine.CommitElementInsertHistory(element);
 
                     // 插入图片后切换到选择模式并刷新浮动栏高光显示
                     SetCurrentToolMode(InkCanvasEditingMode.Select);
@@ -270,13 +283,13 @@ namespace Ink_Canvas
                 ApplyMouseDragTransform(element, currentPoint, dragStartPoint);
 
                 // 如果是图片元素，更新工具栏位置
-                if (element is Image && BorderImageSelectionControl?.Visibility == Visibility.Visible)
+                if (IsBitmapLikeCanvasElement(element) && BorderImageSelectionControl?.Visibility == Visibility.Visible)
                 {
                     UpdateImageSelectionToolbarPosition(element);
                 }
 
                 // 如果是图片元素，更新选择点位置
-                if (element is Image && ImageResizeHandlesCanvas?.Visibility == Visibility.Visible)
+                if (IsBitmapLikeCanvasElement(element) && ImageResizeHandlesCanvas?.Visibility == Visibility.Visible)
                 {
                     UpdateImageResizeHandlesPosition(GetElementActualBounds(element));
                 }
@@ -306,13 +319,13 @@ namespace Ink_Canvas
                 ApplyWheelScaleTransform(element, e);
 
                 // 如果是图片元素，更新工具栏位置
-                if (element is Image && BorderImageSelectionControl?.Visibility == Visibility.Visible)
+                if (IsBitmapLikeCanvasElement(element) && BorderImageSelectionControl?.Visibility == Visibility.Visible)
                 {
                     UpdateImageSelectionToolbarPosition(element);
                 }
 
                 // 如果是图片元素，更新选择点位置
-                if (element is Image && ImageResizeHandlesCanvas?.Visibility == Visibility.Visible)
+                if (IsBitmapLikeCanvasElement(element) && ImageResizeHandlesCanvas?.Visibility == Visibility.Visible)
                 {
                     UpdateImageResizeHandlesPosition(GetElementActualBounds(element));
                 }
@@ -396,13 +409,13 @@ namespace Ink_Canvas
                 ApplyTouchManipulationTransform(element, e);
 
                 // 如果是图片元素，更新工具栏位置
-                if (element is Image && BorderImageSelectionControl?.Visibility == Visibility.Visible)
+                if (IsBitmapLikeCanvasElement(element) && BorderImageSelectionControl?.Visibility == Visibility.Visible)
                 {
                     UpdateImageSelectionToolbarPosition(element);
                 }
 
                 // 如果是图片元素，更新选择点位置
-                if (element is Image && ImageResizeHandlesCanvas?.Visibility == Visibility.Visible)
+                if (IsBitmapLikeCanvasElement(element) && ImageResizeHandlesCanvas?.Visibility == Visibility.Visible)
                 {
                     UpdateImageResizeHandlesPosition(GetElementActualBounds(element));
                 }
@@ -523,12 +536,12 @@ namespace Ink_Canvas
             currentSelectedElement = element;
 
             // 根据元素类型显示不同的选择工具栏
-            if (element is Image)
+            if (IsBitmapLikeCanvasElement(element))
             {
                 // 显示图片选择工具栏并设置位置
                 if (BorderImageSelectionControl != null)
                 {
-                    // 计算工具栏位置
+                    // 计算工具栏位置（内部会同步 PDF 右侧栏位置）
                     UpdateImageSelectionToolbarPosition(element);
                     BorderImageSelectionControl.Visibility = Visibility.Visible;
                 }
@@ -568,6 +581,8 @@ namespace Ink_Canvas
                 // 保持选择模式，这样用户可以直接点击墨迹来选择
                 inkCanvas.EditingMode = InkCanvasEditingMode.Select;
             }
+
+            SyncPdfPageSidebarWithCanvas();
         }
 
         /// <summary>
@@ -607,6 +622,8 @@ namespace Ink_Canvas
             {
                 inkCanvas.EditingMode = InkCanvasEditingMode.Select;
             }
+
+            SyncPdfPageSidebarWithCanvas();
         }
 
         /// <summary>
@@ -914,15 +931,24 @@ namespace Ink_Canvas
         /// - 否则使用原始尺寸
         /// - 返回创建的Image对象
         /// </remarks>
-        private async Task<Image> CreateAndCompressImageAsync(string filePath)
+        /// <summary>与图片选择工具栏、缩放控制点联动的画布位图类元素（普通图片或多页 PDF 嵌入）。</summary>
+        private static bool IsBitmapLikeCanvasElement(FrameworkElement fe)
         {
+            return fe is Image || fe is PdfEmbeddedView;
+        }
+
+        private async Task<FrameworkElement> CreateAndCompressImageAsync(string filePath)
+        {
+            string fileExtension = Path.GetExtension(filePath);
+            if (string.Equals(fileExtension, ".pdf", StringComparison.OrdinalIgnoreCase))
+                return await CreateAndCompressImageFromPdfAsync(filePath);
+
             string savePath = Path.Combine(Settings.Automation.AutoSavedStrokesLocation, "File Dependency");
             if (!Directory.Exists(savePath))
             {
                 Directory.CreateDirectory(savePath);
             }
 
-            string fileExtension = Path.GetExtension(filePath);
             string timestamp = "img_" + DateTime.Now.ToString("yyyyMMdd_HH_mm_ss_fff");
             string newFilePath = Path.Combine(savePath, timestamp + fileExtension);
 
@@ -965,6 +991,84 @@ namespace Ink_Canvas
                 return image;
             });
         }
+
+        /// <summary>
+        /// 插入完整 PDF：嵌入控件内可翻页，右下角显示页码（类似希沃白板交互）。
+        /// </summary>
+        private async Task<PdfEmbeddedView> CreateAndCompressImageFromPdfAsync(string filePath)
+        {
+            try
+            {
+                string savePath = Path.Combine(Settings.Automation.AutoSavedStrokesLocation, "File Dependency");
+                if (!Directory.Exists(savePath))
+                    Directory.CreateDirectory(savePath);
+
+                string timestamp = "img_" + DateTime.Now.ToString("yyyyMMdd_HH_mm_ss_fff");
+                string newFilePath = Path.Combine(savePath, timestamp + ".pdf");
+                await Task.Run(() => File.Copy(filePath, newFilePath, true));
+
+                uint pageCount = await PdfWinRtHelper.GetPageCountAsync(newFilePath);
+                if (pageCount == 0)
+                {
+                    ShowNotification("无法打开 PDF（可能已加密、损坏或不支持）。");
+                    return null;
+                }
+
+                bool compress = isLoaded && Settings.Canvas.IsCompressPicturesUploaded;
+                var view = new PdfEmbeddedView();
+                await view.InitializeAsync(newFilePath, pageCount, compress);
+                view.Tag = filePath;
+                return view;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"插入 PDF 失败: {ex.Message}", LogHelper.LogType.Error);
+                ShowNotification($"插入 PDF 失败: {ex.Message}");
+                return null;
+            }
+        }
+
+        /// <summary>从保存的 <see cref="CanvasElementInfo"/> 恢复 PDF（与打开墨迹时的图片恢复流程一致，不单独写入时间轴）。</summary>
+        private async Task RestorePdfFromElementInfoAsync(CanvasElementInfo info)
+        {
+            if (info == null || inkCanvas == null) return;
+            if (!string.Equals(info.Type, "Pdf", StringComparison.OrdinalIgnoreCase)) return;
+            if (string.IsNullOrEmpty(info.SourcePath) || !File.Exists(info.SourcePath)) return;
+
+            try
+            {
+                uint pageCount = await PdfWinRtHelper.GetPageCountAsync(info.SourcePath);
+                if (pageCount == 0) return;
+
+                bool compress = isLoaded && Settings.Canvas.IsCompressPicturesUploaded;
+                uint initial = 0;
+                if (info.PdfCurrentPage.HasValue)
+                    initial = (uint)Math.Max(0, Math.Min(info.PdfCurrentPage.Value, (int)pageCount - 1));
+
+                var view = new PdfEmbeddedView
+                {
+                    Name = "pdf_" + DateTime.Now.ToString("yyyyMMdd_HH_mm_ss_fff")
+                };
+                await view.InitializeAsync(info.SourcePath, pageCount, compress, initial);
+
+                if (info.Width > 0) view.Width = info.Width;
+                if (info.Height > 0) view.Height = info.Height;
+
+                InkCanvas.SetLeft(view, info.Left);
+                InkCanvas.SetTop(view, info.Top);
+
+                InitializeElementTransform(view);
+                BindElementEvents(view);
+                inkCanvas.Children.Add(view);
+                _pdfSidebarNextPositionUseHostTransform = true;
+                SyncPdfPageSidebarWithCanvas();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"从 .elements.json 恢复 PDF 失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
         #endregion
 
         #region Media
@@ -1453,6 +1557,10 @@ namespace Ink_Canvas
 
                 // 设置工具栏位置
                 BorderImageSelectionControl.Margin = new Thickness(toolbarLeft, toolbarTop, 0, 0);
+
+                var pdfTarget = GetPdfSidebarTargetElement();
+                if (pdfTarget != null && BorderPdfPageSidebar != null && BorderPdfPageSidebar.Visibility == Visibility.Visible)
+                    UpdatePdfPageSidebarPosition(pdfTarget);
             }
             catch (Exception ex)
             {
@@ -1460,6 +1568,245 @@ namespace Ink_Canvas
             }
         }
 
+        private const double PdfPageSidebarGap = 10;
+
+        /// <summary>
+        /// 侧栏绑定的 PDF：若当前选中的是 PDF 则用该项；否则用画布上最后一个 PdfEmbeddedView。
+        /// </summary>
+        private PdfEmbeddedView GetPdfSidebarTargetElement()
+        {
+            if (inkCanvas == null) return null;
+            var pdfs = inkCanvas.Children.OfType<PdfEmbeddedView>().ToList();
+            if (pdfs.Count == 0) return null;
+            if (currentSelectedElement is PdfEmbeddedView sel && pdfs.Contains(sel))
+                return sel;
+            return pdfs[pdfs.Count - 1];
+        }
+
+        private void AttachPdfPageSidebarEvents(PdfEmbeddedView pdf)
+        {
+            if (pdf == null || _pdfPageSidebarEventSource == pdf) return;
+            DetachPdfPageSidebarEvents();
+            _pdfPageSidebarEventSource = pdf;
+            _pdfPageSidebarEventSource.PageNavigationStateChanged += SelectedPdf_PageNavigationStateChanged;
+            _pdfPageSidebarEventSource.LayoutUpdated += OnPdfSidebarTargetLayoutUpdated;
+        }
+
+        private void DetachPdfPageSidebarEvents()
+        {
+            if (_pdfPageSidebarEventSource != null)
+            {
+                _pdfPageSidebarEventSource.PageNavigationStateChanged -= SelectedPdf_PageNavigationStateChanged;
+                _pdfPageSidebarEventSource.LayoutUpdated -= OnPdfSidebarTargetLayoutUpdated;
+                _pdfPageSidebarEventSource = null;
+            }
+        }
+
+        private void OnPdfSidebarTargetLayoutUpdated(object sender, EventArgs e)
+        {
+            if (BorderPdfPageSidebar?.Visibility != Visibility.Visible || inkCanvas == null) return;
+            if (!(sender is PdfEmbeddedView p) || !ReferenceEquals(_pdfPageSidebarEventSource, p)) return;
+            if (!inkCanvas.Children.Contains(p))
+                SyncPdfPageSidebarWithCanvas();
+            else
+                RequestPdfSidebarPositionRefresh();
+        }
+
+        /// <summary>在下一帧合并更新侧栏位置（初始布局、翻页改尺寸后 ActualWidth 仍为 0 时尤其需要）。</summary>
+        private void RequestPdfSidebarPositionRefresh()
+        {
+            if (_pdfSidebarPositionRefreshPending) return;
+            _pdfSidebarPositionRefreshPending = true;
+            Dispatcher.BeginInvoke(new Action(() =>
+            {
+                _pdfSidebarPositionRefreshPending = false;
+                try
+                {
+                    var t = GetPdfSidebarTargetElement();
+                    if (t == null || BorderPdfPageSidebar?.Visibility != Visibility.Visible)
+                    {
+                        SyncPdfPageSidebarWithCanvas();
+                        return;
+                    }
+
+                    if (!inkCanvas.Children.Contains(t))
+                    {
+                        SyncPdfPageSidebarWithCanvas();
+                        return;
+                    }
+
+                    t.UpdateLayout();
+                    inkCanvas.UpdateLayout();
+                    UpdatePdfPageSidebarPosition(t);
+                }
+                catch (Exception ex)
+                {
+                    LogHelper.WriteLogToFile($"PDF 侧栏延迟定位失败: {ex.Message}", LogHelper.LogType.Warning);
+                }
+            }), DispatcherPriority.Render);
+        }
+
+        /// <summary>
+        /// 画布上存在 PDF 时始终显示右侧页码栏并跟随目标 PDF；无任何 PDF 时隐藏。
+        /// </summary>
+        private void SyncPdfPageSidebarWithCanvas()
+        {
+            if (BorderPdfPageSidebar == null || inkCanvas == null) return;
+
+            // 屏幕模式（已退出白板/黑板）下不显示侧栏，避免画布仍含 PDF 时栏残留在桌面上
+            if (currentMode == 0)
+            {
+                DetachPdfPageSidebarEvents();
+                BorderPdfPageSidebar.Visibility = Visibility.Collapsed;
+                ResetPdfSidebarToIdle();
+                return;
+            }
+
+            var pdf = GetPdfSidebarTargetElement();
+            if (pdf == null)
+            {
+                DetachPdfPageSidebarEvents();
+                BorderPdfPageSidebar.Visibility = Visibility.Collapsed;
+                ResetPdfSidebarToIdle();
+                return;
+            }
+
+            AttachPdfPageSidebarEvents(pdf);
+            BorderPdfPageSidebar.Visibility = Visibility.Visible;
+            UpdatePdfSidebarFromPdf(pdf);
+            pdf.UpdateLayout();
+            inkCanvas.UpdateLayout();
+            UpdatePdfPageSidebarPosition(pdf);
+            RequestPdfSidebarPositionRefresh();
+            Dispatcher.BeginInvoke(new Action(() =>
+            {
+                var t = GetPdfSidebarTargetElement();
+                if (t != null && BorderPdfPageSidebar?.Visibility == Visibility.Visible && inkCanvas.Children.Contains(t))
+                    UpdatePdfPageSidebarPosition(t);
+            }), DispatcherPriority.ContextIdle);
+        }
+
+        /// <summary>
+        /// 将 PDF 专用页码栏贴在当前 PDF 右侧。常态与早期实现一致：画布坐标 + <c>Measure(Width, ∞)</c>；仅在 <see cref="_pdfSidebarNextPositionUseHostTransform"/> 为 true 时用宿主 Visual 变换对齐首帧。
+        /// </summary>
+        private void UpdatePdfPageSidebarPosition(FrameworkElement element)
+        {
+            try
+            {
+                if (BorderPdfPageSidebar == null || inkCanvas == null || !(element is PdfEmbeddedView pdfEl))
+                    return;
+
+                if (!inkCanvas.Children.Contains(pdfEl))
+                {
+                    SyncPdfPageSidebarWithCanvas();
+                    return;
+                }
+
+                bool wantHostOnce = _pdfSidebarNextPositionUseHostTransform;
+
+                // 插入首帧：先布局再取界，便于 Transform 与墨迹一致；常态与最初 PDF 侧栏实现一致，不在此强制 UpdateLayout。
+                if (wantHostOnce)
+                    pdfEl.UpdateLayout();
+
+                Rect b = GetElementActualBounds(pdfEl);
+                if (b.Width <= 0 || b.Height <= 0 || double.IsNaN(b.Width) || double.IsNaN(b.Height))
+                {
+                    Dispatcher.BeginInvoke(new Action(() =>
+                    {
+                        var t = GetPdfSidebarTargetElement();
+                        if (t is PdfEmbeddedView pe && inkCanvas.Children.Contains(pe) && BorderPdfPageSidebar?.Visibility == Visibility.Visible)
+                            UpdatePdfPageSidebarPosition(pe);
+                    }), DispatcherPriority.Loaded);
+                    return;
+                }
+
+                Visual sidebarHost = VisualTreeHelper.GetParent(BorderPdfPageSidebar) as Visual;
+                double left = 0, top = 0, maxLeft = 0, maxTop = 0;
+                bool hostOk = false;
+
+                if (wantHostOnce && sidebarHost != null)
+                {
+                    BorderPdfPageSidebar.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+                    double sidebarW = BorderPdfPageSidebar.DesiredSize.Width;
+                    double sidebarH = BorderPdfPageSidebar.DesiredSize.Height;
+                    if (sidebarW <= 0)
+                        sidebarW = BorderPdfPageSidebar.Width;
+                    if (sidebarH <= 0)
+                        sidebarH = BorderPdfPageSidebar.ActualHeight;
+                    if (sidebarH <= 0)
+                        sidebarH = 220;
+
+                    try
+                    {
+                        GeneralTransform inkToHost = inkCanvas.TransformToVisual(sidebarHost);
+                        Point tl = inkToHost.Transform(new Point(b.Left, b.Top));
+                        Point br = inkToHost.Transform(new Point(b.Right, b.Bottom));
+                        double rightX = Math.Max(tl.X, br.X);
+                        double midY = (tl.Y + br.Y) * 0.5;
+                        left = rightX + PdfPageSidebarGap;
+                        top = midY - sidebarH * 0.5;
+
+                        var feHost = sidebarHost as FrameworkElement;
+                        double hostW = feHost != null && feHost.ActualWidth > 0 ? feHost.ActualWidth : inkCanvas.ActualWidth;
+                        double hostH = feHost != null && feHost.ActualHeight > 0 ? feHost.ActualHeight : inkCanvas.ActualHeight;
+                        maxLeft = Math.Max(0, hostW - sidebarW);
+                        maxTop = Math.Max(0, hostH - sidebarH);
+
+                        if (left > maxLeft)
+                        {
+                            double leftEdge = Math.Min(tl.X, br.X);
+                            double leftAlt = leftEdge - PdfPageSidebarGap - sidebarW;
+                            if (leftAlt >= 0)
+                                left = leftAlt;
+                        }
+
+                        hostOk = true;
+                    }
+                    catch
+                    {
+                        hostOk = false;
+                    }
+                }
+
+                if (!hostOk)
+                {
+                    // 与 ea74592「PDF 侧栏」初版一致：固定宽度测量竖向所需高度，再按墨迹边界与 inkCanvas 尺寸夹紧。
+                    BorderPdfPageSidebar.Measure(new Size(BorderPdfPageSidebar.Width, double.PositiveInfinity));
+                    double sidebarW = BorderPdfPageSidebar.DesiredSize.Width;
+                    double sidebarH = BorderPdfPageSidebar.DesiredSize.Height;
+                    if (sidebarW <= 0)
+                        sidebarW = BorderPdfPageSidebar.Width;
+                    if (sidebarH <= 0)
+                        sidebarH = BorderPdfPageSidebar.ActualHeight;
+                    if (sidebarH <= 0)
+                        sidebarH = 220;
+
+                    left = b.Right + PdfPageSidebarGap;
+                    top = b.Top + (b.Height * 0.5) - (sidebarH * 0.5);
+                    maxLeft = Math.Max(0, inkCanvas.ActualWidth - sidebarW);
+                    maxTop = Math.Max(0, inkCanvas.ActualHeight - sidebarH);
+                    if (left > maxLeft)
+                    {
+                        double leftAlt = b.Left - PdfPageSidebarGap - sidebarW;
+                        if (leftAlt >= 0)
+                            left = leftAlt;
+                    }
+                }
+
+                if (wantHostOnce)
+                    _pdfSidebarNextPositionUseHostTransform = false;
+
+                left = Math.Max(0, Math.Min(left, maxLeft));
+                top = Math.Max(0, Math.Min(top, maxTop));
+
+                BorderPdfPageSidebar.Margin = new Thickness(left, top, 0, 0);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"更新 PDF 右侧页码栏位置失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
         /// <summary>
         /// 获取元素的实际边界（考虑变换）
         /// </summary>
@@ -1644,7 +1991,7 @@ namespace Ink_Canvas
                     ApplyRotateTransform(currentSelectedElement, -45);
 
                     // 更新工具栏位置
-                    if (currentSelectedElement is Image && BorderImageSelectionControl?.Visibility == Visibility.Visible)
+                    if (IsBitmapLikeCanvasElement(currentSelectedElement) && BorderImageSelectionControl?.Visibility == Visibility.Visible)
                     {
                         UpdateImageSelectionToolbarPosition(currentSelectedElement);
                     }
@@ -1678,7 +2025,7 @@ namespace Ink_Canvas
                     ApplyRotateTransform(currentSelectedElement, 45);
 
                     // 更新工具栏位置
-                    if (currentSelectedElement is Image && BorderImageSelectionControl?.Visibility == Visibility.Visible)
+                    if (IsBitmapLikeCanvasElement(currentSelectedElement) && BorderImageSelectionControl?.Visibility == Visibility.Visible)
                     {
                         UpdateImageSelectionToolbarPosition(currentSelectedElement);
                     }
@@ -1714,7 +2061,7 @@ namespace Ink_Canvas
                     ApplyScaleTransform(currentSelectedElement, 0.9, elementCenter);
 
                     // 更新工具栏位置
-                    if (currentSelectedElement is Image && BorderImageSelectionControl?.Visibility == Visibility.Visible)
+                    if (IsBitmapLikeCanvasElement(currentSelectedElement) && BorderImageSelectionControl?.Visibility == Visibility.Visible)
                     {
                         UpdateImageSelectionToolbarPosition(currentSelectedElement);
                     }
@@ -1750,7 +2097,7 @@ namespace Ink_Canvas
                     ApplyScaleTransform(currentSelectedElement, 1.1, elementCenter);
 
                     // 更新工具栏位置
-                    if (currentSelectedElement is Image && BorderImageSelectionControl?.Visibility == Visibility.Visible)
+                    if (IsBitmapLikeCanvasElement(currentSelectedElement) && BorderImageSelectionControl?.Visibility == Visibility.Visible)
                     {
                         UpdateImageSelectionToolbarPosition(currentSelectedElement);
                     }
@@ -1764,19 +2111,110 @@ namespace Ink_Canvas
             }
         }
 
+        private void ResetPdfSidebarToIdle()
+        {
+            if (TextBlockPdfSidebarPageLabel != null)
+            {
+                TextBlockPdfSidebarPageLabel.Text = "— / —";
+                TextBlockPdfSidebarPageLabel.Opacity = 0.55;
+            }
+
+            if (BorderPdfSidebarPagePrev != null)
+            {
+                BorderPdfSidebarPagePrev.Opacity = 0.35;
+                BorderPdfSidebarPagePrev.IsHitTestVisible = false;
+            }
+
+            if (BorderPdfSidebarPageNext != null)
+            {
+                BorderPdfSidebarPageNext.Opacity = 0.35;
+                BorderPdfSidebarPageNext.IsHitTestVisible = false;
+            }
+        }
+
+        private void UpdatePdfSidebarFromPdf(PdfEmbeddedView pdf)
+        {
+            if (pdf == null) return;
+
+            if (TextBlockPdfSidebarPageLabel != null)
+            {
+                TextBlockPdfSidebarPageLabel.Text = pdf.PageLabelText;
+                TextBlockPdfSidebarPageLabel.Opacity = 1.0;
+            }
+
+            bool prevOk = pdf.CanGoPrevious;
+            bool nextOk = pdf.CanGoNext;
+            if (BorderPdfSidebarPagePrev != null)
+            {
+                BorderPdfSidebarPagePrev.Opacity = prevOk ? 1.0 : 0.35;
+                BorderPdfSidebarPagePrev.IsHitTestVisible = prevOk;
+            }
+
+            if (BorderPdfSidebarPageNext != null)
+            {
+                BorderPdfSidebarPageNext.Opacity = nextOk ? 1.0 : 0.35;
+                BorderPdfSidebarPageNext.IsHitTestVisible = nextOk;
+            }
+        }
+
+        private void SelectedPdf_PageNavigationStateChanged(object sender, EventArgs e)
+        {
+            Dispatcher.BeginInvoke(new Action(() =>
+            {
+                if (sender is PdfEmbeddedView pdf)
+                {
+                    if (!inkCanvas.Children.Contains(pdf))
+                    {
+                        SyncPdfPageSidebarWithCanvas();
+                        return;
+                    }
+
+                    UpdatePdfSidebarFromPdf(pdf);
+                    UpdatePdfPageSidebarPosition(pdf);
+                    RequestPdfSidebarPositionRefresh();
+                }
+                if (currentSelectedElement != null && IsBitmapLikeCanvasElement(currentSelectedElement))
+                {
+                    UpdateImageSelectionToolbarPosition(currentSelectedElement);
+                    if (ImageResizeHandlesCanvas?.Visibility == Visibility.Visible)
+                        UpdateImageResizeHandlesPosition(GetElementActualBounds(currentSelectedElement));
+                }
+            }), DispatcherPriority.Loaded);
+        }
+
+        private async void BorderPdfSidebarPagePrev_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            try
+            {
+                var pdf = GetPdfSidebarTargetElement();
+                if (pdf != null && pdf.CanGoPrevious)
+                    await pdf.GoToPreviousPageAsync();
+                SyncPdfPageSidebarWithCanvas();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"PDF 上一页失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
+        private async void BorderPdfSidebarPageNext_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            try
+            {
+                var pdf = GetPdfSidebarTargetElement();
+                if (pdf != null && pdf.CanGoNext)
+                    await pdf.GoToNextPageAsync();
+                SyncPdfPageSidebarWithCanvas();
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"PDF 下一页失败: {ex.Message}", LogHelper.LogType.Error);
+            }
+        }
+
         /// <summary>
         /// 处理图片删除功能
         /// </summary>
-        /// <param name="sender">事件发送者</param>
-        /// <param name="e">事件参数</param>
-        /// <remarks>
-        /// - 检查当前是否有选中元素
-        /// - 保存删除前的编辑模式
-        /// - 记录删除历史
-        /// - 从画布中移除
-        /// - 清除选中状态
-        /// - 包含异常处理
-        /// </remarks>
         private void BorderImageDelete_MouseUp(object sender, MouseButtonEventArgs e)
         {
             try
@@ -1789,16 +2227,19 @@ namespace Ink_Canvas
                     // 记录删除历史
                     timeMachine.CommitElementRemoveHistory(currentSelectedElement);
 
+                    var toRemove = currentSelectedElement;
                     // 从画布中移除
-                    inkCanvas.Children.Remove(currentSelectedElement);
+                    inkCanvas.Children.Remove(toRemove);
 
                     // 清除选中状态
-                    UnselectElement(currentSelectedElement);
+                    UnselectElement(toRemove);
                     currentSelectedElement = null;
 
                     // 恢复到删除前的编辑模式
                     inkCanvas.EditingMode = previousEditingMode;
 
+                    SyncPdfPageSidebarWithCanvas();
+
                     LogHelper.WriteLogToFile($"图片删除完成，已恢复到编辑模式: {previousEditingMode}");
                 }
             }
@@ -2029,7 +2470,7 @@ namespace Ink_Canvas
         {
             try
             {
-                if (currentSelectedElement is Image image && sender is Ellipse ellipse)
+                if (IsBitmapLikeCanvasElement(currentSelectedElement) && sender is Ellipse ellipse)
                 {
                     isResizingImage = true;
                     imageResizeStartPoint = e.GetPosition(inkCanvas);
@@ -2072,10 +2513,10 @@ namespace Ink_Canvas
         {
             try
             {
-                if (isResizingImage && currentSelectedElement is Image image && sender is Ellipse ellipse)
+                if (isResizingImage && IsBitmapLikeCanvasElement(currentSelectedElement) && sender is Ellipse ellipse)
                 {
                     var currentPoint = e.GetPosition(inkCanvas);
-                    ResizeImageByHandle(image, imageResizeStartPoint, currentPoint, activeResizeHandle);
+                    ResizeImageByHandle(currentSelectedElement, imageResizeStartPoint, currentPoint, activeResizeHandle);
                     imageResizeStartPoint = currentPoint;
                     e.Handled = true;
                 }
@@ -2087,11 +2528,11 @@ namespace Ink_Canvas
         }
 
         // 根据控制点缩放图片
-        private void ResizeImageByHandle(Image image, Point startPoint, Point currentPoint, string handleName)
+        private void ResizeImageByHandle(FrameworkElement element, Point startPoint, Point currentPoint, string handleName)
         {
             try
             {
-                if (image.RenderTransform is TransformGroup transformGroup)
+                if (element.RenderTransform is TransformGroup transformGroup)
                 {
                     var scaleTransform = transformGroup.Children.OfType<ScaleTransform>().FirstOrDefault();
                     var translateTransform = transformGroup.Children.OfType<TranslateTransform>().FirstOrDefault();
@@ -2099,7 +2540,7 @@ namespace Ink_Canvas
                     if (scaleTransform == null || translateTransform == null) return;
 
                     // 获取图片的当前边界
-                    Rect currentBounds = GetElementActualBounds(image);
+                    Rect currentBounds = GetElementActualBounds(element);
                     double deltaX = currentPoint.X - startPoint.X;
                     double deltaY = currentPoint.Y - startPoint.Y;
 
@@ -2160,7 +2601,10 @@ namespace Ink_Canvas
                     translateTransform.Y += translateY;
 
                     // 更新选择点位置
-                    UpdateImageResizeHandlesPosition(GetElementActualBounds(image));
+                    UpdateImageResizeHandlesPosition(GetElementActualBounds(element));
+
+                    if (BorderImageSelectionControl?.Visibility == Visibility.Visible)
+                        UpdateImageSelectionToolbarPosition(element);
                 }
             }
             catch (Exception ex)

Ink Canvas/MainWindow_cs/MW_FloatingWindowInterceptor.cs

@@ -1,7 +1,5 @@
 using Ink_Canvas.Helpers;
-using iNKORE.UI.WPF.Modern.Controls;
 using System;
-using System.Linq;
 using System.Windows;
 
 namespace Ink_Canvas
@@ -10,25 +8,14 @@ namespace Ink_Canvas
     {
         #region 悬浮窗拦截功能
 
-        /// <summary>
-        /// 初始化悬浮窗拦截管理器
-        /// </summary>
         private void InitializeFloatingWindowInterceptor()
         {
             try
             {
                 _floatingWindowInterceptorManager = new FloatingWindowInterceptorManager();
-
-                // 订阅事件
                 _floatingWindowInterceptorManager.WindowIntercepted += OnFloatingWindowIntercepted;
                 _floatingWindowInterceptorManager.WindowRestored += OnFloatingWindowRestored;
-
-                // 初始化拦截器
                 _floatingWindowInterceptorManager.Initialize(Settings.Automation.FloatingWindowInterceptor);
-
-                // 加载UI状态
-                LoadFloatingWindowInterceptorUI();
-
                 LogHelper.WriteLogToFile("悬浮窗拦截管理器初始化完成", LogHelper.LogType.Event);
             }
             catch (Exception ex)
@@ -37,83 +24,11 @@ namespace Ink_Canvas
             }
         }
 
-        /// <summary>
-        /// 加载悬浮窗拦截UI状态
-        /// </summary>
-        private void LoadFloatingWindowInterceptorUI()
-        {
-            try
-            {
-                if (!isLoaded) return;
-
-                // 设置主开关状态
-                ToggleSwitchFloatingWindowInterceptorEnabled.IsOn = Settings.Automation.FloatingWindowInterceptor.IsEnabled;
-
-                // 设置各个拦截规则的状态
-                foreach (var kvp in Settings.Automation.FloatingWindowInterceptor.InterceptRules)
-                {
-                    var toggleName = $"ToggleSwitch{kvp.Key}";
-                    var toggle = FindName(toggleName) as ToggleSwitch;
-                    if (toggle != null)
-                    {
-                        toggle.IsOn = kvp.Value;
-                    }
-                }
-
-                // 更新UI可见性
-                UpdateFloatingWindowInterceptorUI();
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"加载悬浮窗拦截UI状态失败: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 更新悬浮窗拦截UI
-        /// </summary>
-        private void UpdateFloatingWindowInterceptorUI()
-        {
-            try
-            {
-                var isEnabled = Settings.Automation.FloatingWindowInterceptor.IsEnabled;
-                FloatingWindowInterceptorGrid.Visibility = isEnabled ? Visibility.Visible : Visibility.Collapsed;
-
-                // 计算启用的规则数量
-                var enabledRulesCount = Settings.Automation.FloatingWindowInterceptor.InterceptRules.Where(kvp => kvp.Value).Count();
-                var totalRulesCount = Settings.Automation.FloatingWindowInterceptor.InterceptRules.Count;
-
-                // 更新状态文本
-                if (_floatingWindowInterceptorManager != null)
-                {
-                    var stats = _floatingWindowInterceptorManager.GetStatistics();
-                    TextBlockFloatingWindowInterceptorStatus.Text = stats.IsRunning
-                        ? $"拦截器运行中 - 已启用 {enabledRulesCount}/{totalRulesCount} 个规则"
-                        : $"拦截器未启动 - 已启用 {enabledRulesCount}/{totalRulesCount} 个规则";
-                }
-                else
-                {
-                    TextBlockFloatingWindowInterceptorStatus.Text = $"拦截器未初始化 - 已启用 {enabledRulesCount}/{totalRulesCount} 个规则";
-                }
-            }
-            catch (Exception ex)
-            {
-                LogHelper.WriteLogToFile($"更新悬浮窗拦截UI失败: {ex.Message}", LogHelper.LogType.Error);
-            }
-        }
-
-        /// <summary>
-        /// 窗口被拦截事件处理
-        /// </summary>
         private void OnFloatingWindowIntercepted(object sender, FloatingWindowInterceptor.WindowInterceptedEventArgs e)
         {
             try
             {
-                // 在UI线程中更新状态
-                Dispatcher.BeginInvoke(new Action(() =>
-                {
-                    UpdateFloatingWindowInterceptorUI();
-                }));
+                Dispatcher.BeginInvoke(new Action(() => { }));
             }
             catch (Exception ex)
             {
@@ -121,18 +36,11 @@ namespace Ink_Canvas
             }
         }
 
-        /// <summary>
-        /// 窗口被恢复事件处理
-        /// </summary>
         private void OnFloatingWindowRestored(object sender, FloatingWindowInterceptor.WindowRestoredEventArgs e)
         {
             try
             {
-                // 在UI线程中更新状态
-                Dispatcher.BeginInvoke(new Action(() =>
-                {
-                    UpdateFloatingWindowInterceptorUI();
-                }));
+                Dispatcher.BeginInvoke(new Action(() => { }));
             }
             catch (Exception ex)
             {
@@ -144,30 +52,24 @@ namespace Ink_Canvas
 
         #region 悬浮窗拦截事件处理
 
-        /// <summary>
-        /// 主开关切换事件
-        /// </summary>
         private void ToggleSwitchFloatingWindowInterceptorEnabled_Toggled(object sender, RoutedEventArgs e)
         {
             if (!isLoaded) return;
 
             try
             {
-                Settings.Automation.FloatingWindowInterceptor.IsEnabled = ToggleSwitchFloatingWindowInterceptorEnabled.IsOn;
+                var toggle = sender as iNKORE.UI.WPF.Modern.Controls.ToggleSwitch;
+                if (toggle != null)
+                    Settings.Automation.FloatingWindowInterceptor.IsEnabled = toggle.IsOn;
 
                 if (_floatingWindowInterceptorManager != null)
                 {
                     if (Settings.Automation.FloatingWindowInterceptor.IsEnabled)
-                    {
                         _floatingWindowInterceptorManager.Start();
-                    }
                     else
-                    {
                         _floatingWindowInterceptorManager.Stop();
-                    }
                 }
 
-                UpdateFloatingWindowInterceptorUI();
                 SaveSettingsToFile();
             }
             catch (Exception ex)
@@ -176,129 +78,98 @@ namespace Ink_Canvas
             }
         }
 
-        /// <summary>
-        /// 希沃白板3拦截开关
-        /// </summary>
         private void ToggleSwitchSeewoWhiteboard3Floating_Toggled(object sender, RoutedEventArgs e)
         {
             if (!isLoaded) return;
-            SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoWhiteboard3Floating, ToggleSwitchSeewoWhiteboard3Floating.IsOn);
+            var toggle = sender as iNKORE.UI.WPF.Modern.Controls.ToggleSwitch;
+            if (toggle != null) SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoWhiteboard3Floating, toggle.IsOn);
         }
 
-        /// <summary>
-        /// 希沃白板5拦截开关
-        /// </summary>
         private void ToggleSwitchSeewoWhiteboard5Floating_Toggled(object sender, RoutedEventArgs e)
         {
             if (!isLoaded) return;
-            SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoWhiteboard5Floating, ToggleSwitchSeewoWhiteboard5Floating.IsOn);
+            var toggle = sender as iNKORE.UI.WPF.Modern.Controls.ToggleSwitch;
+            if (toggle != null) SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoWhiteboard5Floating, toggle.IsOn);
         }
 
-        /// <summary>
-        /// 希沃白板5C拦截开关
-        /// </summary>
         private void ToggleSwitchSeewoWhiteboard5CFloating_Toggled(object sender, RoutedEventArgs e)
         {
             if (!isLoaded) return;
-            SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoWhiteboard5CFloating, ToggleSwitchSeewoWhiteboard5CFloating.IsOn);
+            var toggle = sender as iNKORE.UI.WPF.Modern.Controls.ToggleSwitch;
+            if (toggle != null) SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoWhiteboard5CFloating, toggle.IsOn);
         }
 
-        /// <summary>
-        /// 希沃品课侧栏拦截开关
-        /// </summary>
         private void ToggleSwitchSeewoPincoSideBarFloating_Toggled(object sender, RoutedEventArgs e)
         {
             if (!isLoaded) return;
-            SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoPincoSideBarFloating, ToggleSwitchSeewoPincoSideBarFloating.IsOn);
+            var toggle = sender as iNKORE.UI.WPF.Modern.Controls.ToggleSwitch;
+            if (toggle != null) SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoPincoSideBarFloating, toggle.IsOn);
         }
 
-        /// <summary>
-        /// 希沃品课画笔拦截开关
-        /// </summary>
         private void ToggleSwitchSeewoPincoDrawingFloating_Toggled(object sender, RoutedEventArgs e)
         {
             if (!isLoaded) return;
-            SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoPincoDrawingFloating, ToggleSwitchSeewoPincoDrawingFloating.IsOn);
+            var toggle = sender as iNKORE.UI.WPF.Modern.Controls.ToggleSwitch;
+            if (toggle != null) SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoPincoDrawingFloating, toggle.IsOn);
         }
 
-        /// <summary>
-        /// 希沃PPT小工具拦截开关
-        /// </summary>
         private void ToggleSwitchSeewoPPTFloating_Toggled(object sender, RoutedEventArgs e)
         {
             if (!isLoaded) return;
-            SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoPPTFloating, ToggleSwitchSeewoPPTFloating.IsOn);
+            var toggle = sender as iNKORE.UI.WPF.Modern.Controls.ToggleSwitch;
+            if (toggle != null) SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoPPTFloating, toggle.IsOn);
         }
 
-        /// <summary>
-        /// AiClass拦截开关
-        /// </summary>
         private void ToggleSwitchAiClassFloating_Toggled(object sender, RoutedEventArgs e)
         {
             if (!isLoaded) return;
-            SetInterceptRule(FloatingWindowInterceptor.InterceptType.AiClassFloating, ToggleSwitchAiClassFloating.IsOn);
+            var toggle = sender as iNKORE.UI.WPF.Modern.Controls.ToggleSwitch;
+            if (toggle != null) SetInterceptRule(FloatingWindowInterceptor.InterceptType.AiClassFloating, toggle.IsOn);
         }
 
-        /// <summary>
-        /// 鸿合屏幕书写拦截开关
-        /// </summary>
         private void ToggleSwitchHiteAnnotationFloating_Toggled(object sender, RoutedEventArgs e)
         {
             if (!isLoaded) return;
-            SetInterceptRule(FloatingWindowInterceptor.InterceptType.HiteAnnotationFloating, ToggleSwitchHiteAnnotationFloating.IsOn);
+            var toggle = sender as iNKORE.UI.WPF.Modern.Controls.ToggleSwitch;
+            if (toggle != null) SetInterceptRule(FloatingWindowInterceptor.InterceptType.HiteAnnotationFloating, toggle.IsOn);
         }
 
-        /// <summary>
-        /// 畅言智慧课堂拦截开关
-        /// </summary>
         private void ToggleSwitchChangYanFloating_Toggled(object sender, RoutedEventArgs e)
         {
             if (!isLoaded) return;
-            SetInterceptRule(FloatingWindowInterceptor.InterceptType.ChangYanFloating, ToggleSwitchChangYanFloating.IsOn);
+            var toggle = sender as iNKORE.UI.WPF.Modern.Controls.ToggleSwitch;
+            if (toggle != null) SetInterceptRule(FloatingWindowInterceptor.InterceptType.ChangYanFloating, toggle.IsOn);
         }
 
-        /// <summary>
-        /// 畅言PPT拦截开关
-        /// </summary>
         private void ToggleSwitchChangYanPptFloating_Toggled(object sender, RoutedEventArgs e)
         {
             if (!isLoaded) return;
-            SetInterceptRule(FloatingWindowInterceptor.InterceptType.ChangYanPptFloating, ToggleSwitchChangYanPptFloating.IsOn);
+            var toggle = sender as iNKORE.UI.WPF.Modern.Controls.ToggleSwitch;
+            if (toggle != null) SetInterceptRule(FloatingWindowInterceptor.InterceptType.ChangYanPptFloating, toggle.IsOn);
         }
 
-        /// <summary>
-        /// 天喻教育云拦截开关
-        /// </summary>
         private void ToggleSwitchIntelligentClassFloating_Toggled(object sender, RoutedEventArgs e)
         {
             if (!isLoaded) return;
-            SetInterceptRule(FloatingWindowInterceptor.InterceptType.IntelligentClassFloating, ToggleSwitchIntelligentClassFloating.IsOn);
+            var toggle = sender as iNKORE.UI.WPF.Modern.Controls.ToggleSwitch;
+            if (toggle != null) SetInterceptRule(FloatingWindowInterceptor.InterceptType.IntelligentClassFloating, toggle.IsOn);
         }
 
-        /// <summary>
-        /// 希沃桌面画笔拦截开关
-        /// </summary>
         private void ToggleSwitchSeewoDesktopAnnotationFloating_Toggled(object sender, RoutedEventArgs e)
         {
             if (!isLoaded) return;
-            SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoDesktopAnnotationFloating, ToggleSwitchSeewoDesktopAnnotationFloating.IsOn);
+            var toggle = sender as iNKORE.UI.WPF.Modern.Controls.ToggleSwitch;
+            if (toggle != null) SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoDesktopAnnotationFloating, toggle.IsOn);
         }
 
-        /// <summary>
-        /// 希沃桌面侧栏拦截开关
-        /// </summary>
         private void ToggleSwitchSeewoDesktopSideBarFloating_Toggled(object sender, RoutedEventArgs e)
         {
             if (!isLoaded) return;
-            SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoDesktopSideBarFloating, ToggleSwitchSeewoDesktopSideBarFloating.IsOn);
+            var toggle = sender as iNKORE.UI.WPF.Modern.Controls.ToggleSwitch;
+            if (toggle != null) SetInterceptRule(FloatingWindowInterceptor.InterceptType.SeewoDesktopSideBarFloating, toggle.IsOn);
         }
 
-        /// <summary>
-        /// 设置拦截规则
-        /// </summary>
-        /// <param name="type">拦截类型</param>
-        /// <param name="enabled">是否启用拦截</param>
-        private void SetInterceptRule(FloatingWindowInterceptor.InterceptType type, bool enabled)
+        public void SetInterceptRule(FloatingWindowInterceptor.InterceptType type, bool enabled)
         {
             try
             {
@@ -307,18 +178,15 @@ namespace Ink_Canvas
                     _floatingWindowInterceptorManager.SetInterceptRule(type, enabled);
                 }
 
-                // 更新设置
                 var ruleName = type.ToString();
                 if (Settings.Automation.FloatingWindowInterceptor.InterceptRules.ContainsKey(ruleName))
                 {
                     Settings.Automation.FloatingWindowInterceptor.InterceptRules[ruleName] = enabled;
                 }
 
-                // 获取规则信息以处理父子关系
                 var rule = _floatingWindowInterceptorManager?.GetInterceptRule(type);
                 if (rule != null)
                 {
-                    // 如果是父规则，更新所有子规则的设置
                     if (rule.ChildTypes.Count > 0)
                     {
                         foreach (var childType in rule.ChildTypes)
@@ -330,7 +198,6 @@ namespace Ink_Canvas
                             }
                         }
                     }
-                    // 如果是子规则，更新父规则的设置
                     else if (rule.ParentType.HasValue)
                     {
                         var parentRule = _floatingWindowInterceptorManager?.GetInterceptRule(rule.ParentType.Value);
@@ -345,9 +212,6 @@ namespace Ink_Canvas
                     }
                 }
 
-                // 更新UI显示
-                UpdateFloatingWindowInterceptorUI();
-
                 SaveSettingsToFile();
             }
             catch (Exception ex)
@@ -357,4 +221,4 @@ namespace Ink_Canvas
         }
         #endregion
     }
-}
+}

Ink Canvas/MainWindow_cs/MW_Hotkeys.cs

@@ -104,8 +104,12 @@ namespace Ink_Canvas
         /// </summary>
         /// <param name="sender">发送者</param>
         /// <param name="e">执行路由事件参数</param>
-        private void KeyChangeToDrawTool(object sender, ExecutedRoutedEventArgs e)
+        private async void KeyChangeToDrawTool(object sender, ExecutedRoutedEventArgs e)
         {
+            if (isFloatingBarFolded)
+            {
+                await UnFoldFloatingBar(new object());
+            }
             PenIcon_Click(lastBorderMouseDownObject, null);
         }
 
@@ -150,15 +154,17 @@ namespace Ink_Canvas
         /// <param name="sender">发送者</param>
         /// <param name="e">执行路由事件参数</param>
         /// <remarks>仅当画布控件面板可见时生效，根据当前橡皮擦状态选择相应的橡皮擦模式</remarks>
-        private void KeyChangeToEraser(object sender, ExecutedRoutedEventArgs e)
+        private async void KeyChangeToEraser(object sender, ExecutedRoutedEventArgs e)
         {
-            if (StackPanelCanvasControls.Visibility == Visibility.Visible)
+            if (isFloatingBarFolded)
             {
-                if (Eraser_Icon.Background != null)
-                    EraserIconByStrokes_Click(lastBorderMouseDownObject, null);
-                else
-                    EraserIcon_Click(lastBorderMouseDownObject, null);
+                await UnFoldFloatingBar(new object());
             }
+
+            if (Eraser_Icon.Background != null)
+                EraserIconByStrokes_Click(lastBorderMouseDownObject, null);
+            else
+                EraserIcon_Click(lastBorderMouseDownObject, null);
         }
 
         /// <summary>

Ink Canvas/MainWindow_cs/MW_Icons.cs

@@ -176,5 +176,65 @@ namespace Ink_Canvas
         /// <remarks>老版浮动栏中用于表示套索选择工具的图标</remarks>
         public static string LegacySolidLassoSelectIcon =
             "F1 M24,24z M0,0z M14.6618,10.9193C14.4981,10.784 14.2733,10.6788 14.0025,10.6788 13.9951,10.6788 13.9877,10.6789 13.9803,10.6791 13.7083,10.6872 13.4502,10.8008 13.2607,10.9961 13.0712,11.1913 12.9653,11.4526 12.9653,11.7246L12.9653,20.3314C12.9653,20.3403 12.9655,20.3491 12.9658,20.358 12.9734,20.5733 13.0468,20.7811 13.176,20.9534 13.3053,21.1258 13.4842,21.2544 13.6888,21.3219 13.765,21.3471 13.8447,21.36 13.925,21.36L14.0025,21.36C14.1661,21.36 14.3276,21.3218 14.474,21.2486 14.6204,21.1754 14.7477,21.0692 14.8459,20.9382 14.8542,20.9272 14.8622,20.9159 14.8698,20.9045L16.8582,17.9258 20.3145,17.9258C20.5287,17.9281 20.7384,17.8641 20.9149,17.7424 21.0941,17.6187 21.2299,17.4417 21.3029,17.2365 21.3759,17.0313 21.3825,16.8084 21.3217,16.5993 21.262,16.3936 21.14,16.2117 20.9729,16.0782L14.6618,10.9193z M8.14548,20.0044C7.70454,19.6737 7.34665,19.2448 7.10016,18.7519 6.94658,18.4447 6.83888,18.1179 6.7795,17.7818 7.131,17.6605 7.45404,17.4604 7.72196,17.1924 7.74959,17.1648 7.77649,17.1366 7.80267,17.1078 8.5567,17.4118 9.3392,17.6365 10.1444,17.7694 10.5548,17.8372 10.9424,17.5594 11.0101,17.149 11.0779,16.7387 10.8001,16.3511 10.3897,16.2833 9.72172,16.1731 9.06686,15.9883 8.42926,15.7362 8.44084,15.6393 8.44672,15.5413 8.44672,15.4427 8.44672,14.7865 8.18602,14.1571 7.72196,13.693 7.25791,13.229 6.62852,12.9682 5.97224,12.9682 5.65536,12.9682 5.34474,13.029 5.05598,13.1441 4.47073,12.3026 4.15196,11.303 4.14328,10.2756 4.14532,7.03688 7.49758,4.1462 11.9971,4.1462 16.4941,4.1462 19.8451,7.03371 19.8508,10.2703 19.8388,10.7807 19.7549,11.2869 19.6016,11.7739 19.4767,12.1706 19.697,12.5934 20.0938,12.7183 20.4905,12.8432 20.9134,12.6228 21.0383,12.2261 21.2351,11.6008 21.3424,10.9507 21.3568,10.2952L21.357,10.2786C21.357,5.91009 16.9982,2.64 11.9971,2.64 6.9959,2.64 2.63705,5.91009 2.63705,10.2786L2.6371,10.2845C2.6479,11.6579 3.08647,12.993 3.89074,14.1047 3.63615,14.5007 3.49777,14.9646 3.49777,15.4427 3.49777,16.099 3.75847,16.7284 4.22252,17.1924 4.51465,17.4846 4.87229,17.6961 5.26092,17.8128 5.33333,18.3726 5.49917,18.9178 5.75297,19.4255 6.10404,20.1276 6.61375,20.7383 7.24176,21.2093 7.5745,21.4589 8.04654,21.3915 8.2961,21.0587 8.54566,20.726 8.47822,20.2539 8.14548,20.0044z";
+        public static string FoldIcon =
+            "F1 M24,24z M0,0z M19.1634,15.0537C18.9999,15.0537 18.8278,15.0021 18.6902,14.8902 18.3632,14.6321 18.3116,14.1589 18.5783,13.832 19.0343,13.2642 19.4387,12.6447 19.7656,11.9909 19.172,10.8208 16.763,6.72556 11.9967,6.72556 11.6612,6.72556 11.3256,6.75137 10.9987,6.78579 10.5943,6.83741 10.2072,6.54489 10.1556,6.13193 10.1039,5.71896 10.3965,5.34041 10.8094,5.28879 11.1966,5.23717 11.5923,5.21136 11.9967,5.21136 18.4407,5.21136 21.1766,11.423 21.297,11.6897 21.383,11.8876 21.3744,12.1113 21.2884,12.3006 20.8754,13.1781 20.3592,14.0041 19.757,14.7612 19.6107,14.9418 19.387,15.0451 19.172,15.0451L19.1634,15.0537z M10.689,15.1483C11.0847,15.3118,11.5063,15.3892,11.9365,15.3892L11.9451,15.4064 12.0053,15.4064C12.4613,15.3978 12.8915,15.2946 13.3044,15.1139 13.4763,15.0387 13.6392,14.9486 13.7931,14.8455L15.4197,16.472 16.533,17.5854 20.0753,21.1277C20.2216,21.2826,20.4195,21.3514,20.6087,21.3514L20.6001,21.36C20.7894,21.36 20.9873,21.2826 21.1335,21.1363 21.4261,20.8438 21.4261,20.362 21.1335,20.0695L3.92668,2.86262C3.63416,2.5615 3.16958,2.57011 2.86846,2.86262 2.56734,3.15514 2.56734,3.62833 2.86846,3.92085L6.21371,7.2661C4.72738,8.44444 3.5311,9.95577 2.71359,11.6725 2.62756,11.8704 2.61896,12.0941 2.70499,12.292 2.81684,12.5587 5.55273,18.7704 12.0053,18.7704L12.0311,18.7704C13.6161,18.7704,15.1606,18.3654,16.533,17.5854L15.4197,16.472C14.3708,16.9906,13.2144,17.2648,12.0311,17.2648L12.0053,17.2648C7.239,17.2648 4.83004,13.1695 4.2364,11.9995 4.96897,10.5725 6.01289,9.32147 7.29011,8.3425L9.15767,10.2101C9.05523,10.3645 8.96629,10.5279 8.89086,10.7003 8.71018,11.1133 8.60694,11.5521 8.60694,11.9995 8.59834,12.4468 8.67577,12.8856 8.84784,13.3072 9.0113,13.7288 9.26081,14.0987 9.57913,14.417 9.89746,14.7354 10.2674,14.9763 10.689,15.1483z";
+        public static string DeleteIcon =
+            "F1 M24,24z M0,0z M8.53333,2.37333L7.92,4.21333 2.56,4.21333C2.4,4.21333 2.26667,4.27556 2.16,4.4 2.05333,4.50667 2,4.63111 2,4.77333L2,5.89333C2,6.03556 2.05333,6.16889 2.16,6.29333 2.26667,6.4 2.4,6.45333 2.56,6.45333L21.44,6.45333C21.6,6.45333 21.7333,6.4 21.84,6.29333 21.9467,6.16889 22,6.03556 22,5.89333L22,4.77333C22,4.63111 21.9467,4.50667 21.84,4.4 21.7333,4.27556 21.6,4.21333 21.44,4.21333L16.08,4.21333 15.4667,2.37333C15.4311,2.26667 15.36,2.17778 15.2533,2.10667 15.1644,2.03556 15.0578,2 14.9333,2L9.06667,2C8.94222,2 8.82667,2.03556 8.72,2.10667 8.63111,2.17778 8.56889,2.26667 8.53333,2.37333z M19.7867,8.10667L18.7467,20.9867C18.7111,21.2711 18.5867,21.5111 18.3733,21.7067 18.1778,21.9022 17.9378,22 17.6533,22L6.37333,22C6.08889,22 5.84,21.9022 5.62667,21.7067 5.41333,21.5111 5.28889,21.2711 5.25333,20.9867L4.21333,8.10667 19.7867,8.10667z M8.66667,12.56L8.66667,16.9867C8.66667,17.1467 8.72,17.28 8.82667,17.3867 8.93333,17.4933 9.06667,17.5467 9.22667,17.5467L9.78667,17.5467C9.92889,17.5467 10.0533,17.4933 10.16,17.3867 10.2844,17.28 10.3467,17.1467 10.3467,16.9867L10.3467,12.56C10.3467,12.4 10.2844,12.2667 10.16,12.16 10.0533,12.0533 9.92889,12 9.78667,12L9.22667,12C9.06667,12 8.93333,12.0533 8.82667,12.16 8.72,12.2667 8.66667,12.4 8.66667,12.56z M14.2133,12C14.0711,12 13.9467,12.0533 13.84,12.16 13.7333,12.2667 13.68,12.4 13.68,12.56L13.68,16.9867C13.68,17.1467 13.7333,17.28 13.84,17.3867 13.9467,17.4933 14.0711,17.5467 14.2133,17.5467L14.7733,17.5467C14.9333,17.5467 15.0667,17.4933 15.1733,17.3867 15.28,17.28 15.3333,17.1467 15.3333,16.9867L15.3333,12.56C15.3333,12.4 15.28,12.2667 15.1733,12.16 15.0667,12.0533 14.9333,12 14.7733,12L14.2133,12z";
+        public static string ShapesIcon =
+            "F1 M24,24z M0,0z M8.7269,2.9067C8.84872,2.70875 9.00852,2.57931 9.20647,2.5184 9.41966,2.44227 9.62541,2.43465 9.82337,2.49556 10.0365,2.55647 10.2039,2.67829 10.3257,2.86102L13.9118,8.13731C12.9068,8.47231 12.0084,8.99766 11.2165,9.71334 10.4247,10.4138 9.8157,11.2513 9.38933,12.2259 8.93251,13.2156 8.70413,14.2587 8.70413,15.3551L8.7269,15.9946 2.46851,15.9946C2.22487,15.9946 2.01158,15.9185 1.82885,15.7662 1.66135,15.614 1.55481,15.4236 1.50913,15.1952 1.47868,14.9668 1.5244,14.746 1.64622,14.5328L8.7269,2.9067z M16.3329,21.545C15.2061,21.545 14.1632,21.2633 13.2038,20.6999 12.275,20.1517 11.5288,19.4056 10.9654,18.4615 10.4172,17.5022 10.1431,16.4667 10.1431,15.3551 10.1431,14.2283 10.4172,13.1928 10.9654,12.2487 11.5288,11.3046 12.2825,10.5585 13.2266,10.0103 14.1707,9.44687 15.1986,9.16516 16.3102,9.16516 17.437,9.16516 18.4724,9.44687 19.4165,10.0103 20.3606,10.5585 21.1068,11.3046 21.6549,12.2487 22.2184,13.1928 22.5,14.2283 22.5,15.3551 22.5,16.4667 22.2184,17.5022 21.6549,18.4615 21.1068,19.4056 20.3683,20.1517 19.4395,20.6999 18.4801,21.2633 17.4445,21.545 16.3329,21.545z";
+        public static string UndoIcon =
+            "F1 M24,24z M0,0z M10.3344,5.02734L10.3605,8.62849C12.2431,8.87029 14.0305,9.44026 15.7232,10.3384 17.4676,11.2538 18.9187,12.4196 20.0759,13.8359 21.3367,15.3731 22.1398,17.0657 22.4852,18.9138 22.5197,19.1211 22.4938,19.3197 22.4075,19.5097 22.3211,19.6997 22.2003,19.8292 22.0448,19.8983 21.8894,19.9501 21.7423,19.9069 21.6042,19.7687 20.7579,18.8361 19.6268,17.9984 18.2105,17.2557 16.9324,16.5821 15.5591,16.0553 14.091,15.6754 12.7093,15.3126 11.4659,15.1313 10.3605,15.1313L10.3344,18.862C10.3344,19.2938 10.2395,19.6047 10.0495,19.7947 9.8941,19.9501 9.69547,20.0106 9.45367,19.976 9.21187,19.9242 8.99586,19.8119 8.80587,19.6392 8.14955,18.9829 6.90606,17.7739 5.07526,16.0121 3.46899,14.475 2.41544,13.4559 1.91456,12.9551 1.63821,12.6787 1.5,12.3678 1.5,12.0224 1.51727,11.6769 1.67272,11.3574 1.96634,11.0638 4.02168,9.00847 6.3103,6.73724 8.83197,4.25011 9.00468,4.07739 9.20331,3.99967 9.42784,4.01694 9.66965,4.01694 9.87683,4.11194 10.0495,4.30193 10.2395,4.47464 10.3344,4.71645 10.3344,5.02734z";
+        public static string RedoIcon =
+            "F1 M24,24z M0,0z M13.6656,5.02734L13.6395,8.62849C11.7569,8.87029 9.96948,9.44026 8.27685,10.3384 6.5324,11.2538 5.08134,12.4196 3.92413,13.8359 2.6633,15.3731 1.86023,17.0657 1.5148,18.9138 1.48026,19.1211 1.50619,19.3197 1.59255,19.5097 1.6789,19.6997 1.79974,19.8292 1.95518,19.8983 2.11063,19.9501 2.25766,19.9069 2.39583,19.7687 3.24215,18.8361 4.37323,17.9984 5.78951,17.2557 7.06761,16.5821 8.44089,16.0553 9.90899,15.6754 11.2907,15.3126 12.5341,15.1313 13.6395,15.1313L13.6656,18.862C13.6656,19.2938 13.7605,19.6047 13.9505,19.7947 14.1059,19.9501 14.3045,20.0106 14.5463,19.976 14.7881,19.9242 15.0041,19.8119 15.1941,19.6392 15.8505,18.9829 17.0939,17.7739 18.9247,16.0121 20.531,14.475 21.5846,13.4559 22.0854,12.9551 22.3618,12.6787 22.5,12.3678 22.5,12.0224 22.4827,11.6769 22.3273,11.3574 22.0337,11.0638 19.9783,9.00847 17.6897,6.73724 15.168,4.25011 14.9953,4.07739 14.7967,3.99967 14.5722,4.01694 14.3304,4.01694 14.1232,4.11194 13.9505,4.30193 13.7605,4.47464 13.6656,4.71645 13.6656,5.02734z";
+        /// <summary>
+        /// 鼠并清
+        /// </summary>
+        public static string CursorWithDelFloatingBarBtnIcon =
+            "F0 M24,24z M0,0z M11.5007,11.0214C11.5007,10.674,11.7823,10.3923,12.1298,10.3923L14.2967,10.3923 14.2967,9.90299C14.2967,9.41878 14.5325,8.98723 14.8305,8.68924 15.1285,8.39124 15.56,8.15547 16.0442,8.15547L18.281,8.15547C18.7652,8.15547 19.1968,8.39124 19.4948,8.68924 19.7928,8.98723 20.0286,9.41878 20.0286,9.90299L20.0286,10.3923 22.1955,10.3923C22.5429,10.3923 22.8246,10.674 22.8246,11.0214 22.8246,11.3688 22.5429,11.6505 22.1955,11.6505L21.7062,11.6505 21.7062,18.8503C21.7062,19.3345 21.4704,19.766 21.1724,20.064 20.8744,20.362 20.4429,20.5978 19.9587,20.5978L14.3666,20.5978C13.8824,20.5978 13.4508,20.362 13.1528,20.064 12.8549,19.766 12.6191,19.3345 12.6191,18.8503L12.6191,11.6505 12.1298,11.6505C11.7823,11.6505,11.5007,11.3688,11.5007,11.0214z M14.0425,19.1743C13.9211,19.0529,13.8773,18.9253,13.8773,18.8503L13.8773,11.6505 20.448,11.6505 20.448,18.8503C20.448,18.9253 20.4041,19.0529 20.2827,19.1743 20.1613,19.2958 20.0337,19.3396 19.9587,19.3396L14.3666,19.3396C14.2916,19.3396,14.1639,19.2958,14.0425,19.1743z M15.5549,9.90299C15.5549,9.82799 15.5987,9.70034 15.7202,9.57893 15.8416,9.45752 15.9692,9.41368 16.0442,9.41368L18.281,9.41368C18.356,9.41368 18.4837,9.45752 18.6051,9.57893 18.7265,9.70034 18.7703,9.82799 18.7703,9.90299L18.7703,10.3923 15.5549,10.3923 15.5549,9.90299z M18.9101,13.8174C18.9101,13.47 18.6285,13.1883 18.281,13.1883 17.9336,13.1883 17.6519,13.47 17.6519,13.8174L17.6519,17.1727C17.6519,17.5201 17.9336,17.8018 18.281,17.8018 18.6285,17.8018 18.9101,17.5201 18.9101,17.1727L18.9101,13.8174z M16.6733,13.8174C16.6733,13.47 16.3917,13.1883 16.0442,13.1883 15.6968,13.1883 15.4151,13.47 15.4151,13.8174L15.4151,17.1727C15.4151,17.5201 15.6968,17.8018 16.0442,17.8018 16.3917,17.8018 16.6733,17.5201 16.6733,17.1727L16.6733,13.8174z M1.32567,3.55246C1.47265,3.40549,1.69379,3.36174,1.88566,3.44167L11.8342,7.58639C12.0311,7.66845 12.1567,7.86389 12.1495,8.07716 12.1424,8.29043 12.0039,8.47698 11.8018,8.54561L8.25047,9.75183 11.4309,12.9323C11.6313,13.1326 11.6313,13.4574 11.4309,13.6577 11.2306,13.8581 10.9058,13.8581 10.7055,13.6577L7.52503,10.4773 6.31881,14.0286C6.25019,14.2307 6.06364,14.3692 5.85037,14.3763 5.6371,14.3835 5.44166,14.2579 5.3596,14.0609L1.21488,4.11245C1.13494,3.92058,1.1787,3.69944,1.32567,3.55246z";
+        /// <summary>
+        /// 白板
+        /// </summary>
+        public static string WhiteboardFloatingBarBtnIcon =
+            "F0 M24,24z M0,0z M5,5.875C4.70163,5.875 4.41548,5.99353 4.2045,6.2045 3.99353,6.41548 3.875,6.70163 3.875,7L3.875,17C3.875,17.2984 3.99353,17.5845 4.2045,17.7955 4.41548,18.0065 4.70163,18.125 5,18.125L8,18.125C8.48325,18.125 8.875,18.5168 8.875,19 8.875,19.4832 8.48325,19.875 8,19.875L5,19.875C4.2375,19.875 3.50623,19.5721 2.96707,19.0329 2.4279,18.4938 2.125,17.7625 2.125,17L2.125,7C2.125,6.2375 2.4279,5.50624 2.96707,4.96707 3.50624,4.4279 4.2375,4.125 5,4.125L19,4.125C19.7625,4.125 20.4938,4.4279 21.0329,4.96707 21.5721,5.50623 21.875,6.2375 21.875,7L21.875,18C21.875,18.4973 21.6775,18.9742 21.3258,19.3258 20.9742,19.6775 20.4973,19.875 20,19.875 19.5168,19.875 19.125,19.4832 19.125,19 19.125,18.5168 19.5168,18.125 20,18.125 20.0332,18.125 20.0649,18.1118 20.0884,18.0884 20.1118,18.0649 20.125,18.0332 20.125,18L20.125,7C20.125,6.70163 20.0065,6.41548 19.7955,6.2045 19.5845,5.99353 19.2984,5.875 19,5.875L5,5.875z M10.6742,15.6742C11.0258,15.3225,11.5027,15.125,12,15.125L16,15.125C16.4973,15.125 16.9742,15.3225 17.3258,15.6742 17.6775,16.0258 17.875,16.5027 17.875,17L17.875,18C17.875,18.4973 17.6775,18.9742 17.3258,19.3258 16.9742,19.6775 16.4973,19.875 16,19.875L12,19.875C11.5027,19.875 11.0258,19.6775 10.6742,19.3258 10.3225,18.9742 10.125,18.4973 10.125,18L10.125,17C10.125,16.5027,10.3225,16.0258,10.6742,15.6742z";
+        public static string ToolsFloatingBarBtnIcon =
+            "F0 M24,24z M0,0z M4.41721,4.29873C4.35178,4.29873,4.29873,4.35178,4.29873,4.41721L4.29873,9.15646C4.29873,9.22189,4.35178,9.27494,4.41721,9.27494L9.15646,9.27494C9.22189,9.27494,9.27494,9.22189,9.27494,9.15646L9.27494,4.41721C9.27494,4.35178,9.22189,4.29873,9.15646,4.29873L4.41721,4.29873z M2.64,4.41721C2.64,3.43569,3.43569,2.64,4.41721,2.64L9.15646,2.64C10.138,2.64,10.9337,3.43569,10.9337,4.41721L10.9337,9.15646C10.9337,10.138,10.138,10.9337,9.15646,10.9337L4.41721,10.9337C3.43569,10.9337,2.64,10.138,2.64,9.15646L2.64,4.41721z M14.8435,4.29873C14.7781,4.29873,14.7251,4.35178,14.7251,4.41721L14.7251,9.15646C14.7251,9.22189,14.7781,9.27494,14.8435,9.27494L19.5828,9.27494C19.6482,9.27494,19.7013,9.22189,19.7013,9.15646L19.7013,4.41721C19.7013,4.35178,19.6482,4.29873,19.5828,4.29873L14.8435,4.29873z M13.0663,4.41721C13.0663,3.43569,13.862,2.64,14.8435,2.64L19.5828,2.64C20.5643,2.64,21.36,3.43569,21.36,4.41721L21.36,9.15646C21.36,10.138,20.5643,10.9337,19.5828,10.9337L14.8435,10.9337C13.862,10.9337,13.0663,10.138,13.0663,9.15646L13.0663,4.41721z M14.8435,14.7251C14.7781,14.7251,14.7251,14.7781,14.7251,14.8435L14.7251,19.5828C14.7251,19.6482,14.7781,19.7013,14.8435,19.7013L19.5828,19.7013C19.6482,19.7013,19.7013,19.6482,19.7013,19.5828L19.7013,14.8435C19.7013,14.7781,19.6482,14.7251,19.5828,14.7251L14.8435,14.7251z M13.0663,14.8435C13.0663,13.862,13.862,13.0663,14.8435,13.0663L19.5828,13.0663C20.5643,13.0663,21.36,13.862,21.36,14.8435L21.36,19.5828C21.36,20.5643,20.5643,21.36,19.5828,21.36L14.8435,21.36C13.862,21.36,13.0663,20.5643,13.0663,19.5828L13.0663,14.8435z M4.41721,14.7251C4.35178,14.7251,4.29873,14.7781,4.29873,14.8435L4.29873,19.5828C4.29873,19.6482,4.35178,19.7013,4.41721,19.7013L9.15646,19.7013C9.22189,19.7013,9.27494,19.6482,9.27494,19.5828L9.27494,14.8435C9.27494,14.7781,9.22189,14.7251,9.15646,14.7251L4.41721,14.7251z M2.64,14.8435C2.64,13.862,3.43569,13.0663,4.41721,13.0663L9.15646,13.0663C10.138,13.0663,10.9337,13.862,10.9337,14.8435L10.9337,19.5828C10.9337,20.5643,10.138,21.36,9.15646,21.36L4.41721,21.36C3.43569,21.36,2.64,20.5643,2.64,19.5828L2.64,14.8435z";
+
+        public static string ClipGeometry24x24 = "M0,0 V24 H24 V0 H0 Z";
+
+        public static string ClearInkIconGeometry = "F0 M24,24z M0,0z M10.1573,10.0421C10.7298,10.0421,11.1938,10.5062,11.1938,11.0787L11.1938,16.6067C11.1938,17.1792,10.7298,17.6433,10.1573,17.6433,9.58485,17.6433,9.12079,17.1792,9.12079,16.6067L9.12079,11.0787C9.12079,10.5062,9.58485,10.0421,10.1573,10.0421z M13.8427,10.0421C14.4151,10.0421,14.8792,10.5062,14.8792,11.0787L14.8792,16.6067C14.8792,17.1792,14.4151,17.6433,13.8427,17.6433,13.2702,17.6433,12.8062,17.1792,12.8062,16.6067L12.8062,11.0787C12.8062,10.5062,13.2702,10.0421,13.8427,10.0421z M3.70787,5.43539C3.13541,5.43539,2.67135,5.89946,2.67135,6.47191,2.67135,7.04436,3.13541,7.50843,3.70787,7.50843L4.51405,7.50843,4.51405,19.3708C4.51405,20.1686,4.9025,20.8796,5.39348,21.3706,5.88445,21.8615,6.59548,22.25,7.39326,22.25L16.6067,22.25C17.4045,22.25,18.1155,21.8615,18.6065,21.3706,19.0975,20.8796,19.486,20.1686,19.486,19.3708L19.486,7.50843,20.2921,7.50843C20.8646,7.50843,21.3287,7.04436,21.3287,6.47191,21.3287,5.89946,20.8646,5.43539,20.2921,5.43539L16.7219,5.43539,16.7219,4.62921C16.7219,3.83143,16.3335,3.12041,15.8425,2.62943,15.3515,2.13845,14.6405,1.75,13.8427,1.75L10.1573,1.75C9.35952,1.75,8.6485,2.13845,8.15752,2.62943,7.66654,3.12041,7.27809,3.83143,7.27809,4.62921L7.27809,5.43539,3.70787,5.43539z M6.58708,19.3708C6.58708,19.4944,6.6593,19.7047,6.85933,19.9047,7.05937,20.1047,7.26969,20.177,7.39326,20.177L16.6067,20.177C16.7303,20.177,16.9406,20.1047,17.1407,19.9047,17.3407,19.7047,17.4129,19.4944,17.4129,19.3708L17.4129,7.50843,6.58708,7.50843,6.58708,19.3708z M9.62338,4.09529C9.42334,4.29532,9.35112,4.50565,9.35112,4.62921L9.35112,5.43539,14.6489,5.43539,14.6489,4.62921C14.6489,4.50565,14.5767,4.29532,14.3766,4.09529,14.1766,3.89525,13.9663,3.82303,13.8427,3.82303L10.1573,3.82303C10.0337,3.82303,9.82341,3.89525,9.62338,4.09529z";
+
+        public static string TimerIconGeometry = "F0 M24,24z M0,0z M12,3C11.7613,3,11.5324,3.09482,11.3636,3.2636,11.1948,3.43239,11.1,3.6613,11.1,3.9L11.1,6.6C11.1,7.09705,11.5029,7.5,12,7.5,12.4971,7.5,12.9,7.09705,12.9,6.6L12.9,4.85646C14.3196,5.0353,15.6613,5.63436,16.7472,6.58675,18.0606,7.73848,18.9104,9.32838,19.1384,11.0602,19.3664,12.792,18.957,14.5477,17.9865,16.0001,17.0162,17.4525,15.5508,18.5026,13.8635,18.9547,12.1762,19.4067,10.3822,19.2301,8.81552,18.4575,7.24888,17.6849,6.01653,16.3691,5.34806,14.7554,4.67961,13.1415,4.62062,11.3397,5.1821,9.68563,5.49617,8.76044,5.99235,7.91676,6.63344,7.2,6.96481,6.8295,6.93309,6.26054,6.5626,5.92917,6.19212,5.59781,5.62315,5.62952,5.29179,6.00001,4.49049,6.8959,3.87021,7.95054,3.47763,9.10704,2.77577,11.1746,2.84951,13.4269,3.68509,15.4441,4.52067,17.4614,6.0611,19.1061,8.0194,20.0718,9.97769,21.0375,12.2203,21.2585,14.3294,20.6933,16.4384,20.1282,18.2701,18.8156,19.4832,17.0001,20.6963,15.1847,21.208,12.9901,20.923,10.8252,20.638,8.66047,19.5758,6.67311,17.9341,5.23344,16.2925,3.79377,14.1835,3,12,3z M9.0364,7.7636C8.68492,7.41213,8.11508,7.41213,7.7636,7.7636,7.41213,8.11508,7.41213,8.68492,7.7636,9.0364L10.2609,11.5338C10.2212,11.6825,10.2,11.8387,10.2,12,10.2,12.9941,11.0059,13.8,12,13.8,12.9941,13.8,13.8,12.9941,13.8,12,13.8,11.0059,12.9941,10.2,12,10.2,11.8387,10.2,11.6825,10.2212,11.5338,10.2609L9.0364,7.7636z";
+
+        public static string RandomDrawIconGeometry = "F0 M24,24z M0,0z M15.9475,4.75965C15.7358,5.18305,15.9074,5.69791,16.3308,5.90961L16.9034,6.19589C14.0673,6.82039,11.7039,8.89176,10.7582,11.729,9.8511,14.4502,7.3045,16.2857,4.43608,16.2857L3.85713,16.2857C3.38376,16.2857,3,16.6694,3,17.1428,3,17.6162,3.38376,17.9999,3.85713,17.9999L4.43608,17.9999C8.04237,17.9999,11.2441,15.6923,12.3845,12.271,13.2915,9.54985,15.8381,7.71436,18.7066,7.71436L20.124,7.71436C20.1661,7.71524,20.208,7.71301,20.2494,7.70777,20.4903,7.67729,20.7143,7.54515,20.8554,7.33338,20.9116,7.24952,20.9533,7.15519,20.9771,7.05396,21.001,6.95301,21.0059,6.85024,20.9932,6.75036,20.9627,6.50938,20.8304,6.28523,20.6184,6.14418,20.5838,6.12101,20.5474,6.1003,20.5094,6.08229L17.0974,4.37632C16.674,4.16462,16.1592,4.33624,15.9475,4.75965z M20.8557,16.667C20.9116,16.7507,20.9533,16.8447,20.977,16.9456,21.001,17.0467,21.0059,17.1497,20.9932,17.2498,20.9626,17.4908,20.8303,17.7148,20.6185,17.8558,20.5838,17.8791,20.5474,17.8997,20.5094,17.9177L17.0975,19.6237C16.674,19.8354,16.1592,19.6638,15.9475,19.2404,15.7358,18.817,15.9074,18.3022,16.3308,18.0904L17.0491,17.7313C15.7728,17.4079,14.5941,16.8029,13.5952,15.9737,13.231,15.6713,13.1809,15.1308,13.4833,14.7667,13.7857,14.4025,14.3261,14.3523,14.6903,14.6547,15.9326,15.6862,17.5188,16.2857,19.2067,16.2857L20.1241,16.2857C20.1662,16.2848,20.2081,16.287,20.2495,16.2923,20.4905,16.3228,20.7146,16.455,20.8557,16.667z M3,6.85722C3,6.38384,3.38376,6.00009,3.85713,6.00009L4.36455,6.00009C6.25231,6.00009,8.03834,6.60414,9.50119,7.6588,9.88517,7.93565,9.972,8.47136,9.69519,8.85534,9.41835,9.23934,8.88264,9.32619,8.49866,9.04935,7.32072,8.2001,5.88391,7.71436,4.36455,7.71436L3.85713,7.71436C3.38376,7.71436,3,7.3306,3,6.85722z";
+
+        public static string SingleDrawIconGeometry = "F0 M24,24z M0,0z M3.9,9.3C4.39706,9.3,4.8,8.89706,4.8,8.4L4.8,4.8,8.4,4.8C8.89705,4.8,9.3,4.39706,9.3,3.9,9.3,3.40295,8.89705,3,8.4,3L3.9,3C3.6613,3,3.43239,3.09482,3.2636,3.2636,3.09482,3.43239,3,3.6613,3,3.9L3,8.4C3,8.89706,3.40295,9.3,3.9,9.3z M3.9,14.7C4.39706,14.7,4.8,15.1029,4.8,15.6L4.8,19.2,8.4,19.2C8.89705,19.2,9.3,19.6029,9.3,20.1,9.3,20.5971,8.89705,21,8.4,21L3.9,21C3.6613,21,3.43239,20.9051,3.2636,20.7364,3.09482,20.5676,3,20.3387,3,20.1L3,15.6C3,15.1029,3.40295,14.7,3.9,14.7z M20.1,9.3C19.6029,9.3,19.2,8.89706,19.2,8.4L19.2,4.8,15.6,4.8C15.1029,4.8,14.7,4.39706,14.7,3.9,14.7,3.40295,15.1029,3,15.6,3L20.1,3C20.3387,3,20.5676,3.09482,20.7364,3.2636,20.9051,3.43239,21,3.6613,21,3.9L21,8.4C21,8.89706,20.5971,9.3,20.1,9.3z M20.1,14.7C19.6029,14.7,19.2,15.1029,19.2,15.6L19.2,19.2,15.6,19.2C15.1029,19.2,14.7,19.6029,14.7,20.1,14.7,20.5971,15.1029,21,15.6,21L20.1,21C20.3387,21,20.5676,20.9051,20.7364,20.7364,20.9051,20.5676,21,20.3387,21,20.1L21,15.6C21,15.1029,20.5971,14.7,20.1,14.7z M8.4,10.2C8.4,8.21177,10.0118,6.6,12,6.6,13.9882,6.6,15.6,8.21177,15.6,10.2,15.6,12.1882,13.9882,13.8,12,13.8,10.0118,13.8,8.4,12.1882,8.4,10.2z M12,8.4C11.0059,8.4,10.2,9.20589,10.2,10.2,10.2,11.1941,11.0059,12,12,12,12.9941,12,13.8,11.1941,13.8,10.2,13.8,9.20589,12.9941,8.4,12,8.4z M7.5,16.5C7.5,16.0029,7.90295,15.6,8.4,15.6L15.6,15.6C16.0971,15.6,16.5,16.0029,16.5,16.5,16.5,16.9971,16.0971,17.4,15.6,17.4L8.4,17.4C7.90295,17.4,7.5,16.9971,7.5,16.5z";
+
+        public static string SaveIconGeometry = "F0 M24,24z M0,0z M6,5C5.73478,5,5.48043,5.10536,5.29289,5.29289,5.10536,5.48043,5,5.73478,5,6L5,18C5,18.2652,5.10536,18.5196,5.29289,18.7071,5.48043,18.8946,5.73478,19,6,19L18,19C18.2652,19,18.5196,18.8946,18.7071,18.7071,18.8946,18.5196,19,18.2652,19,18L19,8.41421,15.5858,5,15,5,15,8C15,8.55228,14.5523,9,14,9L8,9C7.44772,9,7,8.55228,7,8L7,5,6,5z M8,3L6,3C5.20435,3,4.44129,3.31607,3.87868,3.87868,3.31607,4.44129,3,5.20435,3,6L3,18C3,18.7956,3.31607,19.5587,3.87868,20.1213,4.44129,20.6839,5.20435,21,6,21L18,21C18.7957,21,19.5587,20.6839,20.1213,20.1213,20.6839,19.5587,21,18.7957,21,18L21,8C21,7.73478,20.8946,7.48043,20.7071,7.29289L16.7071,3.29289C16.5196,3.10536,16.2652,3,16,3L14,3,8,3z M9,5L9,7,13,7,13,5,9,5z M9.87868,11.8787C10.4413,11.3161,11.2043,11,12,11,12.7957,11,13.5587,11.3161,14.1213,11.8787,14.6839,12.4413,15,13.2043,15,14,15,14.7957,14.6839,15.5587,14.1213,16.1213,13.5587,16.6839,12.7957,17,12,17,11.2043,17,10.4413,16.6839,9.87868,16.1213,9.31607,15.5587,9,14.7957,9,14,9,13.2043,9.31607,12.4413,9.87868,11.8787z M12,13C11.7348,13,11.4804,13.1054,11.2929,13.2929,11.1054,13.4804,11,13.7348,11,14,11,14.2652,11.1054,14.5196,11.2929,14.7071,11.4804,14.8946,11.7348,15,12,15,12.2652,15,12.5196,14.8946,12.7071,14.7071,12.8946,14.5196,13,14.2652,13,14,13,13.7348,12.8946,13.4804,12.7071,13.2929,12.5196,13.1054,12.2652,13,12,13z";
+
+        public static string OpenIconGeometry = "F0 M24,24z M0,0z M5,5C4.73478,5,4.48043,5.10536,4.29289,5.29289,4.10536,5.48043,4,5.73478,4,6L4,17C4,17.2652,4.10536,17.5196,4.29289,17.7071,4.32236,17.7366,4.35349,17.764,4.38604,17.7893L6.82062,11.298C6.82065,11.2979,6.8206,11.2981,6.82062,11.298,6.96351,10.9169,7.21932,10.5883,7.55377,10.3564,7.88827,10.1245,8.28558,10.0002,8.69262,10L20,10,20,9C20,8.73478,19.8946,8.48043,19.7071,8.29289,19.5196,8.10536,19.2652,8,19,8L12,8C11.7348,8,11.4804,7.89464,11.2929,7.70711L8.58579,5,5,5z M20.9992,12L8.69338,12,6.44307,18,19.0257,18C19.0258,18,19.0256,18,19.0257,18,19.2583,17.9999,19.4838,17.9187,19.663,17.7705,19.8422,17.6222,19.9641,17.416,20.0077,17.1875L20.9992,12z M22,10.2682C22.1988,10.383,22.3767,10.5315,22.5256,10.7073,22.7133,10.9288,22.8504,11.1885,22.9276,11.4684,23.0048,11.7483,23.0201,12.0416,22.9725,12.328L22.9682,12.3517,21.9723,17.5625C21.8414,18.248,21.4756,18.8665,20.9379,19.3114,20.4002,19.7563,19.7242,19.9998,19.0263,20L5,20C4.20435,20,3.44129,19.6839,2.87868,19.1213,2.31607,18.5587,2,17.7956,2,17L2,6C2,5.20435,2.31607,4.44129,2.87868,3.87868,3.44129,3.31607,4.20435,3,5,3L9,3C9.26522,3,9.51957,3.10536,9.70711,3.29289L12.4142,6,19,6C19.7957,6,20.5587,6.31607,21.1213,6.87868,21.6839,7.44129,22,8.20435,22,9L22,10.2682z";
+
+        public static string ReplayIconGeometry = "F0 M24,24z M0,0z M11,4.99999C11,4.60761,10.7705,4.25149,10.4132,4.08935,10.0559,3.92722,9.63679,3.98903,9.3415,4.24741L1.3415,11.2474C1.12448,11.4373,1,11.7116,1,12,1,12.2883,1.12448,12.5627,1.3415,12.7526L9.3415,19.7526C9.63679,20.0109,10.0559,20.0728,10.4132,19.9106,10.7705,19.7485,11,19.3924,11,19L11,4.99999z M9,16.7962L3.51859,12,9,7.20375,9,16.7962z M22,4.99999C22,4.60761,21.7705,4.25149,21.4132,4.08935,21.0559,3.92722,20.6368,3.98903,20.3415,4.24741L12.3415,11.2474C12.1245,11.4373,12,11.7116,12,12,12,12.2883,12.1245,12.5627,12.3415,12.7526L20.3415,19.7526C20.6368,20.0109,21.0559,20.0728,21.4132,19.9106,21.7705,19.7485,22,19.3924,22,19L22,4.99999z M20,16.7962L14.5186,12,20,7.20375,20,16.7962z";
+
+        public static string ScreenshotIconGeometry = "F0 M24,24z M0,0z M9,3C8.46957,3,7.96086,3.21071,7.58579,3.58579,7.21071,3.96086,7,4.46957,7,5,7,5.26522,6.89464,5.51957,6.70711,5.70711,6.51957,5.89464,6.26522,6,6,6L5,6C4.20435,6,3.44129,6.31607,2.87868,6.87868,2.31607,7.44129,2,8.20435,2,9L2,18C2,18.7956,2.31607,19.5587,2.87868,20.1213,3.44129,20.6839,4.20435,21,5,21L19,21C19.7957,21,20.5587,20.6839,21.1213,20.1213,21.6839,19.5587,22,18.7957,22,18L22,9C22,8.20435,21.6839,7.44129,21.1213,6.87868,20.5587,6.31607,19.7957,6,19,6L18,6C17.7348,6,17.4804,5.89464,17.2929,5.70711,17.1054,5.51957,17,5.26522,17,5,17,4.46957,16.7893,3.96086,16.4142,3.58579,16.0391,3.21071,15.5304,3,15,3L9,3z M9,5L15,5C15,5.79565,15.3161,6.55871,15.8787,7.12132,16.4413,7.68393,17.2044,8,18,8L19,8C19.2652,8,19.5196,8.10536,19.7071,8.29289,19.8946,8.48043,20,8.73478,20,9L20,18C20,18.2652,19.8946,18.5196,19.7071,18.7071,19.5196,18.8946,19.2652,19,19,19L5,19C4.73478,19,4.48043,18.8946,4.29289,18.7071,4.10536,18.5196,4,18.2652,4,18L4,9C4,8.73478,4.10536,8.48043,4.29289,8.29289,4.48043,8.10536,4.73478,8,5,8L6,8C6.79565,8,7.55871,7.68393,8.12132,7.12132,8.68393,6.55871,9,5.79565,9,5z M12,9C10.9391,9,9.92172,9.42143,9.17157,10.1716,8.42143,10.9217,8,11.9391,8,13,8,14.0609,8.42143,15.0783,9.17157,15.8284,9.92172,16.5786,10.9391,17,12,17,13.0609,17,14.0783,16.5786,14.8284,15.8284,15.5786,15.0783,16,14.0609,16,13,16,11.9391,15.5786,10.9217,14.8284,10.1716,14.0783,9.42143,13.0609,9,12,9z M10.5858,11.5858C10.9609,11.2107,11.4696,11,12,11,12.5304,11,13.0391,11.2107,13.4142,11.5858,13.7893,11.9609,14,12.4696,14,13,14,13.5304,13.7893,14.0391,13.4142,14.4142,13.0391,14.7893,12.5304,15,12,15,11.4696,15,10.9609,14.7893,10.5858,14.4142,10.2107,14.0391,10,13.5304,10,13,10,12.4696,10.2107,11.9609,10.5858,11.5858z";
+
+        public static string ManualIconGeometry = "F0 M24,24z M0,0z M8.17317,2.7612C9.38642,2.25866 10.6868,2 12,2 13.3132,2 14.6136,2.25866 15.8268,2.7612 17.0401,3.26375 18.1425,4.00035 19.0711,4.92893 19.9997,5.85752 20.7362,6.95991 21.2388,8.17317 21.7413,9.38642 22,10.6868 22,12 22,13.3132 21.7413,14.6136 21.2388,15.8268 20.7362,17.0401 19.9997,18.1425 19.0711,19.0711 18.1425,19.9997 17.0401,20.7362 15.8268,21.2388 14.6136,21.7413 13.3132,22 12,22 10.6868,22 9.38642,21.7413 8.17317,21.2388 6.95991,20.7362 5.85752,19.9997 4.92893,19.0711 4.00035,18.1425 3.26375,17.0401 2.7612,15.8268 2.25866,14.6136 2,13.3132 2,12 2,10.6868 2.25866,9.38642 2.7612,8.17317 3.26375,6.95991 4.00035,5.85752 4.92893,4.92893 5.85752,4.00035 6.95991,3.26375 8.17317,2.7612z M12,4C10.9494,4 9.90914,4.20693 8.93853,4.60896 7.96793,5.011 7.08601,5.60028 6.34315,6.34315 5.60028,7.08601 5.011,7.96793 4.60896,8.93853 4.20693,9.90914 4,10.9494 4,12 4,13.0506 4.20693,14.0909 4.60896,15.0615 5.011,16.0321 5.60028,16.914 6.34315,17.6569 7.08601,18.3997 7.96793,18.989 8.93853,19.391 9.90914,19.7931 10.9494,20 12,20 13.0506,20 14.0909,19.7931 15.0615,19.391 16.0321,18.989 16.914,18.3997 17.6569,17.6569 18.3997,16.914 18.989,16.0321 19.391,15.0615 19.7931,14.0909 20,13.0506 20,12 20,10.9494 19.7931,9.90914 19.391,8.93853 18.989,7.96793 18.3997,7.08602 17.6569,6.34315 16.914,5.60028 16.0321,5.011 15.0615,4.60896 14.0909,4.20693 13.0506,4 12,4z M12,16C12.5523,16,13,16.4477,13,17L13,17.01C13,17.5623 12.5523,18.01 12,18.01 11.4477,18.01 11,17.5623 11,17.01L11,17C11,16.4477,11.4477,16,12,16z M12.0813,5.97153C11.5241,5.96998 10.9742,6.09779 10.4748,6.3449 9.97535,6.59201 9.54013,6.95167 9.20334,7.39557 8.86952,7.83555 8.95559,8.46284 9.39557,8.79666 9.83555,9.13047 10.4628,9.04441 10.7967,8.60443 10.9463,8.40714 11.1398,8.24729 11.3617,8.13746 11.5837,8.02764 11.8281,7.97083 12.0758,7.97152 12.3234,7.97221 12.5675,8.03037 12.7888,8.14142 13.0102,8.25248 13.2027,8.4134 13.3513,8.61151 13.4999,8.80963 13.6005,9.03953 13.6451,9.28311 13.6897,9.5267 13.6772,9.77732 13.6086,10.0152 13.5399,10.2532 13.4169,10.4719 13.2493,10.6542 13.084,10.8341 12.8798,10.9736 12.6524,11.0623 12.1479,11.2435 11.7149,11.5821 11.4175,12.0283 11.1169,12.4792 10.9709,13.0156 11.0016,13.5566 11.0329,14.108 11.5052,14.5297 12.0566,14.4984 12.608,14.4671 13.0297,13.9948 12.9984,13.4434 12.9923,13.3352 13.0214,13.2279 13.0816,13.1377 13.1417,13.0475 13.2295,12.9793 13.3317,12.9434 13.3403,12.9404 13.3487,12.9373 13.3572,12.934 13.8776,12.735 14.3448,12.4179 14.7218,12.0077 15.0989,11.5974 15.3756,11.1053 15.5301,10.5699 15.6846,10.0346 15.7128,9.47068 15.6124,8.92261 15.5119,8.37454 15.2856,7.85727 14.9513,7.41151 14.617,6.96576 14.1838,6.60369 13.6857,6.35381 13.1877,6.10393 12.6385,5.97307 12.0813,5.97153z";
+
+        public static string SettingsIconGeometry = "F0 M24,24z M0,0z M4.66591,7.13141L11.4017,3.15976C11.5957,3.0552,11.8126,3.00041,12.033,3.00041,12.2534,3.00041,12.4704,3.0552,12.6643,3.15977L19.2182,7.02415C19.2676,7.06721,19.3219,7.10586,19.3806,7.13926,19.5699,7.24687,19.727,7.40296,19.8358,7.59146,19.9447,7.77997,20.0014,7.99407,20,8.21175L20,8.21175,20,8.218,20,15.502C20,15.943,19.7585,16.3548,19.3603,16.5737,19.3424,16.5835,19.3247,16.5939,19.3074,16.6049L12.5874,20.8559C12.4062,20.9506,12.2047,21.0001,12,21.0001,11.7953,21.0001,11.5938,20.9506,11.4126,20.8559L4.69261,16.6049C4.6746,16.5935,4.65624,16.5827,4.63755,16.5725,4.44494,16.4672,4.28416,16.3122,4.172,16.1235,4.05999,15.9351,4.00059,15.72,4,15.5008L4,8.217C4,7.77653,4.24107,7.36544,4.63968,7.14635,4.6485,7.1415,4.65724,7.13652,4.66591,7.13141z M20.4159,5.40859C20.4791,5.44583,20.5369,5.4892,20.589,5.53759,20.9895,5.81003,21.3244,6.16988,21.5678,6.59125,21.8538,7.08656,22.003,7.649,22,8.22093L22,15.502C22,16.6678,21.3677,17.7387,20.353,18.31L13.6266,22.5651C13.6092,22.5761,13.5914,22.5866,13.5733,22.5966,13.0911,22.8613,12.55,23.0001,12,23.0001,11.45,23.0001,10.9089,22.8613,10.4267,22.5966,10.4086,22.5866,10.3908,22.5761,10.3734,22.5651L3.64791,18.3106C3.15439,18.0339,2.74214,17.6322,2.45282,17.1455,2.15755,16.6488,2.00116,16.0818,2,15.504L2,15.502,2,8.217C2,7.04497,2.63892,5.97063,3.6619,5.40163L10.4001,1.42859C10.4084,1.4237,10.4167,1.41894,10.4252,1.41429,10.9176,1.1428,11.4707,1.00041,12.033,1.00041,12.5953,1.00041,13.1484,1.1428,13.6408,1.41429,13.6493,1.41894,13.6576,1.4237,13.6659,1.42859L20.4159,5.40859z M12,8C10.9391,8,9.92172,8.42143,9.17157,9.17157,8.42143,9.92172,8,10.9391,8,12,8,13.0609,8.42143,14.0783,9.17157,14.8284,9.92172,15.5786,10.9391,16,12,16,13.0609,16,14.0783,15.5786,14.8284,14.8284,15.5786,14.0783,16,13.0609,16,12,16,10.9391,15.5786,9.92172,14.8284,9.17157,14.0783,8.42143,13.0609,8,12,8z M10.5858,10.5858C10.9609,10.2107,11.4696,10,12,10,12.5304,10,13.0391,10.2107,13.4142,10.5858,13.7893,10.9609,14,11.4696,14,12,14,12.5304,13.7893,13.0391,13.4142,13.4142,13.0391,13.7893,12.5304,14,12,14,11.4696,14,10.9609,13.7893,10.5858,13.4142,10.2107,13.0391,10,12.5304,10,12,10,11.4696,10.2107,10.9609,10.5858,10.5858z";
+
+        #region 导航栏图标
+        public static string NavStartupIconGeometry = "F0 M24,24z M0,0z M6.63415,3.34528C6.87134,3.21274,7.16167,3.21885,7.39307,3.36126L20.3931,11.3613C20.6149,11.4978 20.75,11.7396 20.75,12 20.75,12.2604 20.6149,12.5022 20.3931,12.6387L7.39307,20.6387C7.16167,20.7811 6.87134,20.7873 6.63415,20.6547 6.39696,20.5222 6.25,20.2717 6.25,20L6.25,4C6.25,3.72829,6.39696,3.47783,6.63415,3.34528z M7.75,5.34217L7.75,18.6578 18.569,12 7.75,5.34217z";
+        public static string NavCanvasIconGeometry = "F0 M24,24z M0,0z M4.11612,6.11612C4.35054,5.8817,4.66848,5.75,5,5.75L19,5.75C19.3315,5.75 19.6495,5.8817 19.8839,6.11612 20.1183,6.35054 20.25,6.66848 20.25,7L20.25,18C20.25,18.0663 20.2237,18.1299 20.1768,18.1768 20.1299,18.2237 20.0663,18.25 20,18.25 19.5858,18.25 19.25,18.5858 19.25,19 19.25,19.4142 19.5858,19.75 20,19.75 20.4641,19.75 20.9092,19.5656 21.2374,19.2374 21.5656,18.9092 21.75,18.4641 21.75,18L21.75,7C21.75,6.27065 21.4603,5.57118 20.9445,5.05546 20.4288,4.53973 19.7293,4.25 19,4.25L5,4.25C4.27065,4.25 3.57118,4.53973 3.05546,5.05546 2.53973,5.57118 2.25,6.27065 2.25,7L2.25,17C2.25,17.7293 2.53973,18.4288 3.05546,18.9445 3.57118,19.4603 4.27065,19.75 5,19.75L8,19.75C8.41421,19.75 8.75,19.4142 8.75,19 8.75,18.5858 8.41421,18.25 8,18.25L5,18.25C4.66848,18.25 4.35054,18.1183 4.11612,17.8839 3.8817,17.6495 3.75,17.3315 3.75,17L3.75,7C3.75,6.66848,3.8817,6.35054,4.11612,6.11612z M11.8232,16.8232C11.8701,16.7763,11.9337,16.75,12,16.75L16,16.75C16.0663,16.75 16.1299,16.7763 16.1768,16.8232 16.2237,16.8701 16.25,16.9337 16.25,17L16.25,18C16.25,18.0663 16.2237,18.1299 16.1768,18.1768 16.1299,18.2237 16.0663,18.25 16,18.25L12,18.25C11.9337,18.25 11.8701,18.2237 11.8232,18.1768 11.7763,18.1299 11.75,18.0663 11.75,18L11.75,17C11.75,16.9337,11.7763,16.8701,11.8232,16.8232z M12,15.25C11.5359,15.25 11.0908,15.4344 10.7626,15.7626 10.4344,16.0908 10.25,16.5359 10.25,17L10.25,18C10.25,18.4641 10.4344,18.9092 10.7626,19.2374 11.0908,19.5656 11.5359,19.75 12,19.75L16,19.75C16.4641,19.75 16.9092,19.5656 17.2374,19.2374 17.5656,18.9092 17.75,18.4641 17.75,18L17.75,17C17.75,16.5359 17.5656,16.0908 17.2374,15.7626 16.9092,15.4344 16.4641,15.25 16,15.25L12,15.25z";
+        public static string NavInkRecognitionIconGeometry = "F0 M24,24z M0,0z M15.1306,4.19378C15.5647,4.01395 16.0301,3.92139 16.5,3.92139 16.9699,3.92139 17.4353,4.01395 17.8694,4.19378 18.3036,4.37361 18.698,4.6372 19.0303,4.96948 19.3626,5.30177 19.6262,5.69625 19.806,6.13041 19.9859,6.56457 20.0784,7.02989 20.0784,7.49981 20.0784,7.96974 19.9859,8.43506 19.806,8.86922 19.6262,9.30337 19.3626,9.69786 19.0303,10.0301L18.0403,11.0202 18.0303,11.0303 18.0202,11.0403 8.53033,20.5301C8.38968,20.6708,8.19891,20.7498,8,20.7498L4,20.7498C3.58579,20.7498,3.25,20.414,3.25,19.9998L3.25,15.9998C3.25,15.8009,3.32902,15.6101,3.46967,15.4695L13.9697,4.96948C14.302,4.6372,14.6964,4.37361,15.1306,4.19378z M17.9697,8.96948L17.4999,9.43925 14.5606,6.49991 15.0303,6.03014C15.2233,5.83714 15.4525,5.68405 15.7046,5.5796 15.9568,5.47515 16.2271,5.42139 16.5,5.42139 16.7729,5.42139 17.0432,5.47515 17.2954,5.5796 17.5475,5.68405 17.7767,5.83714 17.9697,6.03014 18.1627,6.22314 18.3158,6.45227 18.4202,6.70443 18.5247,6.9566 18.5784,7.22687 18.5784,7.49981 18.5784,7.77276 18.5247,8.04303 18.4202,8.29519 18.3158,8.54736 18.1627,8.77648 17.9697,8.96948z M4.75,16.3105L13.4999,7.56057 16.4392,10.4999 7.68934,19.2498 4.75,19.2498 4.75,16.3105z M21.5303,17.5303C21.8232,17.2374 21.8232,16.7626 21.5303,16.4697 21.2374,16.1768 20.7626,16.1768 20.4697,16.4697L17,19.9393 15.5303,18.4697C15.2374,18.1768 14.7626,18.1768 14.4697,18.4697 14.1768,18.7626 14.1768,19.2374 14.4697,19.5303L16.4697,21.5303C16.7626,21.8232,17.2374,21.8232,17.5303,21.5303L21.5303,17.5303z";
+        public static string NavThemeIconGeometry = "F0 M24,24z M0,0z M9.43853,3.39157C9.63411,3.53254 9.75,3.75892 9.75,4.00001 9.75,4.59674 9.98705,5.16904 10.409,5.591 10.831,6.01295 11.4033,6.25001 12,6.25001 12.5967,6.25001 13.169,6.01295 13.591,5.591 14.0129,5.16904 14.25,4.59674 14.25,4.00001 14.25,3.75892 14.3659,3.53254 14.5615,3.39157 14.757,3.25061 15.0085,3.21226 15.2372,3.28849L21.2372,5.28849C21.5434,5.39058,21.75,5.67718,21.75,6.00001L21.75,11C21.75,11.4142,21.4142,11.75,21,11.75L18.75,11.75 18.75,19C18.75,19.4641 18.5656,19.9093 18.2374,20.2374 17.9092,20.5656 17.4641,20.75 17,20.75L7,20.75C6.53587,20.75 6.09075,20.5656 5.76256,20.2374 5.43437,19.9093 5.25,19.4641 5.25,19L5.25,11.75 3,11.75C2.58579,11.75,2.25,11.4142,2.25,11L2.25,6.00001C2.25,5.67718,2.45657,5.39058,2.76283,5.28849L8.76283,3.28849C8.99154,3.21226,9.24296,3.25061,9.43853,3.39157z M3.75,6.54058L3.75,10.25 6,10.25C6.41421,10.25,6.75,10.5858,6.75,11L6.75,19C6.75,19.0663 6.77634,19.1299 6.82322,19.1768 6.87011,19.2237 6.93369,19.25 7,19.25L17,19.25C17.0663,19.25 17.1299,19.2237 17.1768,19.1768 17.2237,19.1299 17.25,19.0663 17.25,19L17.25,11C17.25,10.5858,17.5858,10.25,18,10.25L20.25,10.25 20.25,6.54058 15.6154,4.99571C15.4444,5.61643 15.1149,6.1884 14.6517,6.65166 13.9484,7.35492 12.9946,7.75001 12,7.75001 11.0054,7.75001 10.0516,7.35492 9.34835,6.65166 8.8851,6.1884 8.55557,5.61643 8.3846,4.99571L3.75,6.54058z";
+        public static string NavPPTIconGeometry = "F0 M24,24z M0,0z M12.6955,2.31464C12.8562,2.2432,13.037,2.23053,13.2061,2.27886L20.2061,4.27886C20.5281,4.37085,20.7501,4.66514,20.7501,5L20.7501,18C20.7501,18.3,20.5713,18.5712,20.2955,18.6894L13.2955,21.6894C13.1267,21.7617,12.9372,21.7696,12.7629,21.7115L3.7629,18.7115C3.41393,18.5952 3.20083,18.243 3.25975,17.8799 3.31867,17.5168 3.63223,17.25 4.00007,17.25L12.2501,17.25 12.2501,7.10778 8.75007,8.50778 8.75007,13C8.75007,13.2841,8.58957,13.5438,8.33548,13.6708L4.33548,15.6708C4.10299,15.7871 3.82688,15.7746 3.60577,15.638 3.38466,15.5013 3.25007,15.2599 3.25007,15L3.25007,7C3.25007,6.70361,3.42462,6.43502,3.69546,6.31464L12.6955,2.31464z M13.0558,3.79595L4.75007,7.48741 4.75007,13.7865 7.25007,12.5365 7.25007,8C7.25007,7.69332,7.43678,7.41754,7.72153,7.30364L12.7215,5.30364C12.9526,5.21122 13.2145,5.23943 13.4205,5.37895 13.6266,5.51847 13.7501,5.75113 13.7501,6L13.7501,18C13.7501,18.4142,13.4143,18.75,13.0001,18.75L8.62178,18.75 12.9667,20.1983 19.2501,17.5055 19.2501,5.56573 13.0558,3.79595z";
+        public static string NavAdvancedIconGeometry = "F0 M24,24z M0,0z M7.8679,3.80724L10.5302,6.46952C10.6708,6.61018,10.7499,6.80094,10.7499,6.99985L10.7499,9.99985C10.7499,10.4141,10.4141,10.7499,9.99985,10.7499L6.99985,10.7499C6.80094,10.7499,6.61018,10.6708,6.46952,10.5302L3.80724,7.8679C3.64358,8.5543 3.61907,9.27047 3.73968,9.97343 3.92327,11.0435 4.43407,12.0303 5.20176,12.798 5.96944,13.5656 6.95625,14.0764 8.02628,14.26 9.09632,14.4436 10.197,14.291 11.1766,13.8231 11.4634,13.6861 11.8054,13.7448 12.0302,13.9695L18.0302,19.9695C18.2874,20.2267 18.6362,20.3712 18.9999,20.3712 19.3636,20.3712 19.7124,20.2267 19.9695,19.9695 20.2267,19.7124 20.3712,19.3636 20.3712,18.9999 20.3712,18.6362 20.2267,18.2874 19.9695,18.0302L13.9695,12.0302C13.7448,11.8054 13.6861,11.4634 13.8231,11.1766 14.291,10.197 14.4436,9.09632 14.26,8.02628 14.0764,6.95625 13.5656,5.96944 12.798,5.20176 12.0303,4.43407 11.0435,3.92327 9.97343,3.73968 9.27047,3.61907 8.5543,3.64358 7.8679,3.80724z M6.17663,2.82308C7.43621,2.22151 8.85132,2.02523 10.2271,2.26128 11.6028,2.49732 12.8716,3.15407 13.8586,4.1411 14.8456,5.12812 15.5024,6.39687 15.7384,7.77263 15.944,8.97097 15.8216,10.1992 15.3891,11.3284L21.0302,16.9695C21.5687,17.508 21.8712,18.2383 21.8712,18.9999 21.8712,19.7614 21.5687,20.4917 21.0302,21.0302 20.4917,21.5687 19.7614,21.8712 18.9999,21.8712 18.2383,21.8712 17.508,21.5687 16.9695,21.0302L11.3284,15.3891C10.1992,15.8216 8.97097,15.944 7.77263,15.7384 6.39687,15.5024 5.12812,14.8456 4.1411,13.8586 3.15407,12.8716 2.49732,11.6028 2.26128,10.2271 2.02523,8.85132 2.22151,7.43621 2.82308,6.17663 2.92801,5.95693 3.13306,5.80183 3.37303,5.76066 3.613,5.71948 3.85802,5.79736 4.03018,5.96952L7.31051,9.24985 9.24985,9.24985 9.24985,7.31051 5.96952,4.03018C5.79736,3.85802 5.71948,3.613 5.76066,3.37303 5.80183,3.13306 5.95693,2.92801 6.17663,2.82308z";
+        public static string NavAutomationIconGeometry = "F0 M24,24z M0,0z M7.81828,2.27257C8.22012,2.17211,8.62732,2.41643,8.72778,2.81828L9.08572,4.25 14.9146,4.25 15.2726,2.81828C15.373,2.41643 15.7802,2.17211 16.1821,2.27257 16.5839,2.37303 16.8282,2.78023 16.7278,3.18208L16.4608,4.25 18,4.25C18.7293,4.25 19.4288,4.53973 19.9445,5.05546 20.4603,5.57118 20.75,6.27065 20.75,7L20.75,19C20.75,19.7293 20.4603,20.4288 19.9445,20.9445 19.4288,21.4603 18.7293,21.75 18,21.75L6,21.75C5.27065,21.75 4.57118,21.4603 4.05546,20.9445 3.53973,20.4288 3.25,19.7293 3.25,19L3.25,7C3.25,6.27065 3.53973,5.57118 4.05546,5.05546 4.57118,4.53973 5.27065,4.25 6,4.25L7.53955,4.25 7.27257,3.18208C7.17211,2.78023,7.41643,2.37303,7.81828,2.27257z M14.5396,5.75L14.2726,6.81828C14.1721,7.22012 14.4164,7.62732 14.8183,7.72778 15.2201,7.82825 15.6273,7.58393 15.7278,7.18208L16.0858,5.75 18,5.75C18.3315,5.75 18.6495,5.8817 18.8839,6.11612 19.1183,6.35054 19.25,6.66848 19.25,7L19.25,19C19.25,19.3315 19.1183,19.6495 18.8839,19.8839 18.6495,20.1183 18.3315,20.25 18,20.25L6,20.25C5.66848,20.25 5.35054,20.1183 5.11612,19.8839 4.8817,19.6495 4.75,19.3315 4.75,19L4.75,7C4.75,6.66848 4.8817,6.35054 5.11612,6.11612 5.35054,5.8817 5.66848,5.75 6,5.75L7.91455,5.75 8.27257,7.18208C8.37303,7.58393 8.78023,7.82825 9.18208,7.72778 9.58393,7.62732 9.82825,7.22012 9.72778,6.81828L9.46072,5.75 14.5396,5.75z M9.41625,15.3761C9.07166,15.1463 8.60598,15.2393 8.37614,15.5839 8.14629,15.9285 8.23932,16.3942 8.58391,16.624 9.6821,17.3565 10.8245,17.7501 12.0001,17.7501 13.1757,17.7501 14.3181,17.3565 15.4162,16.624 15.7608,16.3942 15.8539,15.9285 15.624,15.5839 15.3942,15.2393 14.9285,15.1463 14.5839,15.3761 13.6821,15.9776 12.8245,16.2501 12.0001,16.2501 11.1757,16.2501 10.3181,15.9776 9.41625,15.3761z M9,10.25C9.41421,10.25,9.75,10.5858,9.75,11L9.75,12C9.75,12.4142 9.41421,12.75 9,12.75 8.58579,12.75 8.25,12.4142 8.25,12L8.25,11C8.25,10.5858,8.58579,10.25,9,10.25z M15.75,11C15.75,10.5858 15.4626,10.25 15.0484,10.25 14.6342,10.25 14.25,10.5858 14.25,11L14.25,12C14.25,12.4142 14.5374,12.75 14.9516,12.75 15.3658,12.75 15.75,12.4142 15.75,12L15.75,11z";
+        public static string NavRandomWindowIconGeometry = "F0 M24,24z M0,0z M18.5303,3.46967C18.2374,3.17678 17.7626,3.17678 17.4697,3.46967 17.1768,3.76256 17.1768,4.23744 17.4697,4.53033L19.1893,6.25 16,6.25C14.475,6.25 13.0125,6.8558 11.9341,7.93414 11.5659,8.30239 11.2527,8.71546 11,9.16052 10.7473,8.71546 10.4341,8.30239 10.0659,7.93414 8.98753,6.8558 7.52499,6.25 6,6.25L3,6.25C2.58579,6.25 2.25,6.58579 2.25,7 2.25,7.41421 2.58579,7.75 3,7.75L6,7.75C7.12717,7.75 8.20817,8.19777 9.0052,8.9948 9.80223,9.79183 10.25,10.8728 10.25,12 10.25,13.1272 9.80223,14.2082 9.0052,15.0052 8.20817,15.8022 7.12717,16.25 6,16.25L3,16.25C2.58579,16.25 2.25,16.5858 2.25,17 2.25,17.4142 2.58579,17.75 3,17.75L6,17.75C7.52499,17.75 8.98753,17.1442 10.0659,16.0659 10.4341,15.6976 10.7473,15.2845 11,14.8395 11.2527,15.2845 11.5659,15.6976 11.9341,16.0659 13.0125,17.1442 14.475,17.75 16,17.75L19.1893,17.75 17.4697,19.4697C17.1768,19.7626 17.1768,20.2374 17.4697,20.5303 17.7626,20.8232 18.2374,20.8232 18.5303,20.5303L21.5303,17.5303C21.6022,17.4584 21.6565,17.3755 21.6931,17.2871 21.7298,17.1987 21.75,17.1017 21.75,17 21.75,16.8081 21.6768,16.6161 21.5303,16.4697L18.5303,13.4697C18.2374,13.1768 17.7626,13.1768 17.4697,13.4697 17.1768,13.7626 17.1768,14.2374 17.4697,14.5303L19.1893,16.25 16,16.25C14.8728,16.25 13.7918,15.8022 12.9948,15.0052 12.1978,14.2082 11.75,13.1272 11.75,12 11.75,10.8728 12.1978,9.79183 12.9948,8.9948 13.7918,8.19777 14.8728,7.75 16,7.75L19.1893,7.75 17.4697,9.46967C17.1768,9.76256 17.1768,10.2374 17.4697,10.5303 17.7626,10.8232 18.2374,10.8232 18.5303,10.5303L21.5303,7.53033C21.6768,7.38388 21.75,7.19194 21.75,7 21.75,6.89831 21.7298,6.80134 21.6931,6.71291 21.6565,6.62445 21.6022,6.54158 21.5303,6.46967L18.5303,3.46967z";
+        public static string NavAboutIconGeometry = "F0 M24,24z M0,0z M5.10571,5.10571C6.93419,3.27723 9.41414,2.25 12,2.25 14.5859,2.25 17.0658,3.27723 18.8943,5.10571 20.7228,6.93419 21.75,9.41414 21.75,12 21.75,13.2804 21.4978,14.5482 21.0078,15.7312 20.5178,16.9141 19.7997,17.9889 18.8943,18.8943 17.9889,19.7997 16.9141,20.5178 15.7312,21.0078 14.5482,21.4978 13.2804,21.75 12,21.75 10.7196,21.75 9.45176,21.4978 8.26884,21.0078 7.08591,20.5178 6.01108,19.7997 5.10571,18.8943 4.20034,17.9889 3.48216,16.9141 2.99217,15.7312 2.50219,14.5482 2.25,13.2804 2.25,12 2.25,9.41414 3.27723,6.93419 5.10571,5.10571z M12,3.75C9.81196,3.75 7.71354,4.61919 6.16637,6.16637 4.61919,7.71354 3.75,9.81196 3.75,12 3.75,13.0834 3.96339,14.1562 4.37799,15.1571 4.79259,16.1581 5.40029,17.0675 6.16637,17.8336 6.93245,18.5997 7.84193,19.2074 8.84286,19.622 9.8438,20.0366 10.9166,20.25 12,20.25 13.0834,20.25 14.1562,20.0366 15.1571,19.622 16.1581,19.2074 17.0675,18.5997 17.8336,17.8336 18.5997,17.0675 19.2074,16.1581 19.622,15.1571 20.0366,14.1562 20.25,13.0834 20.25,12 20.25,9.81196 19.3808,7.71354 17.8336,6.16637 16.2865,4.61919 14.188,3.75 12,3.75z M11.25,9C11.25,8.58579,11.5858,8.25,12,8.25L12.01,8.25C12.4242,8.25 12.76,8.58579 12.76,9 12.76,9.41421 12.4242,9.75 12.01,9.75L12,9.75C11.5858,9.75,11.25,9.41421,11.25,9z M11,11.25C10.5858,11.25 10.25,11.5858 10.25,12 10.25,12.4142 10.5858,12.75 11,12.75L11.25,12.75 11.25,16C11.25,16.4142,11.5858,16.75,12,16.75L13,16.75C13.4142,16.75 13.75,16.4142 13.75,16 13.75,15.5858 13.4142,15.25 13,15.25L12.75,15.25 12.75,12C12.75,11.5858,12.4142,11.25,12,11.25L11,11.25z";
+        public static string NavShortcutsIconGeometry = "F0 M24,24z M0,0z M18.5303,3.46967C18.2374,3.17678 17.7626,3.17678 17.4697,3.46967 17.1768,3.76256 17.1768,4.23744 17.4697,4.53033L19.1893,6.25 16,6.25C14.475,6.25 13.0125,6.8558 11.9341,7.93414 11.5659,8.30239 11.2527,8.71546 11,9.16052 10.7473,8.71546 10.4341,8.30239 10.0659,7.93414 8.98753,6.8558 7.52499,6.25 6,6.25L3,6.25C2.58579,6.25 2.25,6.58579 2.25,7 2.25,7.41421 2.58579,7.75 3,7.75L6,7.75C7.12717,7.75 8.20817,8.19777 9.0052,8.9948 9.80223,9.79183 10.25,10.8728 10.25,12 10.25,13.1272 9.80223,14.2082 9.0052,15.0052 8.20817,15.8022 7.12717,16.25 6,16.25L3,16.25C2.58579,16.25 2.25,16.5858 2.25,17 2.25,17.4142 2.58579,17.75 3,17.75L6,17.75C7.52499,17.75 8.98753,17.1442 10.0659,16.0659 10.4341,15.6976 10.7473,15.2845 11,14.8395 11.2527,15.2845 11.5659,15.6976 11.9341,16.0659 13.0125,17.1442 14.475,17.75 16,17.75L19.1893,17.75 17.4697,19.4697C17.1768,19.7626 17.1768,20.2374 17.4697,20.5303 17.7626,20.8232 18.2374,20.8232 18.5303,20.5303L21.5303,17.5303C21.6022,17.4584 21.6565,17.3755 21.6931,17.2871 21.7298,17.1987 21.75,17.1017 21.75,17 21.75,16.8081 21.6768,16.6161 21.5303,16.4697L18.5303,13.4697C18.2374,13.1768 17.7626,13.1768 17.4697,13.4697 17.1768,13.7626 17.1768,14.2374 17.4697,14.5303L19.1893,16.25 16,16.25C14.8728,16.25 13.7918,15.8022 12.9948,15.0052 12.1978,14.2082 11.75,13.1272 11.75,12 11.75,10.8728 12.1978,9.79183 12.9948,8.9948 13.7918,8.19777 14.8728,7.75 16,7.75L19.1893,7.75 17.4697,9.46967C17.1768,9.76256 17.1768,10.2374 17.4697,10.5303 17.7626,10.8232 18.2374,10.8232 18.5303,10.5303L21.5303,7.53033C21.6768,7.38388 21.75,7.19194 21.75,7 21.75,6.89831 21.7298,6.80134 21.6931,6.71291 21.6565,6.62445 21.6022,6.54158 21.5303,6.46967L18.5303,3.46967z";
+        public static string NavCollapseSidebarIconGeometry = "F0 M24,24z M0,0z M5.10571,5.10571C6.93419,3.27723 9.41414,2.25 12,2.25 14.5859,2.25 17.0658,3.27723 18.8943,5.10571 20.7228,6.93419 21.75,9.41414 21.75,12 21.75,13.2804 21.4978,14.5482 21.0078,15.7312 20.5178,16.9141 19.7997,17.9889 18.8943,18.8943 17.9889,19.7997 16.9141,20.5178 15.7312,21.0078 14.5482,21.4978 13.2804,21.75 12,21.75 10.7196,21.75 9.45176,21.4978 8.26884,21.0078 7.08591,20.5178 6.01108,19.7997 5.10571,18.8943 4.20034,17.9889 3.48216,16.9141 2.99217,15.7312 2.50219,14.5482 2.25,13.2804 2.25,12 2.25,9.41414 3.27723,6.93419 5.10571,5.10571z M12,3.75C9.81196,3.75 7.71354,4.61919 6.16637,6.16637 4.61919,7.71354 3.75,9.81196 3.75,12 3.75,13.0834 3.96339,14.1562 4.37799,15.1571 4.79259,16.1581 5.40029,17.0675 6.16637,17.8336 6.93245,18.5997 7.84193,19.2074 8.84286,19.622 9.8438,20.0366 10.9166,20.25 12,20.25 13.0834,20.25 14.1562,20.0366 15.1571,19.622 16.1581,19.2074 17.0675,18.5997 17.8336,17.8336 18.5997,17.0675 19.2074,16.1581 19.622,15.1571 20.0366,14.1562 20.25,13.0834 20.25,12 20.25,9.81196 19.3808,7.71354 17.8336,6.16637 16.2865,4.61919 14.188,3.75 12,3.75z M11.25,9C11.25,8.58579,11.5858,8.25,12,8.25L12.01,8.25C12.4242,8.25 12.76,8.58579 12.76,9 12.76,9.41421 12.4242,9.75 12.01,9.75L12,9.75C11.5858,9.75,11.25,9.41421,11.25,9z M11,11.25C10.5858,11.25 10.25,11.5858 10.25,12 10.25,12.4142 10.5858,12.75 11,12.75L11.25,12.75 11.25,16C11.25,16.4142,11.5858,16.75,12,16.75L13,16.75C13.4142,16.75 13.75,16.4142 13.75,16 13.75,15.5858 13.4142,15.25 13,15.25L12.75,15.25 12.75,12C12.75,11.5858,12.4142,11.25,12,11.25L11,11.25z";
+        public static string NavShowSidebarIconGeometry = "M20,5H4A2,2 0 0,0 2,7V17A2,2 0 0,0 4,19H20A2,2 0 0,0 22,17V7A2,2 0 0,0 20,5M20,17H4V7H20V17M5,8H7V10H5V8M8,8H10V10H8V8M11,8H13V10H11V8M14,8H16V10H14V8M17,8H19V10H17V8M5,11H7V13H5V11M8,11H10V13H8V11M11,11H13V13H11V11M14,11H16V13H14V11M17,11H19V13H17V11M8,14H16V16H8V14Z";
+        #endregion
+
     }
 }

Ink Canvas/MainWindow_cs/MW_ImageInsert.cs

@@ -30,15 +30,19 @@ namespace Ink_Canvas
         public Bitmap CameraImage;
         public BitmapSource CameraBitmapSource;
         public bool AddToWhiteboard;
+        public bool IncludeInk;
+        public BitmapSource InkOverlayBitmapSource;
 
         public ScreenshotResult(Rectangle area, List<Point> path = null, Bitmap cameraImage = null,
-            BitmapSource cameraBitmapSource = null, bool addToWhiteboard = false)
+            BitmapSource cameraBitmapSource = null, bool addToWhiteboard = false, bool includeInk = false, BitmapSource inkOverlayBitmapSource = null)
         {
             Area = area;
             Path = path;
             CameraImage = cameraImage;
             CameraBitmapSource = cameraBitmapSource;
             AddToWhiteboard = addToWhiteboard;
+            IncludeInk = includeInk;
+            InkOverlayBitmapSource = inkOverlayBitmapSource;
         }
     }
 
@@ -60,6 +64,8 @@ namespace Ink_Canvas
         {
             try
             {
+                var inkOverlayPreview = CreateInkOverlayPreviewBitmapSource();
+
                 // 隐藏主窗口以避免截图包含窗口本身
                 var originalVisibility = Visibility;
                 Visibility = Visibility.Hidden;
@@ -68,7 +74,7 @@ namespace Ink_Canvas
                 await Task.Delay(200);
 
                 // 启动区域选择截图
-                var screenshotResult = await ShowScreenshotSelector();
+                var screenshotResult = await ShowScreenshotSelector(inkOverlayPreview);
 
                 // 恢复窗口显示
                 Visibility = originalVisibility;
@@ -104,11 +110,33 @@ namespace Ink_Canvas
 
                                 try
                                 {
+                                    if (screenshotResult.Value.IncludeInk && screenshotResult.Value.InkOverlayBitmapSource != null)
+                                    {
+                                        var withInkBitmap = OverlayInkOnCapturedBitmap(finalBitmap, screenshotResult.Value.Area, screenshotResult.Value.InkOverlayBitmapSource);
+                                        if (withInkBitmap != null && withInkBitmap != finalBitmap)
+                                        {
+                                            if (needDisposeFinalBitmap && finalBitmap != originalBitmap)
+                                            {
+                                                finalBitmap.Dispose();
+                                            }
+                                            finalBitmap = withInkBitmap;
+                                            needDisposeFinalBitmap = true;
+                                        }
+                                    }
+
                                     // 如果有路径信息，应用形状遮罩
                                     if (screenshotResult.Value.Path != null && screenshotResult.Value.Path.Count > 0)
                                     {
-                                        finalBitmap = ApplyShapeMask(originalBitmap, screenshotResult.Value.Path, screenshotResult.Value.Area);
-                                        needDisposeFinalBitmap = true; // 标记需要释放新创建的位图
+                                        var maskedBitmap = ApplyShapeMask(finalBitmap, screenshotResult.Value.Path, screenshotResult.Value.Area);
+                                        if (maskedBitmap != null && maskedBitmap != finalBitmap)
+                                        {
+                                            if (needDisposeFinalBitmap && finalBitmap != originalBitmap)
+                                            {
+                                                finalBitmap.Dispose();
+                                            }
+                                            finalBitmap = maskedBitmap;
+                                            needDisposeFinalBitmap = true; // 标记需要释放新创建的位图
+                                        }
                                     }
 
                                     // 将截图转换为WPF Image并插入到画布
@@ -190,16 +218,19 @@ namespace Ink_Canvas
         }
 
         /// <summary>
-        /// 显示截图区域选择器
+        /// 显示截图区域选择器并返回用户的截图结果（区域截图或摄像头截图）。
         /// </summary>
-        /// <returns>截图结果，包含区域、路径和摄像头截图信息</returns>
+        /// <param name="inkOverlayPreview">当用户选择包含墨迹的区域截图时，用于作为墨迹叠加的预览 <see cref="BitmapSource"/>；可为 <c>null</c>。</param>
+        /// <returns>若用户确认截图则返回 <see cref="ScreenshotResult"/>，否则返回 <c>null</c>。返回的结果可能为摄像头截图或区域截图，摄像头截图会包含 <see cref="ScreenshotResult.CameraBitmapSource"/> 或 <see cref="ScreenshotResult.CameraImage"/>，区域截图会包含有效的区域与路径。</returns>
         /// <remarks>
         /// 该方法会：
-        /// 1. 显示截图选择器窗口
-        /// 2. 获取用户选择的区域或摄像头截图
-        /// 3. 返回截图结果
+        /// 1. 在 UI 线程（通过 <see cref="Application.Current.Dispatcher"/>）上显示截图选择器窗口 <see cref="ScreenshotSelectorWindow"/>；
+        /// 2. 获取用户选择的区域截图或摄像头截图；
+        /// 3. 根据用户选择构建并返回 <see cref="ScreenshotResult"/>；
+        /// 4. 若用户取消对话框或未确认截图，返回 <c>null</c>；
+        /// 5. 方法内部捕获异常并记录日志（不会向调用方抛出异常），如需外部处理请调整实现以重新抛出或传回错误信息。
         /// </remarks>
-        private async Task<ScreenshotResult?> ShowScreenshotSelector()
+        private async Task<ScreenshotResult?> ShowScreenshotSelector(BitmapSource inkOverlayPreview = null)
         {
             ScreenshotResult? result = null;
 
@@ -207,7 +238,7 @@ namespace Ink_Canvas
             {
                 await Application.Current.Dispatcher.InvokeAsync(() =>
                 {
-                    var selectorWindow = new ScreenshotSelectorWindow();
+                    var selectorWindow = new ScreenshotSelectorWindow(inkOverlayPreview);
                     if (selectorWindow.ShowDialog() == true)
                     {
                         // 检查是否是摄像头截图
@@ -218,7 +249,9 @@ namespace Ink_Canvas
                                 null, // 摄像头截图不需要路径
                                 null, // 不再使用Bitmap
                                 selectorWindow.CameraBitmapSource, // 摄像头BitmapSource
-                                selectorWindow.ShouldAddToWhiteboard
+                                selectorWindow.ShouldAddToWhiteboard,
+                                false,
+                                null
                             );
                         }
                         else if (selectorWindow.CameraImage != null)
@@ -228,7 +261,9 @@ namespace Ink_Canvas
                                 null, // 摄像头截图不需要路径
                                 selectorWindow.CameraImage, // 摄像头图像
                                 null,
-                                selectorWindow.ShouldAddToWhiteboard
+                                selectorWindow.ShouldAddToWhiteboard,
+                                false,
+                                null
                             );
                         }
                         else
@@ -238,7 +273,9 @@ namespace Ink_Canvas
                                 selectorWindow.SelectedPath,
                                 null,
                                 null,
-                                selectorWindow.ShouldAddToWhiteboard
+                                selectorWindow.ShouldAddToWhiteboard,
+                                selectorWindow.IncludeInkInScreenshot,
+                                selectorWindow.IncludeInkInScreenshot ? inkOverlayPreview : null
                             );
                         }
                     }
@@ -304,6 +341,142 @@ namespace Ink_Canvas
             }
         }
 
+        private BitmapSource CreateInkOverlayPreviewBitmapSource()
+        {
+            try
+            {
+                if (inkCanvas == null)
+                {
+                    return null;
+                }
+
+                if ((inkCanvas.Strokes?.Count ?? 0) == 0 && inkCanvas.Children.Count == 0)
+                {
+                    return null;
+                }
+
+                if (inkCanvas.ActualWidth <= 0 || inkCanvas.ActualHeight <= 0)
+                {
+                    return null;
+                }
+
+                var virtualScreen = SystemInformation.VirtualScreen;
+                var source = PresentationSource.FromVisual(inkCanvas);
+                var transformToDevice = source?.CompositionTarget?.TransformToDevice ?? System.Windows.Media.Matrix.Identity;
+
+                // PointToScreen 返回WPF坐标（DIP），统一转换为设备像素后再与 VirtualScreen 对齐
+                var inkTopLeftDip = inkCanvas.PointToScreen(new Point(0, 0));
+                var inkTopLeftPx = transformToDevice.Transform(inkTopLeftDip);
+                var offsetX = inkTopLeftPx.X - virtualScreen.Left;
+                var offsetY = inkTopLeftPx.Y - virtualScreen.Top;
+                var widthPx = inkCanvas.ActualWidth * transformToDevice.M11;
+                var heightPx = inkCanvas.ActualHeight * transformToDevice.M22;
+
+                var drawingVisual = new DrawingVisual();
+                using (var dc = drawingVisual.RenderOpen())
+                {
+                    // 使用完整 InkCanvas 视觉树，确保包含图片等子元素
+                    var visualBrush = new VisualBrush(inkCanvas)
+                    {
+                        Stretch = Stretch.Fill
+                    };
+                    dc.DrawRectangle(visualBrush, null, new Rect(offsetX, offsetY, widthPx, heightPx));
+                }
+
+                var rtb = new RenderTargetBitmap(
+                    Math.Max(1, virtualScreen.Width),
+                    Math.Max(1, virtualScreen.Height),
+                    96,
+                    96,
+                    PixelFormats.Pbgra32);
+                rtb.Render(drawingVisual);
+                rtb.Freeze();
+                return rtb;
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"创建截图墨迹预览失败: {ex.Message}", LogHelper.LogType.Warning);
+                return null;
+            }
+        }
+
+        private Bitmap OverlayInkOnCapturedBitmap(Bitmap capturedBitmap, Rectangle captureArea, BitmapSource inkOverlayBitmapSource)
+        {
+            if (capturedBitmap == null || inkOverlayBitmapSource == null)
+            {
+                return capturedBitmap;
+            }
+
+            try
+            {
+                var virtualScreen = SystemInformation.VirtualScreen;
+                var sourceRect = new Rectangle(
+                    captureArea.X - virtualScreen.X,
+                    captureArea.Y - virtualScreen.Y,
+                    captureArea.Width,
+                    captureArea.Height);
+
+                sourceRect.Intersect(new Rectangle(0, 0, inkOverlayBitmapSource.PixelWidth, inkOverlayBitmapSource.PixelHeight));
+                if (sourceRect.Width <= 0 || sourceRect.Height <= 0)
+                {
+                    return capturedBitmap;
+                }
+
+                using (var inkOverlayBitmap = ConvertBitmapSourceToBitmap(inkOverlayBitmapSource))
+                {
+                    if (inkOverlayBitmap == null)
+                    {
+                        return capturedBitmap;
+                    }
+
+                    Bitmap resultBitmap = null;
+                    try
+                    {
+                        resultBitmap = new Bitmap(capturedBitmap.Width, capturedBitmap.Height, PixelFormat.Format32bppArgb);
+                        using (var g = Graphics.FromImage(resultBitmap))
+                        {
+                            g.DrawImage(capturedBitmap, 0, 0, capturedBitmap.Width, capturedBitmap.Height);
+
+                            var targetRect = new Rectangle(0, 0, Math.Min(sourceRect.Width, capturedBitmap.Width), Math.Min(sourceRect.Height, capturedBitmap.Height));
+                            g.DrawImage(inkOverlayBitmap, targetRect, sourceRect, GraphicsUnit.Pixel);
+                        }
+
+                        return resultBitmap;
+                    }
+                    catch
+                    {
+                        resultBitmap?.Dispose();
+                        throw;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"叠加截图墨迹失败: {ex.Message}", LogHelper.LogType.Warning);
+                return capturedBitmap;
+            }
+        }
+
+        private Bitmap ConvertBitmapSourceToBitmap(BitmapSource bitmapSource)
+        {
+            if (bitmapSource == null)
+            {
+                return null;
+            }
+
+            using (var memoryStream = new MemoryStream())
+            {
+                var encoder = new PngBitmapEncoder();
+                encoder.Frames.Add(BitmapFrame.Create(bitmapSource));
+                encoder.Save(memoryStream);
+                memoryStream.Position = 0;
+                using (var tempBitmap = new Bitmap(memoryStream))
+                {
+                    return new Bitmap(tempBitmap);
+                }
+            }
+        }
+
         /// <summary>
         /// 将截图插入到画布
         /// </summary>

Ink Canvas/MainWindow_cs/MW_Save&OpenStrokes.cs

@@ -1,3 +1,4 @@
+using Ink_Canvas.Controls;
 using Ink_Canvas.Helpers;
 using Newtonsoft.Json;
 using System;
@@ -16,6 +17,7 @@ using System.Windows.Ink;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
+using System.Windows.Threading;
 using System.Xml;
 using System.Xml.Linq;
 using Color = System.Drawing.Color;
@@ -28,16 +30,58 @@ namespace Ink_Canvas
     // 1. 定义元素信息结构
     public class CanvasElementInfo
     {
-        public string Type { get; set; } // "Image"
+        public string Type { get; set; } // "Image" | "Pdf"
         public string SourcePath { get; set; }
         public double Left { get; set; }
         public double Top { get; set; }
         public double Width { get; set; }
         public double Height { get; set; }
         public string Stretch { get; set; } = "Fill"; // 默认为Fill
+        /// <summary>PDF 当前页（从 0 开始），仅 Type == Pdf 时有效。</summary>
+        public int? PdfCurrentPage { get; set; }
+        /// <summary>保存时的 PDF 总页数，用于校验；仅 Type == Pdf 时有效。</summary>
+        public int? PdfPageCount { get; set; }
     }
     public partial class MainWindow : Window
     {
+        /// <summary>收集画布上图片与 PDF 的元数据，写入 .elements.json（与墨迹文件同路径）。</summary>
+        private void CollectCanvasElementsMetadata(List<CanvasElementInfo> elementInfos)
+        {
+            if (elementInfos == null || inkCanvas == null) return;
+
+            foreach (var child in inkCanvas.Children)
+            {
+                if (child is Image img && img.Source is BitmapImage bmp)
+                {
+                    elementInfos.Add(new CanvasElementInfo
+                    {
+                        Type = "Image",
+                        SourcePath = bmp.UriSource?.LocalPath ?? "",
+                        Left = InkCanvas.GetLeft(img),
+                        Top = InkCanvas.GetTop(img),
+                        Width = img.Width,
+                        Height = img.Height,
+                        Stretch = img.Stretch.ToString()
+                    });
+                }
+                else if (child is PdfEmbeddedView pdf && !string.IsNullOrEmpty(pdf.PdfPath))
+                {
+                    elementInfos.Add(new CanvasElementInfo
+                    {
+                        Type = "Pdf",
+                        SourcePath = pdf.PdfPath,
+                        Left = InkCanvas.GetLeft(pdf),
+                        Top = InkCanvas.GetTop(pdf),
+                        Width = pdf.Width,
+                        Height = pdf.Height,
+                        Stretch = "Uniform",
+                        PdfCurrentPage = (int)pdf.CurrentPageIndex,
+                        PdfPageCount = (int)pdf.PageCount
+                    });
+                }
+            }
+        }
+
         /// <summary>
         /// 保存墨迹的鼠标释放事件处理
         /// </summary>
@@ -88,7 +132,19 @@ namespace Ink_Canvas
                                + (currentMode == 0 ? "Annotation Strokes" : "BlackBoard Strokes");
                 if (!Directory.Exists(savePath)) Directory.CreateDirectory(savePath);
                 string savePathWithName;
-                if (currentMode != 0) // 黑板模式下
+                if (Settings.Automation.IsUseCustomSaveFileName)
+                {
+                    var ctx = new SaveFileNameContext
+                    {
+                        Mode = currentMode == 0 ? "Annotation" : "BlackBoard",
+                        Type = saveByUser ? "User" : "Auto",
+                        Page = currentMode != 0 ? CurrentWhiteboardIndex : (int?)null,
+                        Count = inkCanvas.Strokes.Count
+                    };
+                    var fname = SaveFileNameHelper.Render(Settings.Automation.CustomSaveFileNameTemplate, ctx);
+                    savePathWithName = savePath + @"\" + fname + ".icstk";
+                }
+                else if (currentMode != 0) // 黑板模式下
                     savePathWithName = savePath + @"\" + DateTime.Now.ToString("yyyy-MM-dd HH-mm-ss-fff") + " Page-" +
                                        CurrentWhiteboardIndex + " StrokesCount-" + inkCanvas.Strokes.Count + ".icstk";
                 else
@@ -419,22 +475,7 @@ namespace Ink_Canvas
 
                         // 保存元素信息
                         var elementInfos = new List<CanvasElementInfo>();
-                        foreach (var child in inkCanvas.Children)
-                        {
-                            if (child is Image img && img.Source is BitmapImage bmp)
-                            {
-                                elementInfos.Add(new CanvasElementInfo
-                                {
-                                    Type = "Image",
-                                    SourcePath = bmp.UriSource?.LocalPath ?? "",
-                                    Left = InkCanvas.GetLeft(img),
-                                    Top = InkCanvas.GetTop(img),
-                                    Width = img.Width,
-                                    Height = img.Height,
-                                    Stretch = img.Stretch.ToString()
-                                });
-                            }
-                        }
+                        CollectCanvasElementsMetadata(elementInfos);
                         string elementsPath = Settings.Automation.IsSaveStrokesAsXML ? Path.ChangeExtension(savePathWithName, ".elements.json") : Path.ChangeExtension(savePathWithName, ".elements.json");
                         File.WriteAllText(elementsPath, JsonConvert.SerializeObject(elementInfos, Newtonsoft.Json.Formatting.Indented));
                     }
@@ -485,22 +526,7 @@ namespace Ink_Canvas
 
                 // 同时保存元素信息
                 var elementInfos = new List<CanvasElementInfo>();
-                foreach (var child in inkCanvas.Children)
-                {
-                    if (child is Image img && img.Source is BitmapImage bmp)
-                    {
-                        elementInfos.Add(new CanvasElementInfo
-                        {
-                            Type = "Image",
-                            SourcePath = bmp.UriSource?.LocalPath ?? "",
-                            Left = InkCanvas.GetLeft(img),
-                            Top = InkCanvas.GetTop(img),
-                            Width = img.Width,
-                            Height = img.Height,
-                            Stretch = img.Stretch.ToString()
-                        });
-                    }
-                }
+                CollectCanvasElementsMetadata(elementInfos);
                 File.WriteAllText(Path.ChangeExtension(xmlPath, ".elements.json"), JsonConvert.SerializeObject(elementInfos, Newtonsoft.Json.Formatting.Indented));
 
                 // 异步上传到Dlass
@@ -1266,6 +1292,10 @@ namespace Ink_Canvas
                             InkCanvas.SetTop(img, info.Top);
                             inkCanvas.Children.Add(img);
                         }
+                        else if (string.Equals(info.Type, "Pdf", StringComparison.OrdinalIgnoreCase) && File.Exists(info.SourcePath))
+                        {
+                            Dispatcher.BeginInvoke(new Action(() => { _ = RestorePdfFromElementInfoAsync(info); }), DispatcherPriority.Loaded);
+                        }
                     }
                 }
             }
@@ -1416,6 +1446,10 @@ namespace Ink_Canvas
                         InkCanvas.SetTop(img, info.Top);
                         inkCanvas.Children.Add(img);
                     }
+                    else if (string.Equals(info.Type, "Pdf", StringComparison.OrdinalIgnoreCase) && File.Exists(info.SourcePath))
+                    {
+                        Dispatcher.BeginInvoke(new Action(() => { _ = RestorePdfFromElementInfoAsync(info); }), DispatcherPriority.Loaded);
+                    }
                 }
             }