fix: toggler layout

src/utils.rs

@@ -2,6 +2,11 @@
 
 //! Utility functions for handling data in this library.
 
+use crate::reexports::iced_core::{
+    layout::{Limits, Node},
+    Point, Size,
+};
+
 /// Collect iterator into static array without panicking or collecting into a Vec.
 ///
 /// Initializes with `T::default()`, then takes `SIZE` values from the iterator.
@@ -16,3 +21,35 @@ pub fn static_array_from_iter<T: Copy + Default, const SIZE: usize>(
 
     array
 }
+
+/// Produces a [`Node`] with two children nodes one right next to each other.
+pub fn next_to_each_other(
+    limits: &Limits,
+    spacing: f32,
+    left: impl FnOnce(&Limits) -> Node,
+    right: impl FnOnce(&Limits) -> Node,
+) -> Node {
+    let mut right_node = right(limits);
+    let right_size = right_node.size();
+
+    let left_limits = limits.shrink(Size::new(right_size.width + spacing, 0.0));
+    let mut left_node = left(&left_limits);
+    let left_size = left_node.size();
+
+    let (left_y, right_y) = if left_size.height > right_size.height {
+        (0.0, (left_size.height - right_size.height) / 2.0)
+    } else {
+        ((right_size.height - left_size.height) / 2.0, 0.0)
+    };
+
+    left_node.move_to(Point::new(0.0, left_y));
+    right_node.move_to(Point::new(left_size.width + spacing, right_y));
+
+    Node::with_children(
+        Size::new(
+            left_size.width + spacing + right_size.width,
+            left_size.height.max(right_size.height),
+        ),
+        vec![left_node, right_node],
+    )
+}

src/widget/cosmic_toggler.rs

@@ -1,8 +1,9 @@
 //! Show toggle controls using togglers.
 
 use iced_core::{
-    alignment, event, layout, mouse, renderer, text, widget::Tree, Clipboard, Element, Event,
-    Layout, Length, Pixels, Rectangle, Shell, Widget,
+    alignment, event, layout, mouse, renderer, text,
+    widget::{self, tree, Tree},
+    Clipboard, Element, Event, Layout, Length, Pixels, Rectangle, Shell, Widget,
 };
 
 use crate::{
@@ -41,7 +42,7 @@ where
     Renderer::Theme: StyleSheet,
 {
     /// The default size of a [`Toggler`].
-    pub const DEFAULT_SIZE: f32 = 20.0;
+    pub const DEFAULT_SIZE: f32 = 24.0;
 
     /// Creates a new [`Toggler`].
     ///
@@ -65,7 +66,7 @@ where
             text_size: None,
             text_line_height: text::LineHeight::default(),
             text_alignment: alignment::Horizontal::Left,
-            text_shaping: text::Shaping::Basic,
+            text_shaping: text::Shaping::Advanced,
             spacing: 0.0,
             font: None,
             style: Default::default(),
@@ -152,6 +153,10 @@ where
         Length::Shrink
     }
 
+    fn state(&self) -> tree::State {
+        tree::State::new(widget::text::State::<Renderer::Paragraph>::default())
+    }
+
     fn layout(
         &self,
         tree: &mut Tree,
@@ -160,10 +165,9 @@ where
     ) -> layout::Node {
         let limits = limits.width(self.width);
 
-        layout::next_to_each_other(
+        crate::utils::next_to_each_other(
             &limits,
             self.spacing,
-            |_| layout::Node::new(iced_core::Size::new(2.0 * self.size, self.size)),
             |limits| {
                 if let Some(label) = self.label.as_deref() {
                     let state = tree
@@ -188,6 +192,7 @@ where
                     layout::Node::new(iced_core::Size::ZERO)
                 }
             },
+            |_| layout::Node::new(iced_core::Size::new(2.0 * self.size, self.size)),
         )
     }
 

src/widget/toggler.rs

@@ -9,7 +9,7 @@ use iced_core::mouse;
 use iced_core::renderer;
 use iced_core::text;
 
-use iced_core::widget::{self, Tree};
+use iced_core::widget::{self, tree, Tree};
 use iced_core::{
     color, Clipboard, Color, Element, Event, Layout, Length, Pixels, Rectangle, Shell, Widget,
 };
@@ -152,6 +152,10 @@ where
         Length::Shrink
     }
 
+    fn state(&self) -> tree::State {
+        tree::State::new(widget::text::State::<Renderer::Paragraph>::default())
+    }
+
     fn layout(
         &self,
         tree: &mut Tree,