From 03c901d49b7cce901cfd76100f08dcff31420af8 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Thu, 11 Jan 2024 06:12:19 +0100
Subject: Make `Button` sizing strategy adaptive

---
 widget/src/button.rs    |  9 ++++++---
 widget/src/container.rs | 12 ++----------
 2 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'widget')

diff --git a/widget/src/button.rs b/widget/src/button.rs
index 86abee77..0ebb8dcc 100644
--- a/widget/src/button.rs
+++ b/widget/src/button.rs
@@ -71,11 +71,14 @@ where
 {
     /// Creates a new [`Button`] with the given content.
     pub fn new(content: impl Into<Element<'a, Message, Renderer>>) -> Self {
+        let content = content.into();
+        let size = content.as_widget().size_hint();
+
         Button {
-            content: content.into(),
+            content,
             on_press: None,
-            width: Length::Shrink,
-            height: Length::Shrink,
+            width: size.width.fluid(),
+            height: size.height.fluid(),
             padding: Padding::new(5.0),
             style: <Renderer::Theme as StyleSheet>::Style::default(),
         }
diff --git a/widget/src/container.rs b/widget/src/container.rs
index ecc5c651..cffb0458 100644
--- a/widget/src/container.rs
+++ b/widget/src/container.rs
@@ -52,16 +52,8 @@ where
         Container {
             id: None,
             padding: Padding::ZERO,
-            width: if size.width.is_fill() {
-                Length::Fill
-            } else {
-                Length::Shrink
-            },
-            height: if size.height.is_fill() {
-                Length::Fill
-            } else {
-                Length::Shrink
-            },
+            width: size.width.fluid(),
+            height: size.height.fluid(),
             max_width: f32::INFINITY,
             max_height: f32::INFINITY,
             horizontal_alignment: alignment::Horizontal::Left,
-- 
cgit