Merge pull request #3357 from Jack251970/fix_custom_hotkey1

Jack251970 · web-flow · commit e28a69ca913a · 2025-03-18T19:50:16.000+08:00
Fix hotkey initialization issue
diff --git a/Flow.Launcher/HotkeyControl.xaml.cs b/Flow.Launcher/HotkeyControl.xaml.cs
@@ -214,13 +214,14 @@ public HotkeyControl()
 
             HotkeyList.ItemsSource = KeysToDisplay;
 
-            RefreshHotkeyInterface(Hotkey);
+            // We should not call RefreshHotkeyInterface here because DependencyProperty is not set yet
+            // And it will be called in OnHotkeyChanged event or Hotkey setter later
         }
 
         private void RefreshHotkeyInterface(string hotkey)
         {
-            SetKeysToDisplay(new HotkeyModel(Hotkey));
-            CurrentHotkey = new HotkeyModel(Hotkey);
+            SetKeysToDisplay(new HotkeyModel(hotkey));
+            CurrentHotkey = new HotkeyModel(hotkey);
         }
 
         private static bool CheckHotkeyAvailability(HotkeyModel hotkey, bool validateKeyGesture) =>

Original file line number	Diff line number	Diff line change
`@@ -214,13 +214,14 @@ public HotkeyControl()`
`214`	`214`
`215`	`215`	`HotkeyList.ItemsSource = KeysToDisplay;`
`216`	`216`
`217`		`- RefreshHotkeyInterface(Hotkey);`
	`217`	`+ // We should not call RefreshHotkeyInterface here because DependencyProperty is not set yet`
	`218`	`+ // And it will be called in OnHotkeyChanged event or Hotkey setter later`
`218`	`219`	`}`
`219`	`220`
`220`	`221`	`private void RefreshHotkeyInterface(string hotkey)`
`221`	`222`	`{`
`222`		`- SetKeysToDisplay(new HotkeyModel(Hotkey));`
`223`		`- CurrentHotkey = new HotkeyModel(Hotkey);`
	`223`	`+ SetKeysToDisplay(new HotkeyModel(hotkey));`
	`224`	`+ CurrentHotkey = new HotkeyModel(hotkey);`
`224`	`225`	`}`
`225`	`226`
`226`	`227`	`private static bool CheckHotkeyAvailability(HotkeyModel hotkey, bool validateKeyGesture) =>`