Fix custom hotkey preview issue

Jack251970 · Jack251970 · commit d73f3a165b9d · 2025-02-17T00:00:18.000+08:00
diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
@@ -7,20 +7,23 @@
 using System.Windows.Input;
 using System.Windows.Controls;
 using Flow.Launcher.Core;
+using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher
 {
     public partial class CustomQueryHotkeySetting : Window
     {
         private SettingWindow _settingWidow;
+        private readonly Settings _settings;
+        private readonly MainViewModel _mainViewModel;
         private bool update;
         private CustomPluginHotkey updateCustomHotkey;
-        public Settings Settings { get; }
 
-        public CustomQueryHotkeySetting(SettingWindow settingWidow, Settings settings)
+        public CustomQueryHotkeySetting(SettingWindow settingWidow, Settings settings, MainViewModel mainVM)
         {
             _settingWidow = settingWidow;
-            Settings = settings;
+            _settings = settings;
+            _mainViewModel = mainVM;
             InitializeComponent();
         }
 
@@ -33,13 +36,13 @@ private void btnAdd_OnClick(object sender, RoutedEventArgs e)
         {
             if (!update)
             {
-                Settings.CustomPluginHotkeys ??= new ObservableCollection<CustomPluginHotkey>();
+                _settings.CustomPluginHotkeys ??= new ObservableCollection<CustomPluginHotkey>();
 
                 var pluginHotkey = new CustomPluginHotkey
                 {
                     Hotkey = HotkeyControl.CurrentHotkey.ToString(), ActionKeyword = tbAction.Text
                 };
-                Settings.CustomPluginHotkeys.Add(pluginHotkey);
+                _settings.CustomPluginHotkeys.Add(pluginHotkey);
 
                 HotKeyMapper.SetCustomQueryHotkey(pluginHotkey);
             }
@@ -59,7 +62,7 @@ private void btnAdd_OnClick(object sender, RoutedEventArgs e)
 
         public void UpdateItem(CustomPluginHotkey item)
         {
-            updateCustomHotkey = Settings.CustomPluginHotkeys.FirstOrDefault(o =>
+            updateCustomHotkey = _settings.CustomPluginHotkeys.FirstOrDefault(o =>
                 o.ActionKeyword == item.ActionKeyword && o.Hotkey == item.Hotkey);
             if (updateCustomHotkey == null)
             {
@@ -77,8 +80,7 @@ public void UpdateItem(CustomPluginHotkey item)
         private void BtnTestActionKeyword_OnClick(object sender, RoutedEventArgs e)
         {
             App.API.ChangeQuery(tbAction.Text);
-            Application.Current.MainWindow.Show();
-            Application.Current.MainWindow.Opacity = 1;
+            _mainViewModel.Show(false);
             Application.Current.MainWindow.Focus();
         }
 
diff --git a/Flow.Launcher/CustomShortcutSetting.xaml.cs b/Flow.Launcher/CustomShortcutSetting.xaml.cs
@@ -4,21 +4,24 @@
 using System.Windows.Input;
 using Flow.Launcher.SettingPages.ViewModels;
 using Flow.Launcher.Core;
+using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher
 {
     public partial class CustomShortcutSetting : Window
     {
         private readonly SettingsPaneHotkeyViewModel _hotkeyVm;
+        private readonly MainViewModel _mainViewModel;
         public string Key { get; set; } = String.Empty;
         public string Value { get; set; } = String.Empty;
         private string originalKey { get; } = null;
         private string originalValue { get; } = null;
         private bool update { get; } = false;
 
-        public CustomShortcutSetting(SettingsPaneHotkeyViewModel vm)
+        public CustomShortcutSetting(SettingsPaneHotkeyViewModel vm, MainViewModel mainVM)
         {
             _hotkeyVm = vm;
+            _mainViewModel = mainVM;
             InitializeComponent();
         }
 
@@ -65,8 +68,7 @@ private void cmdEsc_OnPress(object sender, ExecutedRoutedEventArgs e)
         private void BtnTestShortcut_OnClick(object sender, RoutedEventArgs e)
         {
             App.API.ChangeQuery(tbExpand.Text);
-            Application.Current.MainWindow.Show();
-            Application.Current.MainWindow.Opacity = 1;
+            _mainViewModel.Show(false);
             Application.Current.MainWindow.Focus();
         }
     }
diff --git a/Flow.Launcher/PublicAPIInstance.cs b/Flow.Launcher/PublicAPIInstance.cs
@@ -105,7 +105,7 @@ public void OpenSettingDialog()
         {
             Application.Current.Dispatcher.Invoke(() =>
             {
-                SettingWindow sw = SingletonWindowOpener.Open<SettingWindow>(this, _settingsVM);
+                SettingWindow sw = SingletonWindowOpener.Open<SettingWindow>(this, _settingsVM, _mainVM);
             });
         }
 
diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneHotkeyViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneHotkeyViewModel.cs
@@ -8,12 +8,14 @@
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
 using Flow.Launcher.Core;
+using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher.SettingPages.ViewModels;
 
 public partial class SettingsPaneHotkeyViewModel : BaseModel
 {
     public Settings Settings { get; }
+    private MainViewModel MainVM { get; }
 
     public CustomPluginHotkey SelectedCustomPluginHotkey { get; set; }
     public CustomShortcutModel SelectedCustomShortcut { get; set; }
@@ -25,9 +27,10 @@ public partial class SettingsPaneHotkeyViewModel : BaseModel
         $"{KeyConstant.Ctrl}+{KeyConstant.Alt}"
     };
 
-    public SettingsPaneHotkeyViewModel(Settings settings)
+    public SettingsPaneHotkeyViewModel(Settings settings, MainViewModel mainVM)
     {
         Settings = settings;
+        MainVM = mainVM;
     }
 
     [RelayCommand]
@@ -71,15 +74,15 @@ private void CustomHotkeyEdit()
             return;
         }
 
-        var window = new CustomQueryHotkeySetting(null, Settings);
+        var window = new CustomQueryHotkeySetting(null, Settings, MainVM);
         window.UpdateItem(item);
         window.ShowDialog();
     }
 
     [RelayCommand]
     private void CustomHotkeyAdd()
     {
-        new CustomQueryHotkeySetting(null, Settings).ShowDialog();
+        new CustomQueryHotkeySetting(null, Settings, MainVM).ShowDialog();
     }
 
     [RelayCommand]
@@ -126,7 +129,7 @@ private void CustomShortcutEdit()
     [RelayCommand]
     private void CustomShortcutAdd()
     {
-        var window = new CustomShortcutSetting(this);
+        var window = new CustomShortcutSetting(this, MainVM);
         if (window.ShowDialog() is true)
         {
             var shortcut = new CustomShortcutModel(window.Key, window.Value);
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml.cs
@@ -12,9 +12,9 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
     {
         if (!IsInitialized)
         {
-            if (e.ExtraData is not SettingWindow.PaneData { Settings: { } settings })
+            if (e.ExtraData is not SettingWindow.PaneData { Settings: { } settings, MainViewModel: { } mainVM })
                 throw new ArgumentException("Settings are required for SettingsPaneHotkey.");
-            _viewModel = new SettingsPaneHotkeyViewModel(settings);
+            _viewModel = new SettingsPaneHotkeyViewModel(settings, mainVM);
             DataContext = _viewModel;
             InitializeComponent();
         }
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
@@ -20,12 +20,14 @@ public partial class SettingWindow
     private readonly IPublicAPI _api;
     private readonly Settings _settings;
     private readonly SettingWindowViewModel _viewModel;
+    private readonly MainViewModel _mainVM;
 
-    public SettingWindow(IPublicAPI api, SettingWindowViewModel viewModel)
+    public SettingWindow(IPublicAPI api, SettingWindowViewModel viewModel, MainViewModel mainVM)
     {
         _settings = viewModel.Settings;
         DataContext = viewModel;
         _viewModel = viewModel;
+        _mainVM = mainVM;
         _api = api;
         InitializePosition();
         InitializeComponent();
@@ -160,7 +162,7 @@ private double WindowTop()
 
     private void NavigationView_SelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)
     {
-        var paneData = new PaneData(_settings, _viewModel.Updater, _viewModel.Portable);
+        var paneData = new PaneData(_settings, _viewModel.Updater, _viewModel.Portable, _mainVM);
         if (args.IsSettingsSelected)
         {
             ContentFrame.Navigate(typeof(SettingsPaneGeneral), paneData);
@@ -206,5 +208,5 @@ private void ContentFrame_Loaded(object sender, RoutedEventArgs e)
         NavView.SelectedItem ??= NavView.MenuItems[0]; /* Set First Page */
     }
 
-    public record PaneData(Settings Settings, Updater Updater, IPortable Portable);
+    public record PaneData(Settings Settings, Updater Updater, IPortable Portable, MainViewModel MainViewModel);
 }
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -1359,7 +1359,7 @@ public void ToggleFlowLauncher()
             }
         }
 
-        public void Show()
+        public void Show(bool invokeEvent = true)
         {
             Application.Current.Dispatcher.Invoke(() =>
             {
@@ -1368,7 +1368,8 @@ public void Show()
                 MainWindowOpacity = 1;
 
                 MainWindowVisibilityStatus = true;
-                VisibilityChanged?.Invoke(this, new VisibilityChangedEventArgs { IsVisible = true });
+                if (invokeEvent)
+                    VisibilityChanged?.Invoke(this, new VisibilityChangedEventArgs { IsVisible = true });
             });
         }
 

Original file line number	Diff line number	Diff line change
`@@ -7,20 +7,23 @@`
`7`	`7`	`using System.Windows.Input;`
`8`	`8`	`using System.Windows.Controls;`
`9`	`9`	`using Flow.Launcher.Core;`
	`10`	`+using Flow.Launcher.ViewModel;`
`10`	`11`
`11`	`12`	`namespace Flow.Launcher`
`12`	`13`	`{`
`13`	`14`	`public partial class CustomQueryHotkeySetting : Window`
`14`	`15`	`{`
`15`	`16`	`private SettingWindow _settingWidow;`
	`17`	`+ private readonly Settings _settings;`
	`18`	`+ private readonly MainViewModel _mainViewModel;`
`16`	`19`	`private bool update;`
`17`	`20`	`private CustomPluginHotkey updateCustomHotkey;`
`18`		`- public Settings Settings { get; }`
`19`	`21`
`20`		`- public CustomQueryHotkeySetting(SettingWindow settingWidow, Settings settings)`
	`22`	`+ public CustomQueryHotkeySetting(SettingWindow settingWidow, Settings settings, MainViewModel mainVM)`
`21`	`23`	`{`
`22`	`24`	`_settingWidow = settingWidow;`
`23`		`- Settings = settings;`
	`25`	`+ _settings = settings;`
	`26`	`+ _mainViewModel = mainVM;`
`24`	`27`	`InitializeComponent();`
`25`	`28`	`}`
`26`	`29`
`@@ -33,13 +36,13 @@ private void btnAdd_OnClick(object sender, RoutedEventArgs e)`
`33`	`36`	`{`
`34`	`37`	`if (!update)`
`35`	`38`	`{`
`36`		`- Settings.CustomPluginHotkeys ??= new ObservableCollection<CustomPluginHotkey>();`
	`39`	`+ _settings.CustomPluginHotkeys ??= new ObservableCollection<CustomPluginHotkey>();`
`37`	`40`
`38`	`41`	`var pluginHotkey = new CustomPluginHotkey`
`39`	`42`	`{`
`40`	`43`	`Hotkey = HotkeyControl.CurrentHotkey.ToString(), ActionKeyword = tbAction.Text`
`41`	`44`	`};`
`42`		`- Settings.CustomPluginHotkeys.Add(pluginHotkey);`
	`45`	`+ _settings.CustomPluginHotkeys.Add(pluginHotkey);`
`43`	`46`
`44`	`47`	`HotKeyMapper.SetCustomQueryHotkey(pluginHotkey);`
`45`	`48`	`}`
`@@ -59,7 +62,7 @@ private void btnAdd_OnClick(object sender, RoutedEventArgs e)`
`59`	`62`
`60`	`63`	`public void UpdateItem(CustomPluginHotkey item)`
`61`	`64`	`{`
`62`		`- updateCustomHotkey = Settings.CustomPluginHotkeys.FirstOrDefault(o =>`
	`65`	`+ updateCustomHotkey = _settings.CustomPluginHotkeys.FirstOrDefault(o =>`
`63`	`66`	`o.ActionKeyword == item.ActionKeyword && o.Hotkey == item.Hotkey);`
`64`	`67`	`if (updateCustomHotkey == null)`
`65`	`68`	`{`
`@@ -77,8 +80,7 @@ public void UpdateItem(CustomPluginHotkey item)`
`77`	`80`	`private void BtnTestActionKeyword_OnClick(object sender, RoutedEventArgs e)`
`78`	`81`	`{`
`79`	`82`	`App.API.ChangeQuery(tbAction.Text);`
`80`		`- Application.Current.MainWindow.Show();`
`81`		`- Application.Current.MainWindow.Opacity = 1;`
	`83`	`+ _mainViewModel.Show(false);`
`82`	`84`	`Application.Current.MainWindow.Focus();`
`83`	`85`	`}`
`84`	`86`
Original file line number	Diff line number	Diff line change
`@@ -4,21 +4,24 @@`
`4`	`4`	`using System.Windows.Input;`
`5`	`5`	`using Flow.Launcher.SettingPages.ViewModels;`
`6`	`6`	`using Flow.Launcher.Core;`
	`7`	`+using Flow.Launcher.ViewModel;`
`7`	`8`
`8`	`9`	`namespace Flow.Launcher`
`9`	`10`	`{`
`10`	`11`	`public partial class CustomShortcutSetting : Window`
`11`	`12`	`{`
`12`	`13`	`private readonly SettingsPaneHotkeyViewModel _hotkeyVm;`
	`14`	`+ private readonly MainViewModel _mainViewModel;`
`13`	`15`	`public string Key { get; set; } = String.Empty;`
`14`	`16`	`public string Value { get; set; } = String.Empty;`
`15`	`17`	`private string originalKey { get; } = null;`
`16`	`18`	`private string originalValue { get; } = null;`
`17`	`19`	`private bool update { get; } = false;`
`18`	`20`
`19`		`- public CustomShortcutSetting(SettingsPaneHotkeyViewModel vm)`
	`21`	`+ public CustomShortcutSetting(SettingsPaneHotkeyViewModel vm, MainViewModel mainVM)`
`20`	`22`	`{`
`21`	`23`	`_hotkeyVm = vm;`
	`24`	`+ _mainViewModel = mainVM;`
`22`	`25`	`InitializeComponent();`
`23`	`26`	`}`
`24`	`27`
`@@ -65,8 +68,7 @@ private void cmdEsc_OnPress(object sender, ExecutedRoutedEventArgs e)`
`65`	`68`	`private void BtnTestShortcut_OnClick(object sender, RoutedEventArgs e)`
`66`	`69`	`{`
`67`	`70`	`App.API.ChangeQuery(tbExpand.Text);`
`68`		`- Application.Current.MainWindow.Show();`
`69`		`- Application.Current.MainWindow.Opacity = 1;`
	`71`	`+ _mainViewModel.Show(false);`
`70`	`72`	`Application.Current.MainWindow.Focus();`
`71`	`73`	`}`
`72`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public void OpenSettingDialog()`
`105`	`105`	`{`
`106`	`106`	`Application.Current.Dispatcher.Invoke(() =>`
`107`	`107`	`{`
`108`		`- SettingWindow sw = SingletonWindowOpener.Open<SettingWindow>(this, _settingsVM);`
	`108`	`+ SettingWindow sw = SingletonWindowOpener.Open<SettingWindow>(this, _settingsVM, _mainVM);`
`109`	`109`	`});`
`110`	`110`	`}`
`111`	`111`
Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,14 @@`
`8`	`8`	`using Flow.Launcher.Infrastructure.UserSettings;`
`9`	`9`	`using Flow.Launcher.Plugin;`
`10`	`10`	`using Flow.Launcher.Core;`
	`11`	`+using Flow.Launcher.ViewModel;`
`11`	`12`
`12`	`13`	`namespace Flow.Launcher.SettingPages.ViewModels;`
`13`	`14`
`14`	`15`	`public partial class SettingsPaneHotkeyViewModel : BaseModel`
`15`	`16`	`{`
`16`	`17`	`public Settings Settings { get; }`
	`18`	`+ private MainViewModel MainVM { get; }`
`17`	`19`
`18`	`20`	`public CustomPluginHotkey SelectedCustomPluginHotkey { get; set; }`
`19`	`21`	`public CustomShortcutModel SelectedCustomShortcut { get; set; }`
`@@ -25,9 +27,10 @@ public partial class SettingsPaneHotkeyViewModel : BaseModel`
`25`	`27`	`$"{KeyConstant.Ctrl}+{KeyConstant.Alt}"`
`26`	`28`	`};`
`27`	`29`
`28`		`- public SettingsPaneHotkeyViewModel(Settings settings)`
	`30`	`+ public SettingsPaneHotkeyViewModel(Settings settings, MainViewModel mainVM)`
`29`	`31`	`{`
`30`	`32`	`Settings = settings;`
	`33`	`+ MainVM = mainVM;`
`31`	`34`	`}`
`32`	`35`
`33`	`36`	`[RelayCommand]`
`@@ -71,15 +74,15 @@ private void CustomHotkeyEdit()`
`71`	`74`	`return;`
`72`	`75`	`}`
`73`	`76`
`74`		`- var window = new CustomQueryHotkeySetting(null, Settings);`
	`77`	`+ var window = new CustomQueryHotkeySetting(null, Settings, MainVM);`
`75`	`78`	`window.UpdateItem(item);`
`76`	`79`	`window.ShowDialog();`
`77`	`80`	`}`
`78`	`81`
`79`	`82`	`[RelayCommand]`
`80`	`83`	`private void CustomHotkeyAdd()`
`81`	`84`	`{`
`82`		`- new CustomQueryHotkeySetting(null, Settings).ShowDialog();`
	`85`	`+ new CustomQueryHotkeySetting(null, Settings, MainVM).ShowDialog();`
`83`	`86`	`}`
`84`	`87`
`85`	`88`	`[RelayCommand]`
`@@ -126,7 +129,7 @@ private void CustomShortcutEdit()`
`126`	`129`	`[RelayCommand]`
`127`	`130`	`private void CustomShortcutAdd()`
`128`	`131`	`{`
`129`		`- var window = new CustomShortcutSetting(this);`
	`132`	`+ var window = new CustomShortcutSetting(this, MainVM);`
`130`	`133`	`if (window.ShowDialog() is true)`
`131`	`134`	`{`
`132`	`135`	`var shortcut = new CustomShortcutModel(window.Key, window.Value);`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ protected override void OnNavigatedTo(NavigationEventArgs e)`
`12`	`12`	`{`
`13`	`13`	`if (!IsInitialized)`
`14`	`14`	`{`
`15`		`- if (e.ExtraData is not SettingWindow.PaneData { Settings: { } settings })`
	`15`	`+ if (e.ExtraData is not SettingWindow.PaneData { Settings: { } settings, MainViewModel: { } mainVM })`
`16`	`16`	`throw new ArgumentException("Settings are required for SettingsPaneHotkey.");`
`17`		`- _viewModel = new SettingsPaneHotkeyViewModel(settings);`
	`17`	`+ _viewModel = new SettingsPaneHotkeyViewModel(settings, mainVM);`
`18`	`18`	`DataContext = _viewModel;`
`19`	`19`	`InitializeComponent();`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,14 @@ public partial class SettingWindow`
`20`	`20`	`private readonly IPublicAPI _api;`
`21`	`21`	`private readonly Settings _settings;`
`22`	`22`	`private readonly SettingWindowViewModel _viewModel;`
	`23`	`+ private readonly MainViewModel _mainVM;`
`23`	`24`
`24`		`- public SettingWindow(IPublicAPI api, SettingWindowViewModel viewModel)`
	`25`	`+ public SettingWindow(IPublicAPI api, SettingWindowViewModel viewModel, MainViewModel mainVM)`
`25`	`26`	`{`
`26`	`27`	`_settings = viewModel.Settings;`
`27`	`28`	`DataContext = viewModel;`
`28`	`29`	`_viewModel = viewModel;`
	`30`	`+ _mainVM = mainVM;`
`29`	`31`	`_api = api;`
`30`	`32`	`InitializePosition();`
`31`	`33`	`InitializeComponent();`
`@@ -160,7 +162,7 @@ private double WindowTop()`
`160`	`162`
`161`	`163`	`private void NavigationView_SelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)`
`162`	`164`	`{`
`163`		`- var paneData = new PaneData(_settings, _viewModel.Updater, _viewModel.Portable);`
	`165`	`+ var paneData = new PaneData(_settings, _viewModel.Updater, _viewModel.Portable, _mainVM);`
`164`	`166`	`if (args.IsSettingsSelected)`
`165`	`167`	`{`
`166`	`168`	`ContentFrame.Navigate(typeof(SettingsPaneGeneral), paneData);`
`@@ -206,5 +208,5 @@ private void ContentFrame_Loaded(object sender, RoutedEventArgs e)`
`206`	`208`	`NavView.SelectedItem ??= NavView.MenuItems[0]; /* Set First Page */`
`207`	`209`	`}`
`208`	`210`
`209`		`- public record PaneData(Settings Settings, Updater Updater, IPortable Portable);`
	`211`	`+ public record PaneData(Settings Settings, Updater Updater, IPortable Portable, MainViewModel MainViewModel);`
`210`	`212`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1359,7 +1359,7 @@ public void ToggleFlowLauncher()`
`1359`	`1359`	`}`
`1360`	`1360`	`}`
`1361`	`1361`
`1362`		`- public void Show()`
	`1362`	`+ public void Show(bool invokeEvent = true)`
`1363`	`1363`	`{`
`1364`	`1364`	`Application.Current.Dispatcher.Invoke(() =>`
`1365`	`1365`	`{`
`@@ -1368,7 +1368,8 @@ public void Show()`
`1368`	`1368`	`MainWindowOpacity = 1;`
`1369`	`1369`
`1370`	`1370`	`MainWindowVisibilityStatus = true;`
`1371`		`- VisibilityChanged?.Invoke(this, new VisibilityChangedEventArgs { IsVisible = true });`
	`1371`	`+ if (invokeEvent)`
	`1372`	`+ VisibilityChanged?.Invoke(this, new VisibilityChangedEventArgs { IsVisible = true });`
`1372`	`1373`	`});`
`1373`	`1374`	`}`
`1374`	`1375`