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

Merge followup mess

Browse source
This commit is contained in:
Conrad Irwin 2023-11-20 09:58:05 -07:00
parent 0798cfd58c
commit f86480ba5d
18 changed files with 90 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,5 @@
use crate::prelude::*;
use gpui::{Action, Div, RenderOnce};
use strum::EnumIter;
#[derive(RenderOnce, Clone)]
pub struct KeyBinding {
@ -72,22 +71,6 @@ impl Key {
}
}
// NOTE: The order the modifier keys appear in this enum impacts the order in
// which they are rendered in the UI.
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, EnumIter)]
pub enum ModifierKey {
Control,
Alt,
Command,
Shift,
}
actions!(NoAction);
pub fn binding(key: &str) -> gpui::KeyBinding {
gpui::KeyBinding::new(key, NoAction {}, None)
}
#[cfg(feature = "stories")]
pub use stories::*;
@ -95,7 +78,7 @@ pub use stories::*;
mod stories {
use super::*;
pub use crate::KeyBinding;
use crate::{binding, Story};
use crate::Story;
use gpui::{actions, Div, Render};
use itertools::Itertools;
pub struct KeybindingStory;
@ -106,7 +89,7 @@ mod stories {
gpui::KeyBinding::new(key, NoAction {}, None)
}
impl Render for KeybindingStory {
impl Render<Self> for KeybindingStory {
type Element = Div<Self>;
fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {