From 166e0d400a4fb5d632957b2f9e18848d13ca2d6d Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Mon, 21 Jul 2025 16:43:29 +0800
Subject: [PATCH] =?UTF-8?q?add:=E4=BE=A7=E8=BE=B9=E6=A0=8F=E9=80=80?=
 =?UTF-8?q?=E5=87=BA=E6=94=BE=E6=98=A0=E6=8C=89=E9=92=AE=20#38?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow.xaml         | 20 ++++++++++++++++++++
 Ink Canvas/MainWindow.xaml.cs      |  6 ++++++
 Ink Canvas/MainWindow_cs/MW_PPT.cs | 13 +++++++++++++
 3 files changed, 39 insertions(+)

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 8ec2d9e0..8de161eb 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -7841,6 +7841,16 @@
                                RenderOptions.BitmapScalingMode="HighQuality" Height="17" Margin="0,3,0,0" />
                         <TextBlock Text="白板" Foreground="Black" FontSize="8" Margin="0,2,0,3" TextAlignment="Center" />
                     </ui:SimpleStackPanel>
+                    <ui:SimpleStackPanel
+                        x:Name="BtnExitPptFromSidebarLeft"
+                        MouseUp="ExitPPTSlideShow_MouseUp"
+                        Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center"
+                        Width="32" Margin="0" Visibility="Collapsed">
+                        <Image Source="/Resources/new-icons/end-slides-show.png"
+                               RenderOptions.BitmapScalingMode="HighQuality" Height="17" Margin="0,3,0,0" />
+                        <TextBlock Text="退出放映" Foreground="Black" FontSize="8" Margin="0,2,0,3" TextAlignment="Center" />
+                    </ui:SimpleStackPanel>
+
                     <ui:SimpleStackPanel
                         MouseUp="UnFoldFloatingBar_MouseUp"
                         Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center"
@@ -7914,6 +7924,16 @@
                                RenderOptions.BitmapScalingMode="HighQuality" Height="17" Margin="0,3,0,0" />
                         <TextBlock Text="白板" Foreground="Black" FontSize="8" Margin="0,2,0,3" TextAlignment="Center" />
                     </ui:SimpleStackPanel>
+                    <ui:SimpleStackPanel
+                        x:Name="BtnExitPptFromSidebarRight"
+                        MouseUp="ExitPPTSlideShow_MouseUp"
+                        Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center"
+                        Width="32" Margin="0" Visibility="Collapsed">
+                        <Image Source="/Resources/new-icons/end-slides-show.png"
+                               RenderOptions.BitmapScalingMode="HighQuality" Height="17" Margin="0,3,0,0" />
+                        <TextBlock Text="退出放映" Foreground="Black" FontSize="8" Margin="0,2,0,3" TextAlignment="Center" />
+                    </ui:SimpleStackPanel>
+
                     <ui:SimpleStackPanel
                         MouseUp="UnFoldFloatingBar_MouseUp"
                         Background="Transparent" Orientation="Vertical" HorizontalAlignment="Center"
diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
index 8d5ee0b9..3c035819 100644
--- a/Ink Canvas/MainWindow.xaml.cs	
+++ b/Ink Canvas/MainWindow.xaml.cs	
@@ -1306,5 +1306,11 @@ namespace Ink_Canvas {
                 currentPageIndex = whiteboardPages.Count - 1;
             ShowPage(currentPageIndex);
         }
+        // 快速面板退出PPT放映按钮事件
+        private void ExitPPTSlideShow_MouseUp(object sender, MouseButtonEventArgs e)
+        {
+            // 直接调用PPT放映结束按钮的逻辑
+            BtnPPTSlideShowEnd_Click(BtnPPTSlideShowEnd, null);
+        }
     }
 }
\ No newline at end of file
diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs
index 40c12618..5231d089 100644
--- a/Ink Canvas/MainWindow_cs/MW_PPT.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs	
@@ -711,8 +711,15 @@ namespace Ink_Canvas {
                         })).Start();
                     }
                 });
+                await Application.Current.Dispatcher.InvokeAsync(() => {
+                    if (BtnExitPptFromSidebarLeft != null)
+                        BtnExitPptFromSidebarLeft.Visibility = Visibility.Visible;
+                    if (BtnExitPptFromSidebarRight != null)
+                        BtnExitPptFromSidebarRight.Visibility = Visibility.Visible;
+                });
             }
             catch (Exception ex) {
+                LogHelper.WriteLogToFile("PowerPoint Application Slide Show Begin Error: " + ex.ToString(), LogHelper.LogType.Error);
                 LogHelper.WriteLogToFile(ex.ToString(), LogHelper.LogType.Error);
             }
         }
@@ -1304,6 +1311,12 @@ namespace Ink_Canvas {
             {
                 LogHelper.WriteLogToFile($"结束PPT放映操作异常: {ex.ToString()}", LogHelper.LogType.Error);
             }
+            await Application.Current.Dispatcher.InvokeAsync(() => {
+                if (BtnExitPptFromSidebarLeft != null)
+                    BtnExitPptFromSidebarLeft.Visibility = Visibility.Collapsed;
+                if (BtnExitPptFromSidebarRight != null)
+                    BtnExitPptFromSidebarRight.Visibility = Visibility.Collapsed;
+            });
         }
 
         private void GridPPTControlPrevious_MouseDown(object sender, MouseButtonEventArgs e)