reivilibre/iced-mobile
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Subtract size of previous elements in flex layout

Browse Source
This commit is contained in:
Héctor Ramón Jiménez 2019-12-30 20:50:52 +01:00
parent 4b86c2ff98
commit 74d01a6957
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
native/src/layout/flex.rs
View File

@ -73,10 +73,12 @@ where
Renderer: crate::Renderer, Renderer: crate::Renderer,
{ {
let limits = limits.pad(padding); let limits = limits.pad(padding);
let total_spacing = spacing * items.len().saturating_sub(1) as f32;
let max_cross = axis.cross(limits.max());
let mut total_non_fill = spacing * items.len().saturating_sub(1) as f32;
let mut fill_sum = 0; let mut fill_sum = 0;
let mut cross = axis.cross(limits.min()); let mut cross = axis.cross(limits.min());
let mut available = axis.main(limits.max()) - total_spacing;
let mut nodes: Vec<Node> = Vec::with_capacity(items.len()); let mut nodes: Vec<Node> = Vec::with_capacity(items.len());
nodes.resize(items.len(), Node::default()); nodes.resize(items.len(), Node::default());
@ -89,12 +91,15 @@ where
.fill_factor(); .fill_factor();
if fill_factor == 0 { if fill_factor == 0 {
let child_limits = Limits::new(Size::ZERO, limits.max()); let (max_width, max_height) = axis.pack(available, max_cross);
let child_limits =
Limits::new(Size::ZERO, Size::new(max_width, max_height));
let layout = child.layout(renderer, &child_limits); let layout = child.layout(renderer, &child_limits);
let size = layout.size(); let size = layout.size();
total_non_fill += axis.main(size); available -= axis.main(size);
cross = cross.max(axis.cross(size)); cross = cross.max(axis.cross(size));
nodes[i] = layout; nodes[i] = layout;
@ -103,8 +108,7 @@ where
} }
} }
let available = axis.main(limits.max()); let remaining = available.max(0.0);
let remaining = (available - total_non_fill).max(0.0);
for (i, child) in items.iter().enumerate() { for (i, child) in items.iter().enumerate() {
let fill_factor = match axis { let fill_factor = match axis {