leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(flex_row): missing child nodes in layout

Browse source
This commit is contained in:
Michael Aaron Murphy 2023-12-04 16:27:56 +01:00 • committed by Jeremy Soller
parent bb7c7ac52a
commit 22d9830651
1 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/widget/flex_row/layout.rs
View file

@ -24,7 +24,7 @@ pub fn resolve<Message>(
let mut current_row_width = 0.0f32; let mut current_row_width = 0.0f32;
let mut current_row_height = 0.0f32; let mut current_row_height = 0.0f32;
let mut row_buffer = Vec::with_capacity(8); let mut row_buffer = Vec::<Node>::with_capacity(8);
for child in items { for child in items {
// Calculate the dimensions of the item. // Calculate the dimensions of the item.
@ -40,12 +40,7 @@ pub fn resolve<Message>(
}; };
// If it fits, add it to the current row, or create a new one. // If it fits, add it to the current row, or create a new one.
if current_row_width + required_width <= max_flex_width { if current_row_width + required_width > max_flex_width {
current_row_width += required_width;
current_row_height = current_row_height.max(size.height);
row_buffer.push(child_node);
} else {
if flex_height != 0.0f32 { if flex_height != 0.0f32 {
flex_height += column_spacing; flex_height += column_spacing;
} }
@ -61,8 +56,32 @@ pub fn resolve<Message>(
flex_height += current_row_height; flex_height += current_row_height;
flex_width = flex_width.max(current_row_width); flex_width = flex_width.max(current_row_width);
current_row_width = 0.0f32;
current_row_width = 0.0;
} }
current_row_width += required_width;
current_row_height = current_row_height.max(size.height);
row_buffer.push(child_node);
}
if !row_buffer.is_empty() {
if flex_height != 0.0f32 {
flex_height += column_spacing;
}
let mut pos_x = 0.0f32;
let pos_y = flex_height;
for mut child_node in row_buffer.drain(..) {
child_node.move_to(Point::new(pos_x, pos_y));
pos_x += row_spacing + child_node.size().width;
nodes.push(child_node);
}
flex_height += current_row_height;
flex_width = flex_width.max(current_row_width);
} }
let flex_size = limits.resolve(Size::new(flex_width, flex_height)); let flex_size = limits.resolve(Size::new(flex_width, flex_height));