diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-01-11 00:44:56 +0100 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-01-11 00:44:56 +0100 |
| commit | de71776e02495df5dc962fb8b8853f666ab8be4f (patch) | |
| tree | 1f87cc68dc554783c6102f3587377f9956bcddba /native/src/layout/flex.rs | |
| parent | e879982cfdf0c6a1c6781a9bc46e0a77839de88f (diff) | |
| parent | 84f1a936db93c16255a07f079c47e351635586f4 (diff) | |
| download | iced-de71776e02495df5dc962fb8b8853f666ab8be4f.tar.gz iced-de71776e02495df5dc962fb8b8853f666ab8be4f.tar.bz2 iced-de71776e02495df5dc962fb8b8853f666ab8be4f.zip | |
Merge branch 'master' into paint-example
Diffstat (limited to 'native/src/layout/flex.rs')
| -rw-r--r-- | native/src/layout/flex.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/native/src/layout/flex.rs b/native/src/layout/flex.rs index 03b13e38..bd37b75a 100644 --- a/native/src/layout/flex.rs +++ b/native/src/layout/flex.rs @@ -77,7 +77,7 @@ where let max_cross = axis.cross(limits.max()); let mut fill_sum = 0; - let mut cross = axis.cross(limits.min()); + let mut cross = axis.cross(limits.min()).max(axis.cross(limits.fill())); let mut available = axis.main(limits.max()) - total_spacing; let mut nodes: Vec<Node> = Vec::with_capacity(items.len()); |