From 2c103f8654943c773b6de3c70eb2927e92219422 Mon Sep 17 00:00:00 2001
From: Cory Forsstrom <cforsstrom18@gmail.com>
Date: Thu, 27 Oct 2022 11:48:42 -0700
Subject: Constrain padding to inner & outer sizes

---
 native/src/widget/button.rs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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

diff --git a/native/src/widget/button.rs b/native/src/widget/button.rs
index 6c0b8f6e..e927998c 100644
--- a/native/src/widget/button.rs
+++ b/native/src/widget/button.rs
@@ -426,12 +426,15 @@ pub fn layout<Renderer>(
     padding: Padding,
     layout_content: impl FnOnce(&Renderer, &layout::Limits) -> layout::Node,
 ) -> layout::Node {
-    let limits = limits.width(width).height(height).pad(padding);
+    let limits = limits.width(width).height(height);
+
+    let mut content = layout_content(renderer, &limits.pad(padding));
+
+    let padding = padding.constrain(content.size(), limits.max());
 
-    let mut content = layout_content(renderer, &limits);
     content.move_to(Point::new(padding.left.into(), padding.top.into()));
 
-    let size = limits.resolve(content.size()).pad(padding);
+    let size = limits.pad(padding).resolve(content.size()).pad(padding);
 
     layout::Node::with_children(size, vec![content])
 }
-- 
cgit 


From 7476663069572adec25161b46c26570f864f736f Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 8 Nov 2022 03:56:05 +0100
Subject: Rename `Padding::constrain` to `fit`

---
 native/src/widget/button.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/native/src/widget/button.rs b/native/src/widget/button.rs
index e927998c..01b528ec 100644
--- a/native/src/widget/button.rs
+++ b/native/src/widget/button.rs
@@ -430,7 +430,7 @@ pub fn layout<Renderer>(
 
     let mut content = layout_content(renderer, &limits.pad(padding));
 
-    let padding = padding.constrain(content.size(), limits.max());
+    let padding = padding.fit(content.size(), limits.max());
 
     content.move_to(Point::new(padding.left.into(), padding.top.into()));
 
-- 
cgit 


From 914f0993428c752937d8db0a70a48f6f6f29c839 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 8 Nov 2022 04:04:01 +0100
Subject: Rearrange `layout` code to improve readability

---
 native/src/widget/button.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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

diff --git a/native/src/widget/button.rs b/native/src/widget/button.rs
index 01b528ec..1582188b 100644
--- a/native/src/widget/button.rs
+++ b/native/src/widget/button.rs
@@ -429,13 +429,11 @@ pub fn layout<Renderer>(
     let limits = limits.width(width).height(height);
 
     let mut content = layout_content(renderer, &limits.pad(padding));
-
     let padding = padding.fit(content.size(), limits.max());
+    let size = limits.pad(padding).resolve(content.size()).pad(padding);
 
     content.move_to(Point::new(padding.left.into(), padding.top.into()));
 
-    let size = limits.pad(padding).resolve(content.size()).pad(padding);
-
     layout::Node::with_children(size, vec![content])
 }
 
-- 
cgit 


From 18fb74f20092b2703a90afdb01f39754445998da Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 9 Nov 2022 04:05:31 +0100
Subject: Introduce `Custom` variants for every style in  the built-in `Theme`

---
 native/src/widget/button.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/native/src/widget/button.rs b/native/src/widget/button.rs
index 1582188b..fa5da24b 100644
--- a/native/src/widget/button.rs
+++ b/native/src/widget/button.rs
@@ -231,7 +231,7 @@ where
             cursor_position,
             self.on_press.is_some(),
             theme,
-            self.style,
+            &self.style,
             || tree.state.downcast_ref::<State>(),
         );
 
@@ -361,7 +361,7 @@ pub fn draw<'a, Renderer: crate::Renderer>(
     style_sheet: &dyn StyleSheet<
         Style = <Renderer::Theme as StyleSheet>::Style,
     >,
-    style: <Renderer::Theme as StyleSheet>::Style,
+    style: &<Renderer::Theme as StyleSheet>::Style,
     state: impl FnOnce() -> &'a State,
 ) -> Appearance
 where
-- 
cgit 


From f1ada7a803998ac3fb2c1bedc6d6650264f3e603 Mon Sep 17 00:00:00 2001
From: tarkah <cforsstrom18@gmail.com>
Date: Sat, 19 Nov 2022 12:25:59 -0800
Subject: Allow &mut self in overlay

---
 native/src/widget/button.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/native/src/widget/button.rs b/native/src/widget/button.rs
index fa5da24b..d68e01c7 100644
--- a/native/src/widget/button.rs
+++ b/native/src/widget/button.rs
@@ -260,12 +260,12 @@ where
     }
 
     fn overlay<'b>(
-        &'b self,
+        &'b mut self,
         tree: &'b mut Tree,
         layout: Layout<'_>,
         renderer: &Renderer,
     ) -> Option<overlay::Element<'b, Message, Renderer>> {
-        self.content.as_widget().overlay(
+        self.content.as_widget_mut().overlay(
             &mut tree.children[0],
             layout.children().next().unwrap(),
             renderer,
-- 
cgit