From 87b9ebc7e15c0159720644d14f21d538b2126fa8 Mon Sep 17 00:00:00 2001 From: CJK_mkp <113243675+CJKmkp@users.noreply.github.com> Date: Sat, 8 Nov 2025 19:36:05 +0800 Subject: [PATCH] =?UTF-8?q?improve:PPT=E5=A2=A8=E8=BF=B9=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/MainWindow_cs/MW_PPT.cs | 45 ++++++++++++++---------------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs index 19a7f287..48435399 100644 --- a/Ink Canvas/MainWindow_cs/MW_PPT.cs +++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs @@ -758,37 +758,34 @@ namespace Ink_Canvas PenIcon_Click(null, null); // 然后设置颜色 BtnColorRed_Click(null, null); - Dispatcher.BeginInvoke(new Action(() => + try { - try + if (inkCanvas.EditingMode == InkCanvasEditingMode.Ink) { - if (inkCanvas.EditingMode == InkCanvasEditingMode.Ink) + UpdateCurrentToolMode("pen"); + SetFloatingBarHighlightPosition("pen"); + if (Settings.Appearance.IsShowQuickColorPalette && QuickColorPalettePanel != null && QuickColorPaletteSingleRowPanel != null) { - UpdateCurrentToolMode("pen"); - SetFloatingBarHighlightPosition("pen"); - if (Settings.Appearance.IsShowQuickColorPalette && QuickColorPalettePanel != null && QuickColorPaletteSingleRowPanel != null) + // 根据显示模式选择显示哪个面板 + if (Settings.Appearance.QuickColorPaletteDisplayMode == 0) { - // 根据显示模式选择显示哪个面板 - if (Settings.Appearance.QuickColorPaletteDisplayMode == 0) - { - // 单行显示模式 - QuickColorPalettePanel.Visibility = Visibility.Collapsed; - QuickColorPaletteSingleRowPanel.Visibility = Visibility.Visible; - } - else - { - // 双行显示模式 - QuickColorPalettePanel.Visibility = Visibility.Visible; - QuickColorPaletteSingleRowPanel.Visibility = Visibility.Collapsed; - } + // 单行显示模式 + QuickColorPalettePanel.Visibility = Visibility.Collapsed; + QuickColorPaletteSingleRowPanel.Visibility = Visibility.Visible; + } + else + { + // 双行显示模式 + QuickColorPalettePanel.Visibility = Visibility.Visible; + QuickColorPaletteSingleRowPanel.Visibility = Visibility.Collapsed; } } } - catch (Exception ex) - { - LogHelper.WriteLogToFile($"PPT进入批注模式后同步浮动栏高光状态失败: {ex.Message}", LogHelper.LogType.Error); - } - }), DispatcherPriority.Loaded); + } + catch (Exception ex) + { + LogHelper.WriteLogToFile($"PPT进入批注模式后同步浮动栏高光状态失败: {ex.Message}", LogHelper.LogType.Error); + } } isEnteredSlideShowEndEvent = false;