diff options
author | 2022-07-19 18:34:39 +0200 | |
---|---|---|
committer | 2022-07-19 18:34:39 +0200 | |
commit | 785385d889f02fc3805920b42ed8195a7f6a5672 (patch) | |
tree | f6e46210caf1ee9409f11cd97cad97b642d63bb3 /pure | |
parent | 61fd5b0050724a6b05f2b959c546a58cb6073de3 (diff) | |
parent | cdd3802e6858c81985849aca9d2daf733828ba29 (diff) | |
download | iced-785385d889f02fc3805920b42ed8195a7f6a5672.tar.gz iced-785385d889f02fc3805920b42ed8195a7f6a5672.tar.bz2 iced-785385d889f02fc3805920b42ed8195a7f6a5672.zip |
Merge pull request #1390 from iced-rs/fix/container-layout
Fix `max_width` and `max_height` for `Container`
Diffstat (limited to '')
-rw-r--r-- | pure/src/widget/container.rs | 2 | ||||
-rw-r--r-- | pure/src/widget/scrollable.rs | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/pure/src/widget/container.rs b/pure/src/widget/container.rs index 8ea9ca72..44ffff8c 100644 --- a/pure/src/widget/container.rs +++ b/pure/src/widget/container.rs @@ -156,6 +156,8 @@ where limits, self.width, self.height, + self.max_width, + self.max_height, self.padding, self.horizontal_alignment, self.vertical_alignment, diff --git a/pure/src/widget/scrollable.rs b/pure/src/widget/scrollable.rs index 4e24915b..4118b67e 100644 --- a/pure/src/widget/scrollable.rs +++ b/pure/src/widget/scrollable.rs @@ -133,6 +133,7 @@ where limits, Widget::<Message, Renderer>::width(self), self.height, + u32::MAX, |renderer, limits| { self.content.as_widget().layout(renderer, limits) }, |