修复 PPT 内进入画板问题

Author: clover-yan

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)