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

Reconcile with upstream changes

Browse source
This commit is contained in:
Marshall Bowers 2023-10-12 10:40:47 -04:00
parent 9581279919
commit 8cd112110e
44 changed files with 112 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ui2/src/components/panel.rs
View file

@ -100,7 +100,7 @@ impl<S: 'static + Send + Sync> Panel<S> {
self
}
fn render(&mut self, cx: &mut ViewContext<S>) -> impl Element<State = S> {
fn render(&mut self, cx: &mut ViewContext<S>) -> impl Element<ViewState = S> {
let token = token();
let theme = theme(cx);
@ -165,7 +165,7 @@ mod stories {
}
}
fn render(&mut self, cx: &mut ViewContext<S>) -> impl Element<State = S> {
fn render(&mut self, cx: &mut ViewContext<S>) -> impl Element<ViewState = S> {
Story::container(cx)
.child(Story::title_for::<_, Panel<S>>(cx))
.child(Story::label(cx, "Default"))