diff options
| author |  Héctor Ramón <hector@hecrj.dev> | 2024-02-27 01:37:13 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2024-02-27 01:37:13 +0100 |
| commit | 8bb1587a748f2c579ce8ea7f5c584cf4a6361e83 (patch) | |
| tree | cd22dde1af966ab886169e234f6feedf373b80f6 /widget | |
| parent | f6f0c01546543ee7fee7048de5d59de9059e9b60 (diff) | |
| parent | 01fbd5049d09b44369b7cd1f283c473afda5d2be (diff) | |
| download | iced-8bb1587a748f2c579ce8ea7f5c584cf4a6361e83.tar.gz iced-8bb1587a748f2c579ce8ea7f5c584cf4a6361e83.tar.bz2 iced-8bb1587a748f2c579ce8ea7f5c584cf4a6361e83.zip | |
Merge pull request #2298 from iced-rs/fix/row-column-fluidity
Fix `Column` and `Row` fluidity being overridden by `push`
Diffstat (limited to '')
| -rw-r--r-- | widget/src/column.rs | 11 | ||||
| -rw-r--r-- | widget/src/keyed/column.rs | 11 | ||||
| -rw-r--r-- | widget/src/row.rs | 11 |
3 files changed, 9 insertions, 24 deletions
diff --git a/widget/src/column.rs b/widget/src/column.rs index e59a0809..d37ef695 100644 --- a/widget/src/column.rs +++ b/widget/src/column.rs @@ -115,15 +115,10 @@ where child: impl Into<Element<'a, Message, Theme, Renderer>>, ) -> Self { let child = child.into(); - let size = child.as_widget().size_hint(); + let child_size = child.as_widget().size_hint(); - if size.width.is_fill() { - self.width = Length::Fill; - } - - if size.height.is_fill() { - self.height = Length::Fill; - } + self.width = self.width.enclose(child_size.width); + self.height = self.height.enclose(child_size.height); self.children.push(child); self diff --git a/widget/src/keyed/column.rs b/widget/src/keyed/column.rs index ce74e701..8a8d5fe7 100644 --- a/widget/src/keyed/column.rs +++ b/widget/src/keyed/column.rs @@ -110,15 +110,10 @@ where child: impl Into<Element<'a, Message, Theme, Renderer>>, ) -> Self { let child = child.into(); - let size = child.as_widget().size_hint(); + let child_size = child.as_widget().size_hint(); - if size.width.is_fill() { - self.width = Length::Fill; - } - - if size.height.is_fill() { - self.height = Length::Fill; - } + self.width = self.width.enclose(child_size.width); + self.height = self.height.enclose(child_size.height); self.keys.push(key); self.children.push(child); diff --git a/widget/src/row.rs b/widget/src/row.rs index b41b5380..47feff9c 100644 --- a/widget/src/row.rs +++ b/widget/src/row.rs @@ -106,15 +106,10 @@ where child: impl Into<Element<'a, Message, Theme, Renderer>>, ) -> Self { let child = child.into(); - let size = child.as_widget().size_hint(); + let child_size = child.as_widget().size_hint(); - if size.width.is_fill() { - self.width = Length::Fill; - } - - if size.height.is_fill() { - self.height = Length::Fill; - } + self.width = self.width.enclose(child_size.width); + self.height = self.height.enclose(child_size.height); self.children.push(child); self |