55using CommunityToolkit . Mvvm . DependencyInjection ;
66using CommunityToolkit . Mvvm . Input ;
77using Flow . Launcher . Core . Plugin ;
8- using Flow . Launcher . Helper ;
98using Flow . Launcher . Infrastructure . Hotkey ;
109using Flow . Launcher . Plugin ;
1110using Flow . Launcher . Resources . Controls ;
@@ -81,12 +80,13 @@ private void PluginHotkeySettings_Loaded(object sender, RoutedEventArgs e)
8180 var hotkeyControl = new HotkeyControl
8281 {
8382 Type = hotkey . HotkeyType == HotkeyType . Global ?
84- HotkeyControl . HotkeyType . GlobalPluginHotkey : HotkeyControl . HotkeyType . WindowPluginHotkey ,
83+ HotkeyControl . HotkeyType . GlobalPluginHotkey :
84+ HotkeyControl . HotkeyType . WindowPluginHotkey ,
8585 DefaultHotkey = hotkey . DefaultHotkey ,
8686 ValidateKeyGesture = true
8787 } ;
8888 hotkeyControl . SetHotkey ( hotkeySetting , true ) ;
89- hotkeyControl . ChangeHotkey = new RelayCommand < HotkeyModel > ( ( m ) => ChangePluginHotkey ( metadata , hotkey , m ) ) ;
89+ hotkeyControl . ChangeHotkey = new RelayCommand < HotkeyModel > ( ( h ) => ChangePluginHotkey ( metadata , hotkey , h ) ) ;
9090 card . Content = hotkeyControl ;
9191 }
9292 else
@@ -108,18 +108,11 @@ private static void ChangePluginHotkey(PluginMetadata metadata, BasePluginHotkey
108108 {
109109 if ( pluginHotkey is GlobalPluginHotkey globalPluginHotkey )
110110 {
111- var oldHotkey = PluginManager . ChangePluginHotkey ( metadata , globalPluginHotkey , newHotkey ) ;
112- HotKeyMapper . RemoveHotkey ( oldHotkey ) ;
113- HotKeyMapper . SetGlobalPluginHotkey ( globalPluginHotkey , metadata , newHotkey ) ;
111+ PluginManager . ChangePluginHotkey ( metadata , globalPluginHotkey , newHotkey ) ;
114112 }
115113 else if ( pluginHotkey is SearchWindowPluginHotkey windowPluginHotkey )
116114 {
117- var ( oldHotkeyModel , newHotkeyModel ) = PluginManager . ChangePluginHotkey ( metadata , windowPluginHotkey , newHotkey ) ;
118- var windowPluginHotkeys = PluginManager . GetWindowPluginHotkeys ( ) ;
119- HotKeyMapper . RemoveWindowHotkey ( oldHotkeyModel ) ;
120- HotKeyMapper . RemoveWindowHotkey ( newHotkeyModel ) ;
121- HotKeyMapper . SetWindowHotkey ( oldHotkeyModel , windowPluginHotkeys [ oldHotkeyModel ] ) ;
122- HotKeyMapper . SetWindowHotkey ( newHotkeyModel , windowPluginHotkeys [ newHotkeyModel ] ) ;
115+ PluginManager . ChangePluginHotkey ( metadata , windowPluginHotkey , newHotkey ) ;
123116 }
124117 }
125118}
0 commit comments