Handle contexts correctly for disabled key bindings

2024-01-05 13:06:59 -08:00
parent a86f401a7c
commit 8a96562adf
5 changed files with 128 additions and 385 deletions
@@ -188,15 +188,13 @@ impl DispatchTree {
        action: &dyn Action,
        context_stack: &Vec<KeyContext>,
    ) -> Vec<KeyBinding> {
-        self.keymap
-            .lock()
-            .bindings_for_action(action.type_id())
-            .filter(|candidate| {
-                if !candidate.action.partial_eq(action) {
-                    return false;
-                }
+        let keymap = self.keymap.lock();
+        keymap
+            .bindings_for_action(action)
+            .filter(|binding| {
                for i in 1..context_stack.len() {
-                    if candidate.matches_context(&context_stack[0..=i]) {
+                    let context = &context_stack[0..i];
+                    if keymap.binding_enabled(binding, context) {
                        return true;
                    }
                }