From bcb7002b220531fbd2c4ab0e72149ce7a26807c3 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Thu, 19 Feb 2026 19:28:21 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=B1=95=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow.xaml                    | 19 -------
 .../MainWindow_cs/MW_FloatingBarIcons.cs      |  1 +
 Ink Canvas/MainWindow_cs/MW_VideoPresenter.cs | 49 +++++++++++++++++--
 3 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index ae36d3d0..c134fbcb 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -10313,25 +10313,6 @@
                                RenderOptions.BitmapScalingMode="HighQuality" Height="17" Margin="0,3,0,0" />
                         <TextBlock Text="白板" Foreground="{DynamicResource FloatBarForeground}" FontSize="8" Margin="0,2,0,3" TextAlignment="Center" />
                     </ui:SimpleStackPanel>
-                    <ui:SimpleStackPanel
-                        MouseUp="BtnToggleVideoPresenter_Click"
-                        Background="Transparent"
-                        Orientation="Vertical"
-                        HorizontalAlignment="Center"
-                        Width="32"
-                        Margin="0">
-                        <Image
-                            Source="/Resources/Icons-png/EasiCamera.png"
-                            RenderOptions.BitmapScalingMode="HighQuality"
-                            Height="17"
-                            Margin="0,3,0,0" />
-                        <TextBlock
-                            Text="展台"
-                            Foreground="{DynamicResource FloatBarForeground}"
-                            FontSize="8"
-                            Margin="0,2,0,3"
-                            TextAlignment="Center" />
-                    </ui:SimpleStackPanel>
                     <ui:SimpleStackPanel
                         x:Name="BtnExitPptFromSidebarLeft"
                         MouseUp="ExitPPTSlideShow_MouseUp"
diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
index 79f50612..d0ccf480 100644
--- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs	
@@ -3061,6 +3061,7 @@ namespace Ink_Canvas
                 switch (++currentMode % 2)
                 {
                     case 0: //屏幕模式
+                        VideoPresenter_OnExitWhiteboardMode();
                         currentMode = 0;
                         GridBackgroundCover.Visibility = Visibility.Collapsed;
                         AnimationsHelper.HideWithSlideAndFade(BlackboardLeftSide);
diff --git a/Ink Canvas/MainWindow_cs/MW_VideoPresenter.cs b/Ink Canvas/MainWindow_cs/MW_VideoPresenter.cs
index b1bd9282..599fe93f 100644
--- a/Ink Canvas/MainWindow_cs/MW_VideoPresenter.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_VideoPresenter.cs	
@@ -183,8 +183,6 @@ namespace Ink_Canvas
                 Visibility = Visibility.Visible,
                 Opacity = 1.0
             };
-
-            // 让它具备与“普通插入图片”一致的选中/拖拽/缩放行为
             try
             {
                 InitializeElementTransform(img);
@@ -299,7 +297,6 @@ namespace Ink_Canvas
                 inkCanvas.Children.Add(img);
             }
 
-            // 上屏后自动切到选择模式，否则用户在笔模式下点不中元素
             try
             {
                 SetCurrentToolMode(InkCanvasEditingMode.Select);
@@ -526,7 +523,15 @@ namespace Ink_Canvas
 
                 InkCanvas.SetLeft(img, Math.Max(0, x));
                 InkCanvas.SetTop(img, Math.Max(0, y));
+                InitializeElementTransform(img);
+                BindElementEvents(img);
+                timeMachine.CommitElementInsertHistory(img);
+
                 inkCanvas?.Children.Add(img);
+
+                SetCurrentToolMode(InkCanvasEditingMode.Select);
+                UpdateCurrentToolMode("select");
+                HideSubPanels("select");
             }
             catch (Exception ex)
             {
@@ -534,6 +539,44 @@ namespace Ink_Canvas
             }
         }
 
+        private void VideoPresenter_OnExitWhiteboardMode()
+        {
+            try
+            {
+                // 收起侧栏
+                if (VideoPresenterSidebar != null)
+                {
+                    VideoPresenterSidebar.Visibility = Visibility.Collapsed;
+                }
+
+                if (BtnToggleVideoPresenterLiveOnCanvas != null)
+                {
+                    BtnToggleVideoPresenterLiveOnCanvas.IsChecked = false;
+                }
+
+                if (inkCanvas != null)
+                {
+                    foreach (var kv in _liveFrameImageByPage.ToList())
+                    {
+                        var img = kv.Value;
+                        if (img == null) continue;
+                        try
+                        {
+                            if (inkCanvas.Children.Contains(img))
+                            {
+                                inkCanvas.Children.Remove(img);
+                            }
+                            img.Visibility = Visibility.Collapsed;
+                        }
+                        catch { }
+                    }
+                }
+
+                try { _cameraService?.StopPreview(); } catch { }
+            }
+            catch { }
+        }
+
         private static BitmapImage ConvertBitmapToBitmapImage(Bitmap bitmap)
         {
             try