diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-01-09 01:37:57 +0100 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-01-09 01:37:57 +0100 |
| commit | a4e833e860c41796d491ab43e84239fcca1f303d (patch) | |
| tree | c41ab304ffaf2dc2311c7d33916cd0515114ad31 /native/src/layout | |
| parent | 2ff0e48142c302cb93130164d083589bb2ac4979 (diff) | |
| parent | cc529a1803972604b122c19c0104e71532fff993 (diff) | |
| download | iced-a4e833e860c41796d491ab43e84239fcca1f303d.tar.gz iced-a4e833e860c41796d491ab43e84239fcca1f303d.tar.bz2 iced-a4e833e860c41796d491ab43e84239fcca1f303d.zip | |
Merge branch 'master' into feature/shrink-by-default
Diffstat (limited to 'native/src/layout')
| -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) => { |