From 936d480267578d7e80675e78ec1880aaaaab72d6 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Fri, 1 Dec 2023 16:04:27 +0100
Subject: Clip text to `viewport` bounds instead of layout bounds

---
 widget/src/checkbox.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/widget/src/checkbox.rs b/widget/src/checkbox.rs
index d7fdf339..a0d9559b 100644
--- a/widget/src/checkbox.rs
+++ b/widget/src/checkbox.rs
@@ -266,7 +266,7 @@ where
         style: &renderer::Style,
         layout: Layout<'_>,
         cursor: mouse::Cursor,
-        _viewport: &Rectangle,
+        viewport: &Rectangle,
     ) {
         let is_mouse_over = cursor.is_over(layout.bounds());
 
@@ -315,6 +315,7 @@ where
                     },
                     bounds.center(),
                     custom_style.icon_color,
+                    *viewport,
                 );
             }
         }
@@ -330,6 +331,7 @@ where
                 crate::text::Appearance {
                     color: custom_style.text_color,
                 },
+                viewport,
             );
         }
     }
-- 
cgit 


From d278bfd21d0399009e652560afb9a4d185e92637 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Fri, 5 Jan 2024 17:46:33 +0100
Subject: Replace `width` and `height` with `Widget::size`

---
 widget/src/checkbox.rs | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

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

diff --git a/widget/src/checkbox.rs b/widget/src/checkbox.rs
index a0d9559b..0353b3ad 100644
--- a/widget/src/checkbox.rs
+++ b/widget/src/checkbox.rs
@@ -174,12 +174,11 @@ where
         tree::State::new(widget::text::State::<Renderer::Paragraph>::default())
     }
 
-    fn width(&self) -> Length {
-        self.width
-    }
-
-    fn height(&self) -> Length {
-        Length::Shrink
+    fn size(&self) -> Size<Length> {
+        Size {
+            width: self.width,
+            height: Length::Shrink,
+        }
     }
 
     fn layout(
-- 
cgit