mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-12 05:27:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Update keybinding.rs

Browse source
This commit is contained in:
Nate Butler 2023-11-28 14:40:26 -05:00
parent f33cd3d463
commit a9cb6589dd
1 changed files with 74 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
crates/ui2/src/components/keybinding.rs
View file

@ -1,5 +1,5 @@
use crate::prelude::*; use crate::{h_stack, prelude::*, Icon, IconElement, IconSize};
use gpui::{Action, Div, IntoElement}; use gpui::{relative, rems, Action, Div, IntoElement, Keystroke};
#[derive(IntoElement, Clone)] #[derive(IntoElement, Clone)]
pub struct KeyBinding { pub struct KeyBinding {
@ -14,19 +14,35 @@ impl RenderOnce for KeyBinding {
type Rendered = Div; type Rendered = Div;
fn render(self, cx: &mut WindowContext) -> Self::Rendered { fn render(self, cx: &mut WindowContext) -> Self::Rendered {
div() h_stack()
.flex() .flex_none()
.gap_2() .gap_2()
.children(self.key_binding.keystrokes().iter().map(|keystroke| { .children(self.key_binding.keystrokes().iter().map(|keystroke| {
div() let key_icon = Self::icon_for_key(&keystroke);
.flex()
.gap_1() h_stack()
.flex_none()
.gap_0p5()
.bg(cx.theme().colors().element_background)
.p_0p5()
.rounded_sm()
.when(keystroke.modifiers.function, |el| el.child(Key::new("fn"))) .when(keystroke.modifiers.function, |el| el.child(Key::new("fn")))
.when(keystroke.modifiers.control, |el| el.child(Key::new("^"))) .when(keystroke.modifiers.control, |el| {
.when(keystroke.modifiers.alt, |el| el.child(Key::new("⌥"))) el.child(KeyIcon::new(Icon::Control))
.when(keystroke.modifiers.command, |el| el.child(Key::new("⌘"))) })
.when(keystroke.modifiers.shift, |el| el.child(Key::new("⇧"))) .when(keystroke.modifiers.alt, |el| {
.child(Key::new(keystroke.key.clone())) el.child(KeyIcon::new(Icon::Option))
})
.when(keystroke.modifiers.command, |el| {
el.child(KeyIcon::new(Icon::Command))
})
.when(keystroke.modifiers.shift, |el| {
el.child(KeyIcon::new(Icon::Shift))
})
// .when_some(key_icon, |el, icon| el.child(KeyIcon::new(icon)))
.when(key_icon.is_none(), |el| {
el.child(Key::new(keystroke.key.to_uppercase().clone()))
})
})) }))
} }
} }
@ -39,6 +55,22 @@ impl KeyBinding {
Some(Self::new(key_binding)) Some(Self::new(key_binding))
} }
fn icon_for_key(keystroke: &Keystroke) -> Option<Icon> {
let mut icon: Option<Icon> = None;
if keystroke.key == "left".to_string() {
icon = Some(Icon::ArrowLeft);
} else if keystroke.key == "right".to_string() {
icon = Some(Icon::ArrowRight);
} else if keystroke.key == "up".to_string() {
icon = Some(Icon::ArrowUp);
} else if keystroke.key == "down".to_string() {
icon = Some(Icon::ArrowDown);
}
icon
}
pub fn new(key_binding: gpui::KeyBinding) -> Self { pub fn new(key_binding: gpui::KeyBinding) -> Self {
Self { key_binding } Self { key_binding }
} }
@ -53,13 +85,18 @@ impl RenderOnce for Key {
type Rendered = Div; type Rendered = Div;
fn render(self, cx: &mut WindowContext) -> Self::Rendered { fn render(self, cx: &mut WindowContext) -> Self::Rendered {
let single_char = self.key.len() == 1;
div() div()
.px_2()
.py_0() .py_0()
.rounded_md() .when(single_char, |el| {
.text_ui_sm() el.w(rems(14. / 16.)).flex().flex_none().justify_center()
})
.when(!single_char, |el| el.px_0p5())
.h(rems(14. / 16.))
.text_ui()
.line_height(relative(1.))
.text_color(cx.theme().colors().text) .text_color(cx.theme().colors().text)
.bg(cx.theme().colors().element_background)
.child(self.key.clone()) .child(self.key.clone())
} }
} }
@ -69,3 +106,24 @@ impl Key {
Self { key: key.into() } Self { key: key.into() }
} }
} }
#[derive(IntoElement)]
pub struct KeyIcon {
icon: Icon,
}
impl RenderOnce for KeyIcon {
type Rendered = Div;
fn render(self, cx: &mut WindowContext) -> Self::Rendered {
div()
.w(rems(14. / 16.))
.child(IconElement::new(self.icon).size(IconSize::Small))
}
}
impl KeyIcon {
pub fn new(icon: Icon) -> Self {
Self { icon }
}
}