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

Merge pull request #1734 from iced-rs/fix/padding-fit

Browse source 
Fix `Padding::fit` on irregular values for an axis
This commit is contained in:
Héctor Ramón 2023-02-25 21:43:32 +01:00 • committed by GitHub
commit be8102ea3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/src/padding.rs
View file

@ -77,12 +77,14 @@ impl Padding {
/// Fits the [`Padding`] between the provided `inner` and `outer` [`Size`]. /// Fits the [`Padding`] between the provided `inner` and `outer` [`Size`].
pub fn fit(self, inner: Size, outer: Size) -> Self { pub fn fit(self, inner: Size, outer: Size) -> Self {
let available = (outer - inner).max(Size::ZERO); let available = (outer - inner).max(Size::ZERO);
let new_top = self.top.min(available.height);
let new_left = self.left.min(available.width);
Padding { Padding {
top: self.top.min(available.height / 2.0), top: new_top,
right: self.right.min(available.width / 2.0), bottom: self.bottom.min(available.height - new_top),
bottom: self.bottom.min(available.height / 2.0), left: new_left,
left: self.left.min(available.width / 2.0), right: self.right.min(available.width - new_left),
} }
} }
} }