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

Rename Padding::constrain to fit

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

4
core/src/padding.rs
View file

@ -74,8 +74,8 @@ impl Padding {
self.left + self.right
}
/// Constrains the padding to fit between the inner & outer [`Size`]
pub fn constrain(self, inner: Size, outer: Size) -> Self {
/// Fits the [`Padding`] between the provided `inner` and `outer` [`Size`].
pub fn fit(self, inner: Size, outer: Size) -> Self {
let available = (outer - inner).max(Size::ZERO);
Padding {

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

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

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

@ -297,7 +297,7 @@ pub fn layout<Renderer>(
let mut content = layout_content(renderer, &limits.pad(padding).loose());
let padding = padding.constrain(content.size(), limits.max());
let padding = padding.fit(content.size(), limits.max());
let size = limits.pad(padding).resolve(content.size());

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

@ -358,7 +358,7 @@ where
let mut text = layout::Node::new(text_limits.resolve(Size::ZERO));
let padding = padding.constrain(text.size(), limits.max());
let padding = padding.fit(text.size(), limits.max());
text.move_to(Point::new(padding.left.into(), padding.top.into()));