leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify use of list item

Browse source
This commit is contained in:
Jeremy Soller 2022-09-30 10:53:50 -06:00
parent ae3f5b9b2e
commit f09a3109e8
No known key found for this signature in database
GPG key ID: 87F211AF2BE4C2FE
2 changed files with 41 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

64
examples/cosmic/src/main.rs
View file

@ -123,69 +123,67 @@ impl Sandbox for Window {
),
list_section!(
"Buttons",
list_item!(
row!(
button!("Primary")
.style(theme::Button::Primary)
.on_press(Message::ButtonPressed)
.style(theme::Button::Primary)
.on_press(Message::ButtonPressed)
,
button!("Secondary")
.style(theme::Button::Secondary)
.on_press(Message::ButtonPressed)
.style(theme::Button::Secondary)
.on_press(Message::ButtonPressed)
,
button!("Positive")
.style(theme::Button::Positive)
.on_press(Message::ButtonPressed)
.style(theme::Button::Positive)
.on_press(Message::ButtonPressed)
,
button!("Destructive")
.style(theme::Button::Destructive)
.on_press(Message::ButtonPressed)
.style(theme::Button::Destructive)
.on_press(Message::ButtonPressed)
,
button!("Text")
.style(theme::Button::Text)
.on_press(Message::ButtonPressed)
.style(theme::Button::Text)
.on_press(Message::ButtonPressed)
,
),
list_item!(
).spacing(12),
row!(
button!("Primary")
.style(theme::Button::Primary)
.padding([8, 16])
.style(theme::Button::Primary)
.padding([8, 16])
,
button!("Secondary")
.style(theme::Button::Secondary)
.padding([8, 16])
.style(theme::Button::Secondary)
.padding([8, 16])
,
button!("Positive")
.style(theme::Button::Positive)
.padding([8, 16])
.style(theme::Button::Positive)
.padding([8, 16])
,
button!("Destructive")
.style(theme::Button::Destructive)
.padding([8, 16])
.style(theme::Button::Destructive)
.padding([8, 16])
,
button!("Text")
.style(theme::Button::Text)
.padding([8, 16])
.style(theme::Button::Text)
.padding([8, 16])
,
),
).spacing(12),
),
list_section!(
"Controls",
list_item!(
text("Toggler"),
horizontal_space(Length::Fill),
"Toggler",
toggler(None, self.toggler_value, Message::TogglerToggled)
),
list_item!(
text("Slider"),
horizontal_space(Length::Fill),
"Slider",
slider(0.0..=100.0, self.slider_value, Message::SliderChanged)
.width(Length::Units(250)),
.width(Length::Units(250))
),
list_item!(
text("Progress"),
horizontal_space(Length::Fill),
progress_bar(0.0..=100.0, self.slider_value).height(Length::Units(4))
.width(Length::Units(250)),
"Progress",
progress_bar(0.0..=100.0, self.slider_value)
.width(Length::Units(250))
.height(Length::Units(4))
),
checkbox("Checkbox", self.checkbox_value, Message::CheckboxToggled),
)

14
src/widget/list.rs
View file

@ -7,8 +7,14 @@ use iced::{
#[macro_export]
macro_rules! list_item {
($($x:expr),+ $(,)?) => (
$crate::iced::widget::Row::with_children(vec![$($crate::iced::Element::from($x)),+])
($title:expr, $($x:expr),+ $(,)?) => (
$crate::iced::widget::Row::with_children(vec![
$crate::iced::widget::Text::new($title).into(),
$crate::iced::widget::horizontal_space(
$crate::iced::Length::Fill
).into(),
$($crate::iced::Element::from($x)),+
])
.align_items(Alignment::Center)
.padding([0, 8])
.spacing(12)
@ -18,9 +24,9 @@ pub use list_item;
#[macro_export]
macro_rules! list_section {
($heading:expr, $($x:expr),+ $(,)?) => (
($title:expr, $($x:expr),+ $(,)?) => (
$crate::iced::widget::Column::with_children(vec![
$crate::iced::widget::Text::new($heading)
$crate::iced::widget::Text::new($title)
.font($crate::font::FONT_SEMIBOLD)
.into()
,