Skip to content

Commit 1c8a8d0

Browse files
committed
Code quality
1 parent 730625c commit 1c8a8d0

File tree

1 file changed

+31
-27
lines changed

1 file changed

+31
-27
lines changed

Flow.Launcher/Helper/HotKeyMapper.cs

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -217,33 +217,6 @@ private static void Settings_PropertyChanged(object sender, PropertyChangedEvent
217217
}
218218
}
219219

220-
private static void ChangeRegisteredHotkey(RegisteredHotkeyType registeredType, string newHotkeyStr)
221-
{
222-
var newHotkey = new HotkeyModel(newHotkeyStr);
223-
ChangeRegisteredHotkey(registeredType, newHotkey);
224-
}
225-
226-
private static void ChangeRegisteredHotkey(RegisteredHotkeyType registeredType, HotkeyModel newHotkey)
227-
{
228-
// Find the old registered hotkey data item
229-
var registeredHotkeyData = _settings.RegisteredHotkeys.FirstOrDefault(h => h.RegisteredType == registeredType);
230-
231-
// If it is not found, return
232-
if (registeredHotkeyData == null)
233-
{
234-
return;
235-
}
236-
237-
// Remove the old hotkey
238-
RemoveHotkey(registeredHotkeyData);
239-
240-
// Update the hotkey string
241-
registeredHotkeyData.Hotkey = newHotkey;
242-
243-
// Set the new hotkey
244-
SetHotkey(registeredHotkeyData);
245-
}
246-
247220
#endregion
248221

249222
// TODO: Deprecated
@@ -509,6 +482,37 @@ kb.Gesture is KeyGesture keyGesture1 &&
509482

510483
#endregion
511484

485+
#region Hotkey Changing
486+
487+
private static void ChangeRegisteredHotkey(RegisteredHotkeyType registeredType, string newHotkeyStr)
488+
{
489+
var newHotkey = new HotkeyModel(newHotkeyStr);
490+
ChangeRegisteredHotkey(registeredType, newHotkey);
491+
}
492+
493+
private static void ChangeRegisteredHotkey(RegisteredHotkeyType registeredType, HotkeyModel newHotkey)
494+
{
495+
// Find the old registered hotkey data item
496+
var registeredHotkeyData = _settings.RegisteredHotkeys.FirstOrDefault(h => h.RegisteredType == registeredType);
497+
498+
// If it is not found, return
499+
if (registeredHotkeyData == null)
500+
{
501+
return;
502+
}
503+
504+
// Remove the old hotkey
505+
RemoveHotkey(registeredHotkeyData);
506+
507+
// Update the hotkey string
508+
registeredHotkeyData.Hotkey = newHotkey;
509+
510+
// Set the new hotkey
511+
SetHotkey(registeredHotkeyData);
512+
}
513+
514+
#endregion
515+
512516
#region Commands
513517

514518
private static RelayCommand<CustomPluginHotkey> _customQueryHotkeyCommand;

0 commit comments

Comments
 (0)