From 3e9bf566d91857a4eb79a1c06db187f280c87fb9 Mon Sep 17 00:00:00 2001 From: clover_yan <56215525+clover-yan@users.noreply.github.com> Date: Thu, 16 Nov 2023 16:53:44 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20PPT=20=E5=86=85?= =?UTF-8?q?=E8=BF=9B=E5=85=A5=E7=94=BB=E6=9D=BF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/MainWindow.xaml.cs | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index ba01a3ac..be80c5c6 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -1149,6 +1149,7 @@ private void BtnSwitch_Click(object sender, RoutedEventArgs e) } StackPanelPPTButtons.Visibility = Visibility.Visible; } + Topmost = true; BtnHideInkCanvas_Click(BtnHideInkCanvas, e); } else @@ -1188,6 +1189,7 @@ private void BtnSwitch_Click(object sender, RoutedEventArgs e) } StackPanelPPTButtons.Visibility = Visibility.Visible; + Topmost = true; break; case 1: //黑板或白板模式 currentMode = 1; @@ -1212,6 +1214,7 @@ private void BtnSwitch_Click(object sender, RoutedEventArgs e) } StackPanelPPTButtons.Visibility = Visibility.Collapsed; + Topmost = false; break; } } @@ -2241,7 +2244,15 @@ private void PptApplication_SlideShowBegin(SlideShowWindow Wn) Application.Current.Dispatcher.Invoke(() => { // 退出画板模式 + pointDesktop = new Point(ViewboxFloatingBar.Margin.Left, ViewboxFloatingBar.Margin.Top); + pointPPT = new Point(-1, -1); + + StackPanelPPTControls.Visibility = Visibility.Visible; + BtnPPTSlideShow.Visibility = Visibility.Collapsed; + BtnPPTSlideShowEnd.Visibility = Visibility.Visible; + ViewBoxStackPanelMain.Margin = new Thickness(10, 10, 10, 10); BtnSwitch_Click(null, null); + //调整颜色 double screenRatio = SystemParameters.PrimaryScreenWidth / SystemParameters.PrimaryScreenHeight; if (Math.Abs(screenRatio - 16.0 / 9) <= -0.01) @@ -2311,14 +2322,6 @@ private void PptApplication_SlideShowBegin(SlideShowWindow Wn) } } - pointDesktop = new Point(ViewboxFloatingBar.Margin.Left, ViewboxFloatingBar.Margin.Top); - pointPPT = new Point(-1, -1); - - StackPanelPPTControls.Visibility = Visibility.Visible; - BtnPPTSlideShow.Visibility = Visibility.Collapsed; - BtnPPTSlideShowEnd.Visibility = Visibility.Visible; - ViewBoxStackPanelMain.Margin = new Thickness(10, 10, 10, 10); - if (Settings.PowerPointSettings.IsShowCanvasAtNewSlideShow && Main_Grid.Background == Brushes.Transparent) { if (currentMode != 0) @@ -6968,8 +6971,6 @@ private void ImageBlackboard_MouseUp(object sender, MouseButtonEventArgs e) if (currentMode == 0) { //进入黑板 - Topmost = false; - if (BtnPPTSlideShowEnd.Visibility == Visibility.Collapsed) { pointDesktop = new Point(ViewboxFloatingBar.Margin.Left, ViewboxFloatingBar.Margin.Top); @@ -7000,8 +7001,6 @@ private void ImageBlackboard_MouseUp(object sender, MouseButtonEventArgs e) else { //关闭黑板 - Topmost = true; - if (isInMultiTouchMode) BorderMultiTouchMode_MouseUp(null, null); if (BtnPPTSlideShowEnd.Visibility == Visibility.Collapsed) From 2a20c5216924368642041775bd16b0d7fff7725e Mon Sep 17 00:00:00 2001 From: clover_yan <56215525+clover-yan@users.noreply.github.com> Date: Thu, 16 Nov 2023 20:29:59 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=AE=9E=E9=99=85?= =?UTF-8?q?=E5=B1=8F=E5=B9=95=E5=B0=BA=E5=AF=B8=E6=88=AA=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/MainWindow.xaml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index be80c5c6..b470cb35 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -6701,7 +6701,7 @@ private void BtnScreenshot_Click(object sender, RoutedEventArgs e) private void SaveScreenShot(bool isHideNotification, string fileName = null) { - System.Drawing.Rectangle rc = System.Windows.Forms.SystemInformation.VirtualScreen; + System.Drawing.Rectangle rc = System.Windows.Forms.Screen.PrimaryScreen.Bounds; var bitmap = new System.Drawing.Bitmap(rc.Width, rc.Height, System.Drawing.Imaging.PixelFormat.Format32bppArgb); using (System.Drawing.Graphics memoryGrahics = System.Drawing.Graphics.FromImage(bitmap)) From 925573bf100bd0387cfc55d64dcd5701cc1f6da1 Mon Sep 17 00:00:00 2001 From: clover_yan <56215525+clover-yan@users.noreply.github.com> Date: Thu, 16 Nov 2023 20:30:49 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B8=8C=E6=B2=83?= =?UTF-8?q?=E8=AF=BE=E5=A0=82=E5=8A=A9=E6=89=8B=E6=9F=A5=E6=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/MainWindow.xaml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index b470cb35..afe9ff97 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -120,7 +120,7 @@ private void TimerKillProcess_Elapsed(object sender, ElapsedEventArgs e) if (processes.Length > 0) { arg += " /IM SeewoIwbAssistant.exe" + - " /IM Sia.Guard"; + " /IM Sia.Guard.exe"; } } if (Settings.Automation.IsAutoKillEasiNote) From 4c211290230f0bcce5ad28cdd43175d86e9d5971 Mon Sep 17 00:00:00 2001 From: clover_yan <56215525+clover-yan@users.noreply.github.com> Date: Fri, 17 Nov 2023 09:22:57 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=8C=81=E7=BB=AD?= =?UTF-8?q?=E7=BB=98=E5=88=B6=E5=9B=BE=E5=BD=A2=E6=97=B6=E4=BB=8D=E7=84=B6?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E4=B8=8D=E8=87=AA=E5=8A=A8=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/MainWindow.xaml.cs | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index afe9ff97..3613d960 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -4077,7 +4077,10 @@ private void BtnDrawLine_Click(object sender, EventArgs e) lastMouseDownSender = null; if (isLongPressSelected) { - BorderDrawShape.Visibility = Visibility.Collapsed; + if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) + { + BorderDrawShape.Visibility = Visibility.Collapsed; + } var dA = new DoubleAnimation(1, 1, new Duration(TimeSpan.FromMilliseconds(0))); ImageDrawLine.BeginAnimation(OpacityProperty, dA); } @@ -4096,7 +4099,10 @@ private void BtnDrawDashedLine_Click(object sender, EventArgs e) lastMouseDownSender = null; if (isLongPressSelected) { - BorderDrawShape.Visibility = Visibility.Collapsed; + if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) + { + BorderDrawShape.Visibility = Visibility.Collapsed; + } var dA = new DoubleAnimation(1, 1, new Duration(TimeSpan.FromMilliseconds(0))); ImageDrawDashedLine.BeginAnimation(OpacityProperty, dA); } @@ -4115,7 +4121,10 @@ private void BtnDrawDotLine_Click(object sender, EventArgs e) lastMouseDownSender = null; if (isLongPressSelected) { - BorderDrawShape.Visibility = Visibility.Collapsed; + if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) + { + BorderDrawShape.Visibility = Visibility.Collapsed; + } var dA = new DoubleAnimation(1, 1, new Duration(TimeSpan.FromMilliseconds(0))); ImageDrawDotLine.BeginAnimation(OpacityProperty, dA); } @@ -4134,7 +4143,10 @@ private void BtnDrawArrow_Click(object sender, EventArgs e) lastMouseDownSender = null; if (isLongPressSelected) { - BorderDrawShape.Visibility = Visibility.Collapsed; + if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) + { + BorderDrawShape.Visibility = Visibility.Collapsed; + } var dA = new DoubleAnimation(1, 1, new Duration(TimeSpan.FromMilliseconds(0))); ImageDrawArrow.BeginAnimation(OpacityProperty, dA); } @@ -4153,7 +4165,10 @@ private void BtnDrawParallelLine_Click(object sender, EventArgs e) lastMouseDownSender = null; if (isLongPressSelected) { - BorderDrawShape.Visibility = Visibility.Collapsed; + if (ToggleSwitchDrawShapeBorderAutoHide.IsOn) + { + BorderDrawShape.Visibility = Visibility.Collapsed; + } var dA = new DoubleAnimation(1, 1, new Duration(TimeSpan.FromMilliseconds(0))); ImageDrawParallelLine.BeginAnimation(OpacityProperty, dA); } From af4e55d9a0a78e0dac50a652781751f9b3cca346 Mon Sep 17 00:00:00 2001 From: clover_yan <56215525+clover-yan@users.noreply.github.com> Date: Fri, 17 Nov 2023 12:02:27 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E5=BD=BB=E5=BA=95=E4=BF=AE=E5=A4=8D=20PP?= =?UTF-8?q?T=20=E5=86=85=E8=BF=9B=E5=85=A5=E7=94=BB=E6=9D=BF=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/MainWindow.xaml.cs | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index 3613d960..7d651d3b 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -2243,16 +2243,11 @@ private void PptApplication_SlideShowBegin(SlideShowWindow Wn) LogHelper.WriteLogToFile("PowerPoint Application Slide Show Begin", LogHelper.LogType.Event); Application.Current.Dispatcher.Invoke(() => { - // 退出画板模式 - pointDesktop = new Point(ViewboxFloatingBar.Margin.Left, ViewboxFloatingBar.Margin.Top); - pointPPT = new Point(-1, -1); + if (currentMode == 1) { + // 退出画板模式 + BtnSwitch_Click(null, null); + } - StackPanelPPTControls.Visibility = Visibility.Visible; - BtnPPTSlideShow.Visibility = Visibility.Collapsed; - BtnPPTSlideShowEnd.Visibility = Visibility.Visible; - ViewBoxStackPanelMain.Margin = new Thickness(10, 10, 10, 10); - BtnSwitch_Click(null, null); - //调整颜色 double screenRatio = SystemParameters.PrimaryScreenWidth / SystemParameters.PrimaryScreenHeight; if (Math.Abs(screenRatio - 16.0 / 9) <= -0.01) @@ -2322,6 +2317,14 @@ private void PptApplication_SlideShowBegin(SlideShowWindow Wn) } } + pointDesktop = new Point(ViewboxFloatingBar.Margin.Left, ViewboxFloatingBar.Margin.Top); + pointPPT = new Point(-1, -1); + + StackPanelPPTControls.Visibility = Visibility.Visible; + BtnPPTSlideShow.Visibility = Visibility.Collapsed; + BtnPPTSlideShowEnd.Visibility = Visibility.Visible; + ViewBoxStackPanelMain.Margin = new Thickness(10, 10, 10, 10); + if (Settings.PowerPointSettings.IsShowCanvasAtNewSlideShow && Main_Grid.Background == Brushes.Transparent) { if (currentMode != 0) From b82009699d92074461cb32fc05b8be0ab884c261 Mon Sep 17 00:00:00 2001 From: clover_yan <56215525+clover-yan@users.noreply.github.com> Date: Fri, 17 Nov 2023 13:45:55 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=85=88=E5=9B=9E=E5=88=B0=E7=94=BB?= =?UTF-8?q?=E7=AC=94=E5=86=8D=E6=B8=85=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/MainWindow.xaml.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index 7d651d3b..4f53d15e 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -1062,6 +1062,15 @@ private void BtnClear_Click(object sender, RoutedEventArgs e) forceEraser = false; BorderClearInDelete.Visibility = Visibility.Collapsed; + if (currentMode == 0) { + BorderPenColorRed_MouseUp(BorderPenColorRed, null); + } else { + if (Settings.Canvas.UsingWhiteboard) { + BorderPenColorBlack_MouseUp(BorderPenColorBlack, null); + } else { + BorderPenColorWhite_MouseUp(BorderPenColorWhite, null); + } + } if (inkCanvas.Strokes.Count != 0) { int whiteboardIndex = CurrentWhiteboardIndex; From 88c208ce3f5a2cf24362e9d0b07cfe5ad3704814 Mon Sep 17 00:00:00 2001 From: clover_yan <56215525+clover-yan@users.noreply.github.com> Date: Sat, 18 Nov 2023 12:05:46 +0800 Subject: [PATCH 07/11] =?UTF-8?q?PPT=20=E5=86=85=E5=85=88=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E5=A2=A8=E8=BF=B9=E5=86=8D=E8=BF=9B=E5=85=A5=E7=94=BB?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/MainWindow.xaml.cs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index 4f53d15e..041235cd 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -1204,6 +1204,21 @@ private void BtnSwitch_Click(object sender, RoutedEventArgs e) currentMode = 1; GridBackgroundCover.Visibility = Visibility.Visible; + if (BtnPPTSlideShowEnd.Visibility == Visibility.Visible) { + Application.Current.Dispatcher.Invoke(() => + { + try + { + MemoryStream ms = new MemoryStream(); + inkCanvas.Strokes.Save(ms); + ms.Position = 0; + memoryStreams[pptApplication.SlideShowWindows[1].View.CurrentShowPosition] = ms; + timeMachine.ClearStrokeHistory(); + } + catch { } + }); + } + SaveStrokes(true); ClearStrokes(true); RestoreStrokes(); From 2f01cd5be823f4ef1a0a232253c27d23b74846eb Mon Sep 17 00:00:00 2001 From: clover_yan <56215525+clover-yan@users.noreply.github.com> Date: Mon, 20 Nov 2023 04:03:59 +0000 Subject: [PATCH 08/11] =?UTF-8?q?Revert=20"PPT=20=E5=86=85=E5=85=88?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=A2=A8=E8=BF=B9=E5=86=8D=E8=BF=9B=E5=85=A5?= =?UTF-8?q?=E7=94=BB=E6=9D=BF"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 88c208ce3f5a2cf24362e9d0b07cfe5ad3704814. --- Ink Canvas/MainWindow.xaml.cs | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index 041235cd..4f53d15e 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -1204,21 +1204,6 @@ private void BtnSwitch_Click(object sender, RoutedEventArgs e) currentMode = 1; GridBackgroundCover.Visibility = Visibility.Visible; - if (BtnPPTSlideShowEnd.Visibility == Visibility.Visible) { - Application.Current.Dispatcher.Invoke(() => - { - try - { - MemoryStream ms = new MemoryStream(); - inkCanvas.Strokes.Save(ms); - ms.Position = 0; - memoryStreams[pptApplication.SlideShowWindows[1].View.CurrentShowPosition] = ms; - timeMachine.ClearStrokeHistory(); - } - catch { } - }); - } - SaveStrokes(true); ClearStrokes(true); RestoreStrokes(); From 6627e8165ff870ff470ac7dd1dce69511429ee64 Mon Sep 17 00:00:00 2001 From: Weiwenzhao <123859440+wei-wenzhao@users.noreply.github.com> Date: Tue, 5 Dec 2023 10:52:50 +0800 Subject: [PATCH 09/11] Update MainWindow.xaml.cs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增空格键翻页 --- Ink Canvas/MainWindow.xaml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index ba01a3ac..39949958 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -251,7 +251,7 @@ private void Main_Grid_PreviewKeyDown(object sender, KeyEventArgs e) { if (StackPanelPPTControls.Visibility != Visibility.Visible || currentMode != 0) return; - if (e.Key == Key.Down || e.Key == Key.PageDown || e.Key == Key.Right || e.Key == Key.N) + if (e.Key == Key.Down || e.Key == Key.PageDown || e.Key == Key.Right || e.Key == Key.N || e.Key == Key.Space) { BtnPPTSlidesDown_Click(BtnPPTSlidesDown, null); } From b4040060f886b25d3b87271895dcc1126f8da271 Mon Sep 17 00:00:00 2001 From: ChangSakura Date: Sun, 3 Dec 2023 01:21:46 +0800 Subject: [PATCH 10/11] =?UTF-8?q?[fix]=20=E9=9D=9E=E9=A2=84=E6=9C=9F?= =?UTF-8?q?=E7=9A=84=E6=A9=A1=E7=9A=AE=E5=A4=A7=E5=B0=8F=EF=BC=9B=E8=BD=AF?= =?UTF-8?q?=E4=BB=B6=E5=90=AF=E5=8A=A8=E6=97=B6=E9=83=A8=E5=88=86=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E9=80=89=E9=A1=B9=E6=9C=AA=E6=9B=B4=E6=96=B0=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/MainWindow.xaml | 2 +- Ink Canvas/MainWindow.xaml.cs | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml index 5729d3f7..95f7ffc9 100644 --- a/Ink Canvas/MainWindow.xaml +++ b/Ink Canvas/MainWindow.xaml @@ -598,7 +598,7 @@ 开发者: XY Wang (WXRIW) - 贡献者: Kengwang, Raspberry Kan, jiajiaxd, CN-Ironegg, Clover Yan, STBBRD + 贡献者: Kengwang, Raspberry Kan, jiajiaxd, CN-Ironegg, Clover Yan, STBBRD, ChangSakura 开源地址: diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index 39949958..52f5517b 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -702,6 +702,14 @@ private void LoadSettings(bool isStartup = true) { ToggleSwitchEnableTwoFingerZoom.IsOn = false; } + if (Settings.Gesture.IsEnableTwoFingerTranslate) + { + ToggleSwitchEnableTwoFingerTranslate.IsOn = true; + } + else + { + ToggleSwitchEnableTwoFingerTranslate.IsOn = false; + } if (Settings.Gesture.IsEnableTwoFingerRotation) { ToggleSwitchEnableTwoFingerRotation.IsOn = true; @@ -761,6 +769,8 @@ private void LoadSettings(bool isStartup = true) ComboBoxPenStyle.SelectedIndex = Settings.Canvas.InkStyle; ComboBoxEraserSize.SelectedIndex = Settings.Canvas.EraserSize; + + ComboBoxHyperbolaAsymptoteOption.SelectedIndex = (int)Settings.Canvas.HyperbolaAsymptoteOption; } else { @@ -1045,9 +1055,9 @@ private void BtnErase_Click(object sender, RoutedEventArgs e) forcePointEraser = false; break; } + inkCanvas.EraserShape = forcePointEraser ? new EllipseStylusShape(50, 50) : new EllipseStylusShape(5, 5); inkCanvas.EditingMode = forcePointEraser ? InkCanvasEditingMode.EraseByPoint : InkCanvasEditingMode.EraseByStroke; - inkCanvas.EraserShape = forcePointEraser ? new EllipseStylusShape(50, 50) : new EllipseStylusShape(5, 5); drawingShapeMode = 0; GeometryDrawingEraser.Brush = forcePointEraser ? new SolidColorBrush(Color.FromRgb(0x23, 0xA9, 0xF2)) From 8136db722148057e1174c9d5e894728e90eb298d Mon Sep 17 00:00:00 2001 From: clover_yan <56215525+clover-yan@users.noreply.github.com> Date: Thu, 8 Feb 2024 07:48:12 +0000 Subject: [PATCH 11/11] =?UTF-8?q?Revert=20"=E4=BD=BF=E7=94=A8=E5=AE=9E?= =?UTF-8?q?=E9=99=85=E5=B1=8F=E5=B9=95=E5=B0=BA=E5=AF=B8=E6=88=AA=E5=9B=BE?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 2a20c5216924368642041775bd16b0d7fff7725e. --- Ink Canvas/MainWindow.xaml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index 4f53d15e..f2953699 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -6728,7 +6728,7 @@ private void BtnScreenshot_Click(object sender, RoutedEventArgs e) private void SaveScreenShot(bool isHideNotification, string fileName = null) { - System.Drawing.Rectangle rc = System.Windows.Forms.Screen.PrimaryScreen.Bounds; + System.Drawing.Rectangle rc = System.Windows.Forms.SystemInformation.VirtualScreen; var bitmap = new System.Drawing.Bitmap(rc.Width, rc.Height, System.Drawing.Imaging.PixelFormat.Format32bppArgb); using (System.Drawing.Graphics memoryGrahics = System.Drawing.Graphics.FromImage(bitmap))