Fix DisableGlobalShortcuts breaking YAML editors

- fixes #19 - fixes #21
NX-Editor · May 30, 2023 · fb379f6 · fb379f6
1 parent 05dc45a
commit fb379f6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/ExKingEditor/Generators/MenuFactory.cs b/src/ExKingEditor/Generators/MenuFactory.cs
@@ -126,7 +126,7 @@ private static ObservableCollection<Control> SetChildItems<T>(Dictionary<string,
                     };
 
                     _visualRoot?.KeyBindings.Add(keyBinding);
-                    _visualRoot?.KeyBindingHeaders.Add(keyBinding, menu.Path);
+                    _visualRoot?.KeyBindingHeaders.TryAdd(keyBinding.Gesture, menu.Path);
                 }
 
                 if (func.Name == "Recent") {

diff --git a/src/ExKingEditor/Views/ShellView.axaml.cs b/src/ExKingEditor/Views/ShellView.axaml.cs
@@ -13,7 +13,7 @@ public partial class ShellView : Window
 {
     private List<KeyBinding> _keyBindings = new();
 
-    public Dictionary<KeyBinding, string> KeyBindingHeaders { get; } = new();
+    public Dictionary<KeyGesture, string> KeyBindingHeaders { get; } = new();
     public static ObservableCollection<Control>? MainMenu { get; private set; }
     public static int MenuOverflow { get; set; } = 0;
 
@@ -90,7 +90,7 @@ public void DisableGlobalShortcuts(params string[] targets)
         for (int i = 0; i < KeyBindings.Count; i++) {
             KeyBinding key = KeyBindings[i];
             foreach (var target in targets) {
-                if (KeyBindingHeaders[key].StartsWith(target)) {
+                if (KeyBindingHeaders[key.Gesture].StartsWith(target)) {
                     _keyBindings.Add(key);
                     KeyBindings.RemoveAt(i);
                 }