diff options
| author |  Héctor Ramón <hector0193@gmail.com> | 2022-11-08 04:39:55 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-11-08 04:39:55 +0100 |
| commit | ac737cb6e905f7a8a85e9f26a27deb7907e80114 (patch) | |
| tree | 161f47b500ace9668c06d01889604bbc60c55727 /native/src/widget/container.rs | |
| parent | acb520a4a8001ed9db885d128ddd1f0ccbd71db2 (diff) | |
| parent | 04087b2a867520cfc43a648fa9e93cee2a6daf3c (diff) | |
| download | iced-ac737cb6e905f7a8a85e9f26a27deb7907e80114.tar.gz iced-ac737cb6e905f7a8a85e9f26a27deb7907e80114.tar.bz2 iced-ac737cb6e905f7a8a85e9f26a27deb7907e80114.zip | |
Merge pull request #1494 from tarkah/fix/padding
Constrain padding to resolved inner / outer widget sizes
Diffstat (limited to 'native/src/widget/container.rs')
| -rw-r--r-- | native/src/widget/container.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/native/src/widget/container.rs b/native/src/widget/container.rs index 2afad3f2..10a80b58 100644 --- a/native/src/widget/container.rs +++ b/native/src/widget/container.rs @@ -293,11 +293,11 @@ pub fn layout<Renderer>( .max_width(max_width) .max_height(max_height) .width(width) - .height(height) - .pad(padding); + .height(height); - let mut content = layout_content(renderer, &limits.loose()); - let size = limits.resolve(content.size()); + let mut content = layout_content(renderer, &limits.pad(padding).loose()); + let padding = padding.fit(content.size(), limits.max()); + let size = limits.pad(padding).resolve(content.size()); content.move_to(Point::new(padding.left.into(), padding.top.into())); content.align( |