diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2023-03-07 07:24:34 +0100 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2023-03-07 07:24:34 +0100 |
| commit | aa4b5bb6b962b48715023e3ce567d1a18473bffa (patch) | |
| tree | 5dcb839dac56c81a9b9b618db86f67f3e72af9d3 /core/src/padding.rs | |
| parent | d3900e067361c82fd857fc92b81284146140bc3b (diff) | |
| parent | df68cca0c9dda051ae979ccc2f5ca8d37c3e3cb5 (diff) | |
| download | iced-aa4b5bb6b962b48715023e3ce567d1a18473bffa.tar.gz iced-aa4b5bb6b962b48715023e3ce567d1a18473bffa.tar.bz2 iced-aa4b5bb6b962b48715023e3ce567d1a18473bffa.zip | |
Merge branch 'master' into feature/software-renderer
Diffstat (limited to 'core/src/padding.rs')
| -rw-r--r-- | core/src/padding.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/src/padding.rs b/core/src/padding.rs index 752b2b86..0b1bba13 100644 --- a/core/src/padding.rs +++ b/core/src/padding.rs @@ -77,12 +77,14 @@ impl Padding { /// 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); + let new_top = self.top.min(available.height); + let new_left = self.left.min(available.width); Padding { - top: self.top.min(available.height / 2.0), - right: self.right.min(available.width / 2.0), - bottom: self.bottom.min(available.height / 2.0), - left: self.left.min(available.width / 2.0), + top: new_top, + bottom: self.bottom.min(available.height - new_top), + left: new_left, + right: self.right.min(available.width - new_left), } } } |