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

Merge pull request #1494 from tarkah/fix/padding

Browse source 
Constrain padding to resolved inner / outer widget sizes
This commit is contained in:
Héctor Ramón 2022-11-08 04:39:55 +01:00 • committed by GitHub
commit ac737cb6e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 60 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -426,13 +426,14 @@ 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.fit(content.size(), limits.max());
let size = limits.pad(padding).resolve(content.size()).pad(padding);
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);
layout::Node::with_children(size, vec![content])
}

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

@ -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(

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

@ -350,15 +350,19 @@ where
{
let text_size = size.unwrap_or_else(|| renderer.default_size());
let limits = limits
let text_limits = limits
.pad(padding)
.width(width)
.height(Length::Units(text_size));
let limits = limits.width(width).height(Length::Shrink);
let mut text = layout::Node::new(text_limits.resolve(Size::ZERO));
let padding = padding.fit(text.size(), limits.max());
let size = limits.pad(padding).resolve(text.size()).pad(padding);
let mut text = layout::Node::new(limits.resolve(Size::ZERO));
text.move_to(Point::new(padding.left.into(), padding.top.into()));
layout::Node::with_children(text.size().pad(padding), vec![text])
layout::Node::with_children(size, vec![text])
}
/// Processes an [`Event`] and updates the [`State`] of a [`TextInput`]