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

Loosen cross axis constraint for main axis fills in flex layout

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-01-11 06:11:36 +01:00
parent 226271148e
commit fa53d9adbb
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -166,13 +166,10 @@ where
}; };
if fill_main_factor != 0 { if fill_main_factor != 0 {
let max_main = if fill_main_factor == 0 { let max_main =
available.max(0.0) remaining * fill_main_factor as f32 / fill_main_sum as f32;
} else {
remaining * fill_main_factor as f32 / fill_main_sum as f32
};
let min_main = if fill_main_factor == 0 || max_main.is_infinite() { let min_main = if max_main.is_infinite() {
0.0 0.0
} else { } else {
max_main max_main
@ -184,9 +181,7 @@ where
cross cross
}; };
let (min_width, min_height) = let (min_width, min_height) = axis.pack(min_main, 0.0);
axis.pack(min_main, axis.cross(limits.min()));
let (max_width, max_height) = axis.pack(max_main, max_cross); let (max_width, max_height) = axis.pack(max_main, max_cross);
let child_limits = Limits::new( let child_limits = Limits::new(