From 668f627532dacd5441f6990a39c327db1da40083 Mon Sep 17 00:00:00 2001 From: Clark Moody Date: Mon, 17 Feb 2020 17:40:01 -0600 Subject: [PATCH] Add size, spacing, and text_size properties to Checkbox --- native/src/widget/checkbox.rs | 45 +++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 7 deletions(-) diff --git a/native/src/widget/checkbox.rs b/native/src/widget/checkbox.rs index 95165997..669437bc 100644 --- a/native/src/widget/checkbox.rs +++ b/native/src/widget/checkbox.rs @@ -30,7 +30,10 @@ pub struct Checkbox { is_checked: bool, on_toggle: Box Message>, label: String, + size: u16, width: Length, + spacing: u16, + text_size: u16, style: Renderer::Style, } @@ -53,11 +56,22 @@ impl Checkbox { is_checked, on_toggle: Box::new(f), label: String::from(label), + size: 20, width: Length::Shrink, + spacing: 15, + text_size: 20, style: Renderer::Style::default(), } } + /// Sets the size of the [`Checkbox`]. + /// + /// [`Checkbox`]: struct.Checkbox.html + pub fn size(mut self, size: u16) -> Self { + self.size = size; + self + } + /// Sets the width of the [`Checkbox`]. /// /// [`Checkbox`]: struct.Checkbox.html @@ -66,6 +80,22 @@ impl Checkbox { self } + /// Sets the spacing between the [`Checkbox`] and the text. + /// + /// [`Checkbox`]: struct.Checkbox.html + pub fn spacing(mut self, spacing: u16) -> Self { + self.spacing = spacing; + self + } + + /// Sets the text size of the [`Checkbox`]. + /// + /// [`Checkbox`]: struct.Checkbox.html + pub fn text_size(mut self, text_size: u16) -> Self { + self.text_size = text_size; + self + } + /// Sets the style of the [`Checkbox`]. /// /// [`Checkbox`]: struct.Checkbox.html @@ -93,18 +123,19 @@ where renderer: &Renderer, limits: &layout::Limits, ) -> layout::Node { - let size = self::Renderer::default_size(renderer); - Row::<(), Renderer>::new() .width(self.width) - .spacing(15) + .spacing(self.spacing) .align_items(Align::Center) .push( Row::new() - .width(Length::Units(size as u16)) - .height(Length::Units(size as u16)), + .width(Length::Units(self.size)) + .height(Length::Units(self.size)), ) - .push(Text::new(&self.label).width(self.width)) + .push( + Text::new(&self.label) + .width(self.width) + .size(self.text_size)) .layout(renderer, limits) } @@ -151,7 +182,7 @@ where defaults, label_layout.bounds(), &self.label, - text::Renderer::default_size(renderer), + self.text_size, Font::Default, None, HorizontalAlignment::Left,