diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2019-12-31 11:37:41 +0100 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2019-12-31 11:37:41 +0100 |
| commit | e98471d5b60d34e54defaba6e5979ff881e380e6 (patch) | |
| tree | 428d923a092bc710697762e048d7a95505cc7085 /native/src/layout/limits.rs | |
| parent | fb9cc0262b30a953e8188897b74abb5106ea1fd8 (diff) | |
| parent | 26de688e68347e1f6e388d01014eac89cea71afa (diff) | |
| download | iced-e98471d5b60d34e54defaba6e5979ff881e380e6.tar.gz iced-e98471d5b60d34e54defaba6e5979ff881e380e6.tar.bz2 iced-e98471d5b60d34e54defaba6e5979ff881e380e6.zip | |
Merge branch 'master' into feature/custom-styling
Diffstat (limited to 'native/src/layout/limits.rs')
| -rw-r--r-- | native/src/layout/limits.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/native/src/layout/limits.rs b/native/src/layout/limits.rs index 2705a47d..a35f7ff7 100644 --- a/native/src/layout/limits.rs +++ b/native/src/layout/limits.rs @@ -52,7 +52,7 @@ impl Limits { Length::Shrink => { self.fill.width = self.min.width; } - Length::Fill => { + Length::Fill | Length::FillPortion(_) => { self.fill.width = self.fill.width.min(self.max.width); } Length::Units(units) => { @@ -76,7 +76,7 @@ impl Limits { Length::Shrink => { self.fill.height = self.min.height; } - Length::Fill => { + Length::Fill | Length::FillPortion(_) => { self.fill.height = self.fill.height.min(self.max.height); } Length::Units(units) => { |