Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Render + separators for keybindings on non-macOS platforms (#9194)

Browse source 
This PR adjusts the rendering of keybindings on non-macOS platforms to
have a `+` separator instead of just a blank space.

<img width="952" alt="Screenshot 2024-03-11 at 3 18 17 PM"
src="https://github.com/zed-industries/zed/assets/1486634/1573823d-4329-41f0-bef4-7a6c09f3e632">

<img width="584" alt="Screenshot 2024-03-11 at 3 16 25 PM"
src="https://github.com/zed-industries/zed/assets/1486634/aae41b22-dfde-40a6-9e0e-cee855522d3a">

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-03-11 15:57:31 -04:00 • committed by GitHub
parent fe70a2646f
commit 25c471f9e4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
crates/ui/src/components/keybinding.rs
View file

@ -97,37 +97,44 @@ impl RenderOnce for KeyBinding {
h_flex() h_flex()
.flex_none() .flex_none()
.gap_0p5() .map(|el| match self.display {
KeyBindingDisplay::Mac => el.gap_0p5(),
KeyBindingDisplay::Linux | KeyBindingDisplay::Windows => el,
})
.p_0p5() .p_0p5()
.rounded_sm() .rounded_sm()
.text_color(cx.theme().colors().text_muted) .text_color(cx.theme().colors().text_muted)
.when(keystroke.modifiers.function, |el| match self.display { .when(keystroke.modifiers.function, |el| match self.display {
KeyBindingDisplay::Mac => el.child(Key::new("fn")), KeyBindingDisplay::Mac => el.child(Key::new("fn")),
KeyBindingDisplay::Linux | KeyBindingDisplay::Windows => { KeyBindingDisplay::Linux | KeyBindingDisplay::Windows => {
el.child(Key::new("Fn")) el.child(Key::new("Fn")).child(Key::new("+"))
} }
}) })
.when(keystroke.modifiers.control, |el| match self.display { .when(keystroke.modifiers.control, |el| match self.display {
KeyBindingDisplay::Mac => el.child(KeyIcon::new(IconName::Control)), KeyBindingDisplay::Mac => el.child(KeyIcon::new(IconName::Control)),
KeyBindingDisplay::Linux | KeyBindingDisplay::Windows => { KeyBindingDisplay::Linux | KeyBindingDisplay::Windows => {
el.child(Key::new("Ctrl")) el.child(Key::new("Ctrl")).child(Key::new("+"))
} }
}) })
.when(keystroke.modifiers.alt, |el| match self.display { .when(keystroke.modifiers.alt, |el| match self.display {
KeyBindingDisplay::Mac => el.child(KeyIcon::new(IconName::Option)), KeyBindingDisplay::Mac => el.child(KeyIcon::new(IconName::Option)),
KeyBindingDisplay::Linux | KeyBindingDisplay::Windows => { KeyBindingDisplay::Linux | KeyBindingDisplay::Windows => {
el.child(Key::new("Alt")) el.child(Key::new("Alt")).child(Key::new("+"))
} }
}) })
.when(keystroke.modifiers.command, |el| match self.display { .when(keystroke.modifiers.command, |el| match self.display {
KeyBindingDisplay::Mac => el.child(KeyIcon::new(IconName::Command)), KeyBindingDisplay::Mac => el.child(KeyIcon::new(IconName::Command)),
KeyBindingDisplay::Linux => el.child(Key::new("Super")), KeyBindingDisplay::Linux => {
KeyBindingDisplay::Windows => el.child(Key::new("Win")), el.child(Key::new("Super")).child(Key::new("+"))
}
KeyBindingDisplay::Windows => {
el.child(Key::new("Win")).child(Key::new("+"))
}
}) })
.when(keystroke.modifiers.shift, |el| match self.display { .when(keystroke.modifiers.shift, |el| match self.display {
KeyBindingDisplay::Mac => el.child(KeyIcon::new(IconName::Option)), KeyBindingDisplay::Mac => el.child(KeyIcon::new(IconName::Option)),
KeyBindingDisplay::Linux | KeyBindingDisplay::Windows => { KeyBindingDisplay::Linux | KeyBindingDisplay::Windows => {
el.child(Key::new("Shift")) el.child(Key::new("Shift")).child(Key::new("+"))
} }
}) })
.map(|el| match key_icon { .map(|el| match key_icon {