Merge pull request #1616 from pop-os/standardize-toggler-functions

Use same name & order for toggler::new and helper
iced-rs · Jan 2, 2023 · a5a406f · a5a406f
2 parents a6d0d57 + 5b55625
commit a5a406f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/native/src/widget/helpers.rs b/native/src/widget/helpers.rs
@@ -162,7 +162,7 @@ where
     Renderer: crate::text::Renderer,
     Renderer::Theme: widget::toggler::StyleSheet,
 {
-    widget::Toggler::new(is_checked, label, f)
+    widget::Toggler::new(label, is_checked, f)
 }
 
 /// Creates a new [`TextInput`].

diff --git a/native/src/widget/toggler.rs b/native/src/widget/toggler.rs
@@ -24,17 +24,17 @@ pub use iced_style::toggler::{Appearance, StyleSheet};
 ///     TogglerToggled(bool),
 /// }
 ///
-/// let is_active = true;
+/// let is_checked = true;
 ///
-/// Toggler::new(is_active, String::from("Toggle me!"), |b| Message::TogglerToggled(b));
+/// Toggler::new(String::from("Toggle me!"), is_checked, |b| Message::TogglerToggled(b));
 /// ```
 #[allow(missing_debug_implementations)]
 pub struct Toggler<'a, Message, Renderer>
 where
     Renderer: text::Renderer,
     Renderer::Theme: StyleSheet,
 {
-    is_active: bool,
+    is_checked: bool,
     on_toggle: Box<dyn Fn(bool) -> Message + 'a>,
     label: Option<String>,
     width: Length,
@@ -63,15 +63,15 @@ where
     ///     will receive the new state of the [`Toggler`] and must produce a
     ///     `Message`.
     pub fn new<F>(
-        is_active: bool,
         label: impl Into<Option<String>>,
+        is_checked: bool,
         f: F,
     ) -> Self
     where
         F: 'a + Fn(bool) -> Message,
     {
         Toggler {
-            is_active,
+            is_checked,
             on_toggle: Box::new(f),
             label: label.into(),
             width: Length::Fill,
@@ -193,7 +193,7 @@ where
                 let mouse_over = layout.bounds().contains(cursor_position);
 
                 if mouse_over {
-                    shell.publish((self.on_toggle)(!self.is_active));
+                    shell.publish((self.on_toggle)(!self.is_checked));
 
                     event::Status::Captured
                 } else {
@@ -260,9 +260,9 @@ where
         let is_mouse_over = bounds.contains(cursor_position);
 
         let style = if is_mouse_over {
-            theme.hovered(&self.style, self.is_active)
+            theme.hovered(&self.style, self.is_checked)
         } else {
-            theme.active(&self.style, self.is_active)
+            theme.active(&self.style, self.is_checked)
         };
 
         let border_radius = bounds.height / BORDER_RADIUS_RATIO;
@@ -289,7 +289,7 @@ where
 
         let toggler_foreground_bounds = Rectangle {
             x: bounds.x
-                + if self.is_active {
+                + if self.is_checked {
                     bounds.width - 2.0 * space - (bounds.height - (4.0 * space))
                 } else {
                     2.0 * space