me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Constrain padding to inner & outer sizes

Browse source
This commit is contained in:
Cory Forsstrom 2022-10-27 11:48:42 -07:00
parent 82217947aa
commit 2c103f8654
4 changed files with 53 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
native/src/widget/button.rs
View file

@ -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])
}

10
native/src/widget/container.rs
View file

@ -293,11 +293,13 @@ 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.constrain(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(