From c86eb12168592d62977e0bb6ca99453dfb6cd4c0 Mon Sep 17 00:00:00 2001 From: PrefacedCorg <1876568293@qq.com> Date: Sun, 31 Aug 2025 12:07:59 +0800 Subject: [PATCH 1/2] Update YesOrNoNotificationWindow.xaml --- Ink Canvas/Windows/YesOrNoNotificationWindow.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ink Canvas/Windows/YesOrNoNotificationWindow.xaml b/Ink Canvas/Windows/YesOrNoNotificationWindow.xaml index 9b9ff02b..c633ae5c 100644 --- a/Ink Canvas/Windows/YesOrNoNotificationWindow.xaml +++ b/Ink Canvas/Windows/YesOrNoNotificationWindow.xaml @@ -6,7 +6,7 @@ xmlns:local="clr-namespace:Ink_Canvas" xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" mc:Ignorable="d" Topmost="True" WindowStartupLocation="CenterScreen" ui:WindowHelper.UseModernWindowStyle="True" ResizeMode="NoResize" Closed="Window_Closed" ui:ThemeManager.RequestedTheme="Light" - Title="演示文档设置 - Ink Canvas 画板" Height="160" Width="450" FontFamily="Microsoft YaHei UI"> + Title="演示文档设置 - Ink Canvas For Class CE" Height="160" Width="450" FontFamily="Microsoft YaHei UI"> From c53b6de68c00aea524d94e9e7832f25168c3444c Mon Sep 17 00:00:00 2001 From: PrefacedCorg <1876568293@qq.com> Date: Sun, 31 Aug 2025 12:14:46 +0800 Subject: [PATCH 2/2] Update ScreenshotSelectorWindow.xaml.cs --- Ink Canvas/Windows/ScreenshotSelectorWindow.xaml.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Ink Canvas/Windows/ScreenshotSelectorWindow.xaml.cs b/Ink Canvas/Windows/ScreenshotSelectorWindow.xaml.cs index 28dcfa1c..adbbccf9 100644 --- a/Ink Canvas/Windows/ScreenshotSelectorWindow.xaml.cs +++ b/Ink Canvas/Windows/ScreenshotSelectorWindow.xaml.cs @@ -807,7 +807,6 @@ namespace Ink_Canvas { ReleaseMouseCapture(); } -<<<<<<< HEAD // 释放选择矩形的鼠标捕获 if (SelectionRectangle.IsMouseCaptured) @@ -815,9 +814,6 @@ namespace Ink_Canvas SelectionRectangle.ReleaseMouseCapture(); } -======= - ->>>>>>> ff086e497c2dc751d72f3a6d72ce5d883b297672 // 重置选择区域 _currentSelection = new Rect(); SelectedArea = null;