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

Rearrange layout code to improve readability

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2022-11-08 04:04:01 +01:00
parent 7476663069
commit 914f099342
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
3 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -429,13 +429,11 @@ pub fn layout<Renderer>(
let limits = limits.width(width).height(height); let limits = limits.width(width).height(height);
let mut content = layout_content(renderer, &limits.pad(padding)); let mut content = layout_content(renderer, &limits.pad(padding));
let padding = padding.fit(content.size(), limits.max()); let padding = padding.fit(content.size(), limits.max());
let size = limits.pad(padding).resolve(content.size()).pad(padding);
content.move_to(Point::new(padding.left.into(), padding.top.into())); content.move_to(Point::new(padding.left.into(), padding.top.into()));
let size = limits.pad(padding).resolve(content.size()).pad(padding);
layout::Node::with_children(size, vec![content]) layout::Node::with_children(size, vec![content])
} }

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

@ -296,9 +296,7 @@ pub fn layout<Renderer>(
.height(height); .height(height);
let mut content = layout_content(renderer, &limits.pad(padding).loose()); let mut content = layout_content(renderer, &limits.pad(padding).loose());
let padding = padding.fit(content.size(), limits.max()); let padding = padding.fit(content.size(), limits.max());
let size = limits.pad(padding).resolve(content.size()); let size = limits.pad(padding).resolve(content.size());
content.move_to(Point::new(padding.left.into(), padding.top.into())); content.move_to(Point::new(padding.left.into(), padding.top.into()));

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

@ -357,13 +357,11 @@ where
let limits = limits.width(width).height(Length::Shrink); let limits = limits.width(width).height(Length::Shrink);
let mut text = layout::Node::new(text_limits.resolve(Size::ZERO)); let mut text = layout::Node::new(text_limits.resolve(Size::ZERO));
let padding = padding.fit(text.size(), limits.max()); let padding = padding.fit(text.size(), limits.max());
let size = limits.pad(padding).resolve(text.size()).pad(padding);
text.move_to(Point::new(padding.left.into(), padding.top.into())); text.move_to(Point::new(padding.left.into(), padding.top.into()));
let size = limits.pad(padding).resolve(text.size()).pad(padding);
layout::Node::with_children(size, vec![text]) layout::Node::with_children(size, vec![text])
} }