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

Rename IntoAnyElement trait to Component

Browse source
This commit is contained in:
Nathan Sobo 2023-10-26 12:46:52 +02:00
parent 8ecfea55cd
commit 0285284ae1
60 changed files with 297 additions and 300 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/ui2/src/elements/label.rs
View file

@ -48,7 +48,7 @@ pub enum LineHeightStyle {
UILabel,
}
#[derive(IntoAnyElement)]
#[derive(Component)]
pub struct Label<S: 'static + Send + Sync> {
state_type: PhantomData<S>,
label: SharedString,
@ -83,7 +83,7 @@ impl<S: 'static + Send + Sync> Label<S> {
self
}
fn render(self, _view: &mut S, cx: &mut ViewContext<S>) -> impl IntoAnyElement<S> {
fn render(self, _view: &mut S, cx: &mut ViewContext<S>) -> impl Component<S> {
div()
.when(self.strikethrough, |this| {
this.relative().child(
@ -105,7 +105,7 @@ impl<S: 'static + Send + Sync> Label<S> {
}
}
#[derive(IntoAnyElement)]
#[derive(Component)]
pub struct HighlightedLabel<S: 'static + Send + Sync> {
state_type: PhantomData<S>,
label: SharedString,
@ -135,7 +135,7 @@ impl<S: 'static + Send + Sync> HighlightedLabel<S> {
self
}
fn render(self, _view: &mut S, cx: &mut ViewContext<S>) -> impl IntoAnyElement<S> {
fn render(self, _view: &mut S, cx: &mut ViewContext<S>) -> impl Component<S> {
let theme = theme(cx);
let highlight_color = theme.text_accent;
@ -211,7 +211,7 @@ mod stories {
use super::*;
#[derive(IntoAnyElement)]
#[derive(Component)]
pub struct LabelStory<S: 'static + Send + Sync> {
state_type: PhantomData<S>,
}
@ -223,7 +223,7 @@ mod stories {
}
}
fn render(self, _view: &mut S, cx: &mut ViewContext<S>) -> impl IntoAnyElement<S> {
fn render(self, _view: &mut S, cx: &mut ViewContext<S>) -> impl Component<S> {
Story::container(cx)
.child(Story::title_for::<_, Label<S>>(cx))
.child(Story::label(cx, "Default"))