Merge branch 'main' into implicit-ancestry

2023-05-04 14:39:58 +02:00
parent 7b7a495be3 7e2a461486
commit da19edc3e3
33 changed files with 746 additions and 392 deletions
@@ -1841,12 +1841,11 @@ impl View for Pane {
        });
    }

-    fn keymap_context(&self, _: &AppContext) -> KeymapContext {
-        let mut keymap = Self::default_keymap_context();
+    fn update_keymap_context(&self, keymap: &mut KeymapContext, _: &AppContext) {
+        Self::reset_to_default_keymap_context(keymap);
        if self.docked.is_some() {
            keymap.add_identifier("docked");
        }
-        keymap
    }
 }