Validate hotkey before setting

VictoriousRaptor · VictoriousRaptor · commit c03a0b031eb8 · 2023-01-11T16:13:39.000+08:00
diff --git a/Flow.Launcher/HotkeyControl.xaml.cs b/Flow.Launcher/HotkeyControl.xaml.cs
@@ -70,7 +70,7 @@ public async Task SetHotkeyAsync(HotkeyModel keyModel, bool triggerValidate = tr
 
             if (triggerValidate)
             {
-                bool hotkeyAvailable = keyModel.CharKey != Key.None && CheckHotkeyAvailability(keyModel);
+                bool hotkeyAvailable = CheckHotkeyAvailability(keyModel);
                 SetMessage(hotkeyAvailable);
                 OnHotkeyChanged();
 
@@ -88,7 +88,7 @@ public Task SetHotkeyAsync(string keyStr, bool triggerValidate = true)
             return SetHotkeyAsync(new HotkeyModel(keyStr), triggerValidate);
         }
 
-        private bool CheckHotkeyAvailability() => HotKeyMapper.CheckAvailability(CurrentHotkey);
+        private static bool CheckHotkeyAvailability(HotkeyModel hotkey) => hotkey.Validate() && HotKeyMapper.CheckAvailability(hotkey);
 
         public new bool IsFocused => tbHotkey.IsFocused;
 

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public async Task SetHotkeyAsync(HotkeyModel keyModel, bool triggerValidate = tr`
`70`	`70`
`71`	`71`	`if (triggerValidate)`
`72`	`72`	`{`
`73`		`- bool hotkeyAvailable = keyModel.CharKey != Key.None && CheckHotkeyAvailability(keyModel);`
	`73`	`+ bool hotkeyAvailable = CheckHotkeyAvailability(keyModel);`
`74`	`74`	`SetMessage(hotkeyAvailable);`
`75`	`75`	`OnHotkeyChanged();`
`76`	`76`
`@@ -88,7 +88,7 @@ public Task SetHotkeyAsync(string keyStr, bool triggerValidate = true)`
`88`	`88`	`return SetHotkeyAsync(new HotkeyModel(keyStr), triggerValidate);`
`89`	`89`	`}`
`90`	`90`
`91`		`- private bool CheckHotkeyAvailability() => HotKeyMapper.CheckAvailability(CurrentHotkey);`
	`91`	`+ private static bool CheckHotkeyAvailability(HotkeyModel hotkey) => hotkey.Validate() && HotKeyMapper.CheckAvailability(hotkey);`
`92`	`92`
`93`	`93`	`public new bool IsFocused => tbHotkey.IsFocused;`
`94`	`94`