From 2515848dfa918d38fdaace84ee1437dffafcf09c Mon Sep 17 00:00:00 2001 From: clover_yan <56215525+clover-yan@users.noreply.github.com> Date: Thu, 18 May 2023 16:46:24 +0800 Subject: [PATCH 1/5] Unpin window in blackboard --- Ink Canvas/MainWindow.xaml.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index c85a18b..e22fa48 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -6657,6 +6657,7 @@ namespace Ink_Canvas if (currentMode == 0) { //进入黑板 + Topmost = false; if (BtnPPTSlideShowEnd.Visibility == Visibility.Collapsed) { pointDesktop = new Point(ViewboxFloatingBar.Margin.Left, ViewboxFloatingBar.Margin.Top); @@ -6687,6 +6688,7 @@ namespace Ink_Canvas else { //关闭黑板 + Topmost = true; if (isInMultiTouchMode) BorderMultiTouchMode_MouseUp(null, null); From 09aa1c92d642f3d775cbe59eba2e3998496a66b3 Mon Sep 17 00:00:00 2001 From: clover_yan <56215525+clover-yan@users.noreply.github.com> Date: Wed, 24 May 2023 11:55:48 +0800 Subject: [PATCH 2/5] Check BorderMode --- Ink Canvas/MainWindow.xaml.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index e22fa48..782092a 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -6657,7 +6657,8 @@ namespace Ink_Canvas if (currentMode == 0) { //进入黑板 - Topmost = false; + if (App.StartArgs.Contains("-b")) + Topmost = false; if (BtnPPTSlideShowEnd.Visibility == Visibility.Collapsed) { pointDesktop = new Point(ViewboxFloatingBar.Margin.Left, ViewboxFloatingBar.Margin.Top); @@ -6688,7 +6689,8 @@ namespace Ink_Canvas else { //关闭黑板 - Topmost = true; + if (App.StartArgs.Contains("-b")) + Topmost = true; if (isInMultiTouchMode) BorderMultiTouchMode_MouseUp(null, null); From 76cb10b2c9f12a60f7f24cdc779397e5fa91a4bd Mon Sep 17 00:00:00 2001 From: clover_yan <56215525+clover-yan@users.noreply.github.com> Date: Wed, 24 May 2023 16:33:32 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=88=91=E5=A5=BD=E5=83=8F=E5=86=99?= =?UTF-8?q?=E5=8F=8D=E4=BA=86=E2=80=A6=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/MainWindow.xaml.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index 782092a..e604e6c 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -6657,7 +6657,7 @@ namespace Ink_Canvas if (currentMode == 0) { //进入黑板 - if (App.StartArgs.Contains("-b")) + if (!App.StartArgs.Contains("-b")) Topmost = false; if (BtnPPTSlideShowEnd.Visibility == Visibility.Collapsed) { @@ -6689,7 +6689,7 @@ namespace Ink_Canvas else { //关闭黑板 - if (App.StartArgs.Contains("-b")) + if (!App.StartArgs.Contains("-b")) Topmost = true; if (isInMultiTouchMode) BorderMultiTouchMode_MouseUp(null, null); From 8ec51037841cd9453582e060483c6e397eebcc85 Mon Sep 17 00:00:00 2001 From: clover_yan <56215525+clover-yan@users.noreply.github.com> Date: Wed, 24 May 2023 20:26:02 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E9=81=BF=E5=85=8D=20Star?= =?UTF-8?q?tArgs=20=E4=B8=BA=20null=20=E6=97=B6=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 可能会出错吧…… --- Ink Canvas/MainWindow.xaml.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index e604e6c..6a5a730 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -6657,8 +6657,12 @@ namespace Ink_Canvas if (currentMode == 0) { //进入黑板 - if (!App.StartArgs.Contains("-b")) + try { + if (!App.StartArgs.Contains("-b")) + Topmost = false; + } catch { Topmost = false; + } if (BtnPPTSlideShowEnd.Visibility == Visibility.Collapsed) { pointDesktop = new Point(ViewboxFloatingBar.Margin.Left, ViewboxFloatingBar.Margin.Top); @@ -6689,8 +6693,12 @@ namespace Ink_Canvas else { //关闭黑板 - if (!App.StartArgs.Contains("-b")) + try { + if (!App.StartArgs.Contains("-b")) + Topmost = true; + } catch { Topmost = true; + } if (isInMultiTouchMode) BorderMultiTouchMode_MouseUp(null, null); From 0b471cd39afa765d4b25b5fe66e2a7e716819dad Mon Sep 17 00:00:00 2001 From: XY Wang Date: Mon, 29 May 2023 11:14:07 +0800 Subject: [PATCH 5/5] Update MainWindow.xaml.cs --- Ink Canvas/MainWindow.xaml.cs | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index e1c26d2..ea4cc25 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -6696,12 +6696,8 @@ namespace Ink_Canvas if (currentMode == 0) { //进入黑板 - try { - if (!App.StartArgs.Contains("-b")) - Topmost = false; - } catch { - Topmost = false; - } + Topmost = false; + if (BtnPPTSlideShowEnd.Visibility == Visibility.Collapsed) { pointDesktop = new Point(ViewboxFloatingBar.Margin.Left, ViewboxFloatingBar.Margin.Top); @@ -6732,12 +6728,7 @@ namespace Ink_Canvas else { //关闭黑板 - try { - if (!App.StartArgs.Contains("-b")) - Topmost = true; - } catch { - Topmost = true; - } + Topmost = true; if (isInMultiTouchMode) BorderMultiTouchMode_MouseUp(null, null);