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

Fix sneaky bug with padding in flex layout

Browse Source
This commit is contained in:
Héctor Ramón Jiménez 2019-12-21 07:11:52 +01:00
parent 26ed518fbe
commit 2ec0a43c4a
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,8 +74,7 @@ where
{ {
let limits = limits.pad(padding); let limits = limits.pad(padding);
let mut total_non_fill = let mut total_non_fill = spacing * items.len().saturating_sub(1) as f32;
spacing as f32 * (items.len() as i32 - 1).max(0) 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());
@ -166,13 +165,11 @@ where
main += axis.main(size); main += axis.main(size);
} }
let (width, height) = axis.pack(main, cross); let (width, height) = axis.pack(main - padding, cross);
let size = limits.resolve(Size::new(width, height)); let size = limits.resolve(Size::new(width, height));
let (padding_x, padding_y) = axis.pack(padding, padding * 2.0);
Node::with_children( Node::with_children(
Size::new(size.width + padding_x, size.height + padding_y), Size::new(size.width + padding * 2.0, size.height + padding * 2.0),
nodes, nodes,
) )
} }