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

Remove ThemeColor in favor of theme2::Theme

Browse source
This commit is contained in:
Marshall Bowers 2023-10-25 16:32:44 +02:00
parent bb3f59252e
commit e1032c5341
42 changed files with 225 additions and 391 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/ui2/src/components/modal.rs
View file

@ -43,22 +43,22 @@ impl<S: 'static + Send + Sync> Modal<S> {
}
fn render(&mut self, _view: &mut S, cx: &mut ViewContext<S>) -> impl Element<ViewState = S> {
let color = ThemeColor::new(cx);
let theme = theme(cx);
v_stack()
.id(self.id.clone())
.w_96()
// .rounded_xl()
.bg(color.background)
.bg(theme.background)
.border()
.border_color(color.border)
.border_color(theme.border)
.shadow_2xl()
.child(
h_stack()
.justify_between()
.p_1()
.border_b()
.border_color(color.border)
.border_color(theme.border)
.child(div().children(self.title.clone().map(|t| Label::new(t))))
.child(IconButton::new("close", Icon::Close)),
)
@ -69,7 +69,7 @@ impl<S: 'static + Send + Sync> Modal<S> {
this.child(
h_stack()
.border_t()
.border_color(color.border)
.border_color(theme.border)
.p_1()
.justify_end()
.children(self.secondary_action.take())