From b16000f8e5347c898c0f7aff68eacd27a57c8692 Mon Sep 17 00:00:00 2001 From: CJKmkp <2564608840@qq.com> Date: Sat, 6 Sep 2025 17:51:25 +0800 Subject: [PATCH] =?UTF-8?q?improve:=E7=AA=97=E5=8F=A3=E7=BD=AE=E9=A1=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs index fdf87b46..6fec6550 100644 --- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs +++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs @@ -350,6 +350,12 @@ namespace Ink_Canvas { BorderSettings.Visibility = Visibility.Collapsed; isOpeningOrHidingSettingsPane = false; + // 在设置面板完全关闭后,恢复无焦点模式设置 + if (wasNoFocusModeBeforeSettings) + { + Settings.Advanced.IsNoFocusMode = true; + ApplyNoFocusMode(); + } }; BorderSettings.Visibility = Visibility.Visible; @@ -2574,6 +2580,7 @@ namespace Ink_Canvas } private bool isOpeningOrHidingSettingsPane; + private bool wasNoFocusModeBeforeSettings; private void BtnSettings_Click(object sender, RoutedEventArgs e) { @@ -2583,6 +2590,14 @@ namespace Ink_Canvas } else { + // 临时禁用无焦点模式以避免下拉选项被遮挡 + wasNoFocusModeBeforeSettings = Settings.Advanced.IsNoFocusMode; + if (wasNoFocusModeBeforeSettings) + { + Settings.Advanced.IsNoFocusMode = false; + ApplyNoFocusMode(); + } + // 设置蒙版为可点击,并添加半透明背景 BorderSettingsMask.IsHitTestVisible = true; BorderSettingsMask.Background = new SolidColorBrush(Color.FromArgb(1, 0, 0, 0));