From b5f1ca169567f47b3976de5b4c5a2b1ce37656d5 Mon Sep 17 00:00:00 2001 From: Alexander van Saase Date: Mon, 2 Oct 2023 20:18:15 +0200 Subject: Introduce support for disabling a `checkbox` --- examples/checkbox/src/main.rs | 59 +++++++++++++++++++++++++++++++++---------- 1 file changed, 45 insertions(+), 14 deletions(-) (limited to 'examples/checkbox/src') diff --git a/examples/checkbox/src/main.rs b/examples/checkbox/src/main.rs index ef1a054d..314cb3fe 100644 --- a/examples/checkbox/src/main.rs +++ b/examples/checkbox/src/main.rs @@ -1,6 +1,7 @@ use iced::executor; use iced::font::{self, Font}; -use iced::widget::{checkbox, column, container, text}; +use iced::theme::Checkbox; +use iced::widget::{checkbox, column, container, row, text}; use iced::{Application, Command, Element, Length, Settings, Theme}; const ICON_FONT: Font = Font::with_name("icons"); @@ -13,12 +14,15 @@ pub fn main() -> iced::Result { struct Example { default_checkbox: bool, custom_checkbox: bool, + styled_checkbox_enabled: bool, + styled_checkbox_checked: bool, } #[derive(Debug, Clone, Copy)] enum Message { DefaultChecked(bool), CustomChecked(bool), + StyledChecked(bool), FontLoaded(Result<(), font::Error>), } @@ -42,8 +46,14 @@ impl Application for Example { fn update(&mut self, message: Message) -> Command { match message { - Message::DefaultChecked(value) => self.default_checkbox = value, + Message::DefaultChecked(value) => { + self.default_checkbox = value; + self.styled_checkbox_enabled = value; + } Message::CustomChecked(value) => self.custom_checkbox = value, + Message::StyledChecked(value) => { + self.styled_checkbox_checked = value + } Message::FontLoaded(_) => (), } @@ -51,19 +61,40 @@ impl Application for Example { } fn view(&self) -> Element { - let default_checkbox = - checkbox("Default", self.default_checkbox, Message::DefaultChecked); - let custom_checkbox = - checkbox("Custom", self.custom_checkbox, Message::CustomChecked) - .icon(checkbox::Icon { - font: ICON_FONT, - code_point: '\u{e901}', - size: None, - line_height: text::LineHeight::Relative(1.0), - shaping: text::Shaping::Basic, - }); + let default_checkbox = checkbox("Default", self.default_checkbox) + .on_toggle(Message::DefaultChecked); - let content = column![default_checkbox, custom_checkbox].spacing(22); + let checkboxes = [ + ("Primary", Checkbox::Primary), + ("Secondary", Checkbox::Secondary), + ("Success", Checkbox::Success), + ("Danger", Checkbox::Danger), + ]; + + let checkboxes = row(checkboxes + .into_iter() + .map(|(label, style)| { + checkbox(label, self.styled_checkbox_checked) + .on_toggle_maybe( + self.default_checkbox.then(|| Message::StyledChecked), + ) + .style(style) + }) + .map(Element::from)) + .spacing(10); + + let custom_checkbox = checkbox("Custom", self.custom_checkbox) + .on_toggle(Message::CustomChecked) + .icon(checkbox::Icon { + font: ICON_FONT, + code_point: '\u{e901}', + size: None, + line_height: text::LineHeight::Relative(1.0), + shaping: text::Shaping::Basic, + }); + + let content = + column![default_checkbox, checkboxes, custom_checkbox,].spacing(22); container(content) .width(Length::Fill) -- cgit From 8a0632d5bab68c842189729cbc0ef02adb88a8aa Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 1 Feb 2024 13:09:14 +0100 Subject: Simplify `checkbox` example --- examples/checkbox/src/main.rs | 63 ++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 34 deletions(-) (limited to 'examples/checkbox/src') diff --git a/examples/checkbox/src/main.rs b/examples/checkbox/src/main.rs index 314cb3fe..81eb31c7 100644 --- a/examples/checkbox/src/main.rs +++ b/examples/checkbox/src/main.rs @@ -1,6 +1,6 @@ use iced::executor; use iced::font::{self, Font}; -use iced::theme::Checkbox; +use iced::theme; use iced::widget::{checkbox, column, container, row, text}; use iced::{Application, Command, Element, Length, Settings, Theme}; @@ -12,17 +12,16 @@ pub fn main() -> iced::Result { #[derive(Default)] struct Example { - default_checkbox: bool, - custom_checkbox: bool, - styled_checkbox_enabled: bool, - styled_checkbox_checked: bool, + default: bool, + styled: bool, + custom: bool, } #[derive(Debug, Clone, Copy)] enum Message { - DefaultChecked(bool), - CustomChecked(bool), - StyledChecked(bool), + DefaultToggled(bool), + CustomToggled(bool), + StyledToggled(bool), FontLoaded(Result<(), font::Error>), } @@ -46,13 +45,14 @@ impl Application for Example { fn update(&mut self, message: Message) -> Command { match message { - Message::DefaultChecked(value) => { - self.default_checkbox = value; - self.styled_checkbox_enabled = value; + Message::DefaultToggled(default) => { + self.default = default; } - Message::CustomChecked(value) => self.custom_checkbox = value, - Message::StyledChecked(value) => { - self.styled_checkbox_checked = value + Message::StyledToggled(styled) => { + self.styled = styled; + } + Message::CustomToggled(custom) => { + self.custom = custom; } Message::FontLoaded(_) => (), } @@ -61,30 +61,25 @@ impl Application for Example { } fn view(&self) -> Element { - let default_checkbox = checkbox("Default", self.default_checkbox) - .on_toggle(Message::DefaultChecked); + let default_checkbox = checkbox("Default", self.default) + .on_toggle(Message::DefaultToggled); - let checkboxes = [ - ("Primary", Checkbox::Primary), - ("Secondary", Checkbox::Secondary), - ("Success", Checkbox::Success), - ("Danger", Checkbox::Danger), - ]; + let styled_checkbox = |label, style| { + checkbox(label, self.styled) + .on_toggle_maybe(self.default.then(|| Message::StyledToggled)) + .style(style) + }; - let checkboxes = row(checkboxes - .into_iter() - .map(|(label, style)| { - checkbox(label, self.styled_checkbox_checked) - .on_toggle_maybe( - self.default_checkbox.then(|| Message::StyledChecked), - ) - .style(style) - }) - .map(Element::from)) + let checkboxes = row![ + styled_checkbox("Primary", theme::Checkbox::Primary), + styled_checkbox("Secondary", theme::Checkbox::Secondary), + styled_checkbox("Success", theme::Checkbox::Success), + styled_checkbox("Danger", theme::Checkbox::Danger), + ] .spacing(10); - let custom_checkbox = checkbox("Custom", self.custom_checkbox) - .on_toggle(Message::CustomChecked) + let custom_checkbox = checkbox("Custom", self.custom) + .on_toggle(Message::CustomToggled) .icon(checkbox::Icon { font: ICON_FONT, code_point: '\u{e901}', -- cgit From dfe17801280161e57fcf9db29cf4953d5d1ef173 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 1 Feb 2024 13:14:22 +0100 Subject: Use `then_some` instead of `then` in `checkbox` example --- examples/checkbox/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples/checkbox/src') diff --git a/examples/checkbox/src/main.rs b/examples/checkbox/src/main.rs index 81eb31c7..d463c1ed 100644 --- a/examples/checkbox/src/main.rs +++ b/examples/checkbox/src/main.rs @@ -66,7 +66,7 @@ impl Application for Example { let styled_checkbox = |label, style| { checkbox(label, self.styled) - .on_toggle_maybe(self.default.then(|| Message::StyledToggled)) + .on_toggle_maybe(self.default.then_some(Message::StyledToggled)) .style(style) }; -- cgit From 4afe1c71112628665fa9f728f27dddda3b21a495 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 1 Feb 2024 13:16:12 +0100 Subject: Fix `spacing` in `checkbox` example --- examples/checkbox/src/main.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'examples/checkbox/src') diff --git a/examples/checkbox/src/main.rs b/examples/checkbox/src/main.rs index d463c1ed..834a8f5c 100644 --- a/examples/checkbox/src/main.rs +++ b/examples/checkbox/src/main.rs @@ -76,7 +76,7 @@ impl Application for Example { styled_checkbox("Success", theme::Checkbox::Success), styled_checkbox("Danger", theme::Checkbox::Danger), ] - .spacing(10); + .spacing(20); let custom_checkbox = checkbox("Custom", self.custom) .on_toggle(Message::CustomToggled) @@ -89,7 +89,7 @@ impl Application for Example { }); let content = - column![default_checkbox, checkboxes, custom_checkbox,].spacing(22); + column![default_checkbox, checkboxes, custom_checkbox].spacing(20); container(content) .width(Length::Fill) -- cgit