diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml index 516d96d3..03a1f3b4 100644 --- a/Ink Canvas/MainWindow.xaml +++ b/Ink Canvas/MainWindow.xaml @@ -2438,6 +2438,16 @@ + + + + + diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs index 7cf93f05..3fa87ba0 100644 --- a/Ink Canvas/MainWindow.xaml.cs +++ b/Ink Canvas/MainWindow.xaml.cs @@ -3811,8 +3811,10 @@ namespace Ink_Canvas { if (PPTQuickPanelContainer == null || PPTQuickPanel == null) return; - // 仅在PPT模式下显示 - if (BtnPPTSlideShowEnd.Visibility == Visibility.Visible) + // 仅在 PPT 模式下且用户开启“PPT 放映时显示快速面板”时显示 + bool inSlideShow = BtnPPTSlideShowEnd.Visibility == Visibility.Visible; + bool showQuickPanel = Settings.PowerPointSettings.ShowPPTSidebarByDefault; + if (inSlideShow && showQuickPanel) { PPTQuickPanelContainer.Visibility = Visibility.Visible; PPTQuickPanel?.UpdateVisibility(true); diff --git a/Ink Canvas/MainWindow_cs/MW_Settings.cs b/Ink Canvas/MainWindow_cs/MW_Settings.cs index 3f427bc5..6e20a3da 100644 --- a/Ink Canvas/MainWindow_cs/MW_Settings.cs +++ b/Ink Canvas/MainWindow_cs/MW_Settings.cs @@ -1748,6 +1748,15 @@ namespace Ink_Canvas UpdatePPTBtnPreview(); } + private void ToggleSwitchShowPPTSidebarByDefault_Toggled(object sender, RoutedEventArgs e) + { + if (!isLoaded) return; + Settings.PowerPointSettings.ShowPPTSidebarByDefault = ToggleSwitchShowPPTSidebarByDefault.IsOn; + SaveSettingsToFile(); + if (BtnPPTSlideShowEnd?.Visibility == Visibility.Visible) + UpdatePPTQuickPanelVisibility(); + } + private void ToggleSwitchEnablePPTButtonPageClickable_OnToggled(object sender, RoutedEventArgs e) { if (!isLoaded) return; diff --git a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs index d0022691..78b98ec0 100644 --- a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs +++ b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs @@ -562,6 +562,10 @@ namespace Ink_Canvas } ComboBoxPPTTimeCapsulePosition.SelectedIndex = position; } + if (ToggleSwitchShowPPTSidebarByDefault != null) + { + ToggleSwitchShowPPTSidebarByDefault.IsOn = Settings.PowerPointSettings.ShowPPTSidebarByDefault; + } // -- new -- ToggleSwitchShowPPTButton.IsOn = Settings.PowerPointSettings.ShowPPTButton; diff --git a/Ink Canvas/Resources/Settings.cs b/Ink Canvas/Resources/Settings.cs index 5dd07a71..d0a55b01 100644 --- a/Ink Canvas/Resources/Settings.cs +++ b/Ink Canvas/Resources/Settings.cs @@ -405,6 +405,8 @@ namespace Ink_Canvas public int PPTTimeCapsulePosition { get; set; } = 1; [JsonProperty("useRotPptLink")] public bool UseRotPptLink { get; set; } = false; + [JsonProperty("showPPTSidebarByDefault")] + public bool ShowPPTSidebarByDefault { get; set; } = false; } public class Automation