summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector@hecrj.dev>2024-01-11 06:11:36 +0100
committerLibravatar Héctor Ramón Jiménez <hector@hecrj.dev>2024-01-11 06:11:36 +0100
commitfa53d9adbb0efbbe806a749476f83c04f756be75 (patch)
treee6561f4469d5e8aa3179354a6847a9be972fe2b2
parent226271148e77a4f8966ce84b0c948c268176d92b (diff)
downloadiced-fa53d9adbb0efbbe806a749476f83c04f756be75.tar.gz
iced-fa53d9adbb0efbbe806a749476f83c04f756be75.tar.bz2
iced-fa53d9adbb0efbbe806a749476f83c04f756be75.zip
Loosen cross axis constraint for main axis fills in `flex` layout
-rw-r--r--core/src/layout/flex.rs13
1 files changed, 4 insertions, 9 deletions
diff --git a/core/src/layout/flex.rs b/core/src/layout/flex.rs
index 47cd7112..3358ef3d 100644
--- a/core/src/layout/flex.rs
+++ b/core/src/layout/flex.rs
@@ -166,13 +166,10 @@ where
};
if fill_main_factor != 0 {
- let max_main = if fill_main_factor == 0 {
- available.max(0.0)
- } else {
- remaining * fill_main_factor as f32 / fill_main_sum as f32
- };
+ let max_main =
+ 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
} else {
max_main
@@ -184,9 +181,7 @@ where
cross
};
- let (min_width, min_height) =
- axis.pack(min_main, axis.cross(limits.min()));
-
+ let (min_width, min_height) = axis.pack(min_main, 0.0);
let (max_width, max_height) = axis.pack(max_main, max_cross);
let child_limits = Limits::new(