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

Replace derive Element with derive IntoAnyElement everywhere

Browse source
This commit is contained in:
Nathan Sobo 2023-10-26 12:38:23 +02:00
parent 315744ec20
commit 8ecfea55cd
45 changed files with 185 additions and 292 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,7 +5,7 @@ use strum::{EnumIter, IntoEnumIterator};
use crate::prelude::*;
#[derive(Element)]
#[derive(IntoAnyElement)]
pub struct Keybinding<S: 'static + Send + Sync> {
state_type: PhantomData<S>,
@ -34,7 +34,7 @@ impl<S: 'static + Send + Sync> Keybinding<S> {
}
}
fn render(&mut self, _view: &mut S, cx: &mut ViewContext<S>) -> impl IntoAnyElement<S> {
fn render(self, _view: &mut S, cx: &mut ViewContext<S>) -> impl IntoAnyElement<S> {
div()
.flex()
.gap_2()
@ -54,7 +54,7 @@ impl<S: 'static + Send + Sync> Keybinding<S> {
}
}
#[derive(Element)]
#[derive(IntoAnyElement)]
pub struct Key<S: 'static + Send + Sync> {
state_type: PhantomData<S>,
key: SharedString,
@ -68,7 +68,7 @@ impl<S: 'static + Send + Sync> Key<S> {
}
}
fn render(&mut self, _view: &mut S, cx: &mut ViewContext<S>) -> impl IntoAnyElement<S> {
fn render(self, _view: &mut S, cx: &mut ViewContext<S>) -> impl IntoAnyElement<S> {
let theme = theme(cx);
div()
@ -173,7 +173,7 @@ mod stories {
use super::*;
#[derive(Element)]
#[derive(IntoAnyElement)]
pub struct KeybindingStory<S: 'static + Send + Sync + Clone> {
state_type: PhantomData<S>,
}
@ -185,7 +185,7 @@ mod stories {
}
}
fn render(&mut self, _view: &mut S, cx: &mut ViewContext<S>) -> impl IntoAnyElement<S> {
fn render(self, _view: &mut S, cx: &mut ViewContext<S>) -> impl IntoAnyElement<S> {
let all_modifier_permutations = ModifierKey::iter().permutations(2);
Story::container(cx)