diff options
| author |  Cory Forsstrom <cforsstrom18@gmail.com> | 2022-10-27 11:48:42 -0700 |
|---|---|---|
| committer | Cory Forsstrom <cforsstrom18@gmail.com> | 2022-10-27 11:50:12 -0700 |
| commit | 2c103f8654943c773b6de3c70eb2927e92219422 (patch) | |
| tree | eda48510b5a8530367297dc87d04302d6b3ed4b8 /native/src/widget/button.rs | |
| parent | 82217947aa80287282ed6deb02d238a31303e0d6 (diff) | |
| download | iced-2c103f8654943c773b6de3c70eb2927e92219422.tar.gz iced-2c103f8654943c773b6de3c70eb2927e92219422.tar.bz2 iced-2c103f8654943c773b6de3c70eb2927e92219422.zip | |
Constrain padding to inner & outer sizes
Diffstat (limited to 'native/src/widget/button.rs')
| -rw-r--r-- | native/src/widget/button.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/native/src/widget/button.rs b/native/src/widget/button.rs index 6c0b8f6e..e927998c 100644 --- a/native/src/widget/button.rs +++ b/native/src/widget/button.rs @@ -426,12 +426,15 @@ 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.pad(padding)); + + let padding = padding.constrain(content.size(), limits.max()); - let mut content = layout_content(renderer, &limits); content.move_to(Point::new(padding.left.into(), padding.top.into())); - let size = limits.resolve(content.size()).pad(padding); + let size = limits.pad(padding).resolve(content.size()).pad(padding); layout::Node::with_children(size, vec![content]) } |