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

Use SharedString for Keybindings

Browse source
This commit is contained in:
Marshall Bowers 2023-10-18 12:26:51 -04:00
parent 6e3393c93f
commit f0b9e9a89d
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -45,7 +45,7 @@ impl<S: 'static + Send + Sync + Clone> Keybinding<S> {
.gap_1() .gap_1()
.children(ModifierKey::iter().filter_map(|modifier| { .children(ModifierKey::iter().filter_map(|modifier| {
if modifiers.0.contains(&modifier) { if modifiers.0.contains(&modifier) {
Some(Key::new(modifier.glyph())) Some(Key::new(modifier.glyph().to_string()))
} else { } else {
None None
} }
@ -58,14 +58,11 @@ impl<S: 'static + Send + Sync + Clone> Keybinding<S> {
#[derive(Element)] #[derive(Element)]
pub struct Key<S: 'static + Send + Sync> { pub struct Key<S: 'static + Send + Sync> {
state_type: PhantomData<S>, state_type: PhantomData<S>,
key: String, key: SharedString,
} }
impl<S: 'static + Send + Sync> Key<S> { impl<S: 'static + Send + Sync> Key<S> {
pub fn new<K>(key: K) -> Self pub fn new(key: impl Into<SharedString>) -> Self {
where
K: Into<String>,
{
Self { Self {
state_type: PhantomData, state_type: PhantomData,
key: key.into(), key: key.into(),