Merge branch 'main' into implicit-ancestry

2023-05-04 14:39:58 +02:00 · 2023-05-04 14:39:58 +02:00 · da19edc3e3
commit da19edc3e3
parent 7b7a495be3 7e2a461486
33 changed files with 746 additions and 392 deletions
--- a/crates/gpui/src/elements/keystroke_label.rs
+++ b/crates/gpui/src/elements/keystroke_label.rs
@ -42,7 +42,7 @@ impl<V: View> Element<V> for KeystrokeLabel {
        cx: &mut LayoutContext<V>,
    ) -> (Vector2F, AnyElement<V>) {
        let mut element = if let Some(keystrokes) =
-            cx.keystrokes_for_action(view, self.view_id, self.action.as_ref())
+            cx.keystrokes_for_action(self.view_id, self.action.as_ref())
        {
            Flex::row()
                .with_children(keystrokes.iter().map(|keystroke| {