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

Rename Drawable::boxed to into_element and make containers generic

Browse source 
Multi-element are now generic over any drawable child, which can be converted
into an element.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
This commit is contained in:
Antonio Scandurra 2023-04-21 18:36:21 +02:00 • committed by Nathan Sobo
parent 4d433663bd
commit 03619dfa55
80 changed files with 1132 additions and 1434 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/welcome/src/base_keymap_picker.rs
View file

@ -143,6 +143,6 @@ impl PickerDelegate for BaseKeymapSelectorDelegate {
.with_highlights(keymap_match.positions.clone())
.contained()
.with_style(style.container)
.boxed()
.into_element()
}
}

109
crates/welcome/src/welcome.rs
View file

@ -73,78 +73,77 @@ impl View for WelcomePage {
PaneBackdrop::new(
self_handle.id(),
Flex::column()
.with_children([
.with_child(
Flex::column()
.with_children([
.with_child(
theme::ui::svg(&theme.welcome.logo)
.aligned()
.contained()
.aligned()
.boxed(),
.aligned(),
)
.with_child(
Label::new(
"Code at the speed of thought",
theme.welcome.logo_subheading.text.clone(),
)
.aligned()
.contained()
.with_style(theme.welcome.logo_subheading.container)
.boxed(),
])
.with_style(theme.welcome.logo_subheading.container),
)
.contained()
.with_style(theme.welcome.heading_group)
.constrained()
.with_width(width)
.boxed(),
.with_width(width),
)
.with_child(
Flex::column()
.with_children([
theme::ui::cta_button(
"Choose a theme",
theme_selector::Toggle,
width,
&theme.welcome.button,
cx,
),
theme::ui::cta_button(
"Choose a keymap",
ToggleBaseKeymapSelector,
width,
&theme.welcome.button,
cx,
),
theme::ui::cta_button(
"Install the CLI",
install_cli::Install,
width,
&theme.welcome.button,
cx,
),
])
.with_child(theme::ui::cta_button(
"Choose a theme",
theme_selector::Toggle,
width,
&theme.welcome.button,
cx,
))
.with_child(theme::ui::cta_button(
"Choose a keymap",
ToggleBaseKeymapSelector,
width,
&theme.welcome.button,
cx,
))
.with_child(theme::ui::cta_button(
"Install the CLI",
install_cli::Install,
width,
&theme.welcome.button,
cx,
))
.contained()
.with_style(theme.welcome.button_group)
.constrained()
.with_width(width)
.boxed(),
.with_width(width),
)
.with_child(
Flex::column()
.with_children([
theme::ui::checkbox_with_label::<Metrics, Self>(
.with_child(
theme::ui::checkbox_with_label::<Metrics, _, Self>(
Flex::column()
.with_children([
.with_child(
Label::new(
"Send anonymous usage data",
theme.welcome.checkbox.label.text.clone(),
)
.contained()
.with_style(theme.welcome.checkbox.label.container)
.boxed(),
.with_style(theme.welcome.checkbox.label.container),
)
.with_child(
Label::new(
"Help > View Telemetry",
theme.welcome.usage_note.text.clone(),
)
.contained()
.with_style(theme.welcome.usage_note.container)
.boxed(),
])
.boxed(),
.with_style(theme.welcome.usage_note.container),
),
&theme.welcome.checkbox,
metrics,
cx,
@ -155,8 +154,9 @@ impl View for WelcomePage {
},
)
.contained()
.with_style(theme.welcome.checkbox_container)
.boxed(),
.with_style(theme.welcome.checkbox_container),
)
.with_child(
theme::ui::checkbox::<Diagnostics, Self>(
"Send crash reports",
&theme.welcome.checkbox,
@ -169,23 +169,21 @@ impl View for WelcomePage {
},
)
.contained()
.with_style(theme.welcome.checkbox_container)
.boxed(),
])
.with_style(theme.welcome.checkbox_container),
)
.contained()
.with_style(theme.welcome.checkbox_group)
.constrained()
.with_width(width)
.boxed(),
])
.with_width(width),
)
.constrained()
.with_max_width(width)
.contained()
.with_uniform_padding(10.)
.aligned()
.boxed(),
.into_element(),
)
.boxed()
.into_named_element("welcome page")
}
}
@ -212,10 +210,9 @@ impl Item for WelcomePage {
.with_child(
Label::new("Welcome to Zed!", style.label.clone())
.aligned()
.contained()
.boxed(),
.contained(),
)
.boxed()
.into_element()
}
fn show_toolbar(&self) -> bool {