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/button.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/button.rs')
| -rw-r--r-- | native/src/widget/button.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/native/src/widget/button.rs b/native/src/widget/button.rs index 6c0b8f6e..1582188b 100644 --- a/native/src/widget/button.rs +++ b/native/src/widget/button.rs @@ -426,12 +426,13 @@ 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); - content.move_to(Point::new(padding.left.into(), padding.top.into())); + 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); - let size = limits.resolve(content.size()).pad(padding); + content.move_to(Point::new(padding.left.into(), padding.top.into())); layout::Node::with_children(size, vec![content]) } |