From 668f627532dacd5441f6990a39c327db1da40083 Mon Sep 17 00:00:00 2001
From: Clark Moody <clark@clarkmoody.com>
Date: Mon, 17 Feb 2020 17:40:01 -0600
Subject: Add size, spacing, and text_size properties to Checkbox

---
 native/src/widget/checkbox.rs | 45 ++++++++++++++++++++++++++++++++++++-------
 1 file changed, 38 insertions(+), 7 deletions(-)

(limited to 'native/src/widget/checkbox.rs')

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<Message, Renderer: self::Renderer> {
     is_checked: bool,
     on_toggle: Box<dyn Fn(bool) -> Message>,
     label: String,
+    size: u16,
     width: Length,
+    spacing: u16,
+    text_size: u16,
     style: Renderer::Style,
 }
 
@@ -53,11 +56,22 @@ impl<Message, Renderer: self::Renderer> Checkbox<Message, Renderer> {
             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<Message, Renderer: self::Renderer> Checkbox<Message, Renderer> {
         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,
-- 
cgit 


From 692216042307c0ff0d792d1bba6928e499a65d1f Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 18 Feb 2020 02:28:15 +0100
Subject: Pull `Checkbox` default constants from its `Renderer`

---
 native/src/widget/checkbox.rs | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

(limited to 'native/src/widget/checkbox.rs')

diff --git a/native/src/widget/checkbox.rs b/native/src/widget/checkbox.rs
index 669437bc..b36d10a4 100644
--- a/native/src/widget/checkbox.rs
+++ b/native/src/widget/checkbox.rs
@@ -26,18 +26,20 @@ use crate::{
 ///
 /// ![Checkbox drawn by `iced_wgpu`](https://github.com/hecrj/iced/blob/7760618fb112074bc40b148944521f312152012a/docs/images/checkbox.png?raw=true)
 #[allow(missing_debug_implementations)]
-pub struct Checkbox<Message, Renderer: self::Renderer> {
+pub struct Checkbox<Message, Renderer: self::Renderer + text::Renderer> {
     is_checked: bool,
     on_toggle: Box<dyn Fn(bool) -> Message>,
     label: String,
-    size: u16,
     width: Length,
+    size: u16,
     spacing: u16,
     text_size: u16,
     style: Renderer::Style,
 }
 
-impl<Message, Renderer: self::Renderer> Checkbox<Message, Renderer> {
+impl<Message, Renderer: self::Renderer + text::Renderer>
+    Checkbox<Message, Renderer>
+{
     /// Creates a new [`Checkbox`].
     ///
     /// It expects:
@@ -56,10 +58,10 @@ impl<Message, Renderer: self::Renderer> Checkbox<Message, Renderer> {
             is_checked,
             on_toggle: Box::new(f),
             label: String::from(label),
-            size: 20,
             width: Length::Shrink,
-            spacing: 15,
-            text_size: 20,
+            size: <Renderer as self::Renderer>::DEFAULT_SIZE,
+            spacing: Renderer::DEFAULT_SPACING,
+            text_size: <Renderer as text::Renderer>::DEFAULT_SIZE,
             style: Renderer::Style::default(),
         }
     }
@@ -135,7 +137,8 @@ where
             .push(
                 Text::new(&self.label)
                     .width(self.width)
-                    .size(self.text_size))
+                    .size(self.text_size),
+            )
             .layout(renderer, limits)
     }
 
@@ -217,10 +220,15 @@ pub trait Renderer: crate::Renderer {
     /// The style supported by this renderer.
     type Style: Default;
 
-    /// Returns the default size of a [`Checkbox`].
+    /// The default size of a [`Checkbox`].
+    ///
+    /// [`Checkbox`]: struct.Checkbox.html
+    const DEFAULT_SIZE: u16;
+
+    /// The default spacing of a [`Checkbox`].
     ///
     /// [`Checkbox`]: struct.Checkbox.html
-    fn default_size(&self) -> u32;
+    const DEFAULT_SPACING: u16;
 
     /// Draws a [`Checkbox`].
     ///
-- 
cgit