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

Fix flex layout of Fill elements in a Shrink cross axis

Browse source 
Instead of collapsing, the `Fill` elements will fill the
cross space allocated by the other `Shrink` elements present
in the container.
This commit is contained in:
Héctor Ramón Jiménez 2024-09-21 21:14:54 +02:00
parent 3a1ed24550
commit 1383c6a4f7
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
2 changed files with 44 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
core/src/layout/flex.rs
View file

@ -79,10 +79,10 @@ where
let max_cross = axis.cross(limits.max());
let mut fill_main_sum = 0;
let mut cross = match axis {
Axis::Vertical if width == Length::Shrink => 0.0,
Axis::Horizontal if height == Length::Shrink => 0.0,
_ => max_cross,
let (mut cross, cross_compress) = match axis {
Axis::Vertical if width == Length::Shrink => (0.0, true),
Axis::Horizontal if height == Length::Shrink => (0.0, true),
_ => (max_cross, false),
};
let mut available = axis.main(limits.max()) - total_spacing;
@ -97,7 +97,8 @@ where
axis.pack(size.width.fill_factor(), size.height.fill_factor())
};
if fill_main_factor == 0 {
if fill_main_factor == 0 && (!cross_compress || fill_cross_factor == 0)
{
let (max_width, max_height) = axis.pack(
available,
if fill_cross_factor == 0 {
@ -141,7 +142,7 @@ where
axis.pack(size.width.fill_factor(), size.height.fill_factor())
};
if fill_main_factor != 0 {
if fill_main_factor != 0 || (cross_compress && fill_cross_factor != 0) {
let max_main =
remaining * fill_main_factor as f32 / fill_main_sum as f32;