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

Determine cross-axis max length based on contents if Shrink

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-03-23 16:07:23 +01:00 • committed by Héctor Ramón Jiménez
parent ed3b393018
commit 89418c1244
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
1 changed files with 30 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -47,7 +47,7 @@ impl Axis {
} }
} }
fn pack(&self, main: f32, cross: f32) -> (f32, f32) { fn pack<T>(&self, main: T, cross: T) -> (T, T) {
match self { match self {
Axis::Horizontal => (main, cross), Axis::Horizontal => (main, cross),
Axis::Vertical => (cross, main), Axis::Vertical => (cross, main),
@ -78,7 +78,7 @@ where
let total_spacing = spacing * items.len().saturating_sub(1) as f32; let total_spacing = spacing * items.len().saturating_sub(1) as f32;
let max_cross = axis.cross(limits.max()); let max_cross = axis.cross(limits.max());
let mut fill_sum = 0; let mut fill_main_sum = 0;
let mut cross = 0.0f32; let mut cross = 0.0f32;
let mut available = axis.main(limits.max()) - total_spacing; let mut available = axis.main(limits.max()) - total_spacing;
@ -86,13 +86,12 @@ where
nodes.resize(items.len(), Node::default()); nodes.resize(items.len(), Node::default());
for (i, (child, tree)) in items.iter().zip(trees.iter_mut()).enumerate() { for (i, (child, tree)) in items.iter().zip(trees.iter_mut()).enumerate() {
let fill_factor = match axis { let (fill_main_factor, fill_cross_factor) = axis.pack(
Axis::Horizontal => child.as_widget().width(), child.as_widget().width().fill_factor(),
Axis::Vertical => child.as_widget().height(), child.as_widget().height().fill_factor(),
} );
.fill_factor();
if fill_factor == 0 { if fill_main_factor == 0 && fill_cross_factor == 0 {
let (max_width, max_height) = axis.pack(available, max_cross); let (max_width, max_height) = axis.pack(available, max_cross);
let child_limits = let child_limits =
@ -107,7 +106,7 @@ where
nodes[i] = layout; nodes[i] = layout;
} else { } else {
fill_sum += fill_factor; fill_main_sum += fill_main_factor;
} }
} }
@ -122,15 +121,27 @@ where
}, },
}; };
for (i, (child, tree)) in items.iter().zip(trees).enumerate() { let max_cross = match axis {
let fill_factor = match axis { Axis::Horizontal => match height {
Axis::Horizontal => child.as_widget().width(), Length::Shrink => cross,
Axis::Vertical => child.as_widget().height(), _ => max_cross,
} },
.fill_factor(); Axis::Vertical => match width {
Length::Shrink => cross,
_ => max_cross,
},
};
for (i, (child, tree)) in items.iter().zip(trees).enumerate() {
let (fill_main_factor, fill_cross_factor) = axis.pack(
child.as_widget().width().fill_factor(),
child.as_widget().height().fill_factor(),
);
if fill_main_factor != 0 || fill_cross_factor != 0 {
let max_main =
remaining * fill_main_factor as f32 / fill_main_sum as f32;
if fill_factor != 0 {
let max_main = remaining * fill_factor as f32 / fill_sum as f32;
let min_main = if max_main.is_infinite() { let min_main = if max_main.is_infinite() {
0.0 0.0
} else { } else {
@ -140,7 +151,8 @@ where
let (min_width, min_height) = let (min_width, min_height) =
axis.pack(min_main, axis.cross(limits.min())); 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 * fill_cross_factor.max(1) as f32);
let child_limits = Limits::new( let child_limits = Limits::new(
Size::new(min_width, min_height), Size::new(min_width, min_height),