diff --git a/examples/basic.rs b/examples/basic.rs
index 244bfca1c..432db30c2 100644
--- a/examples/basic.rs
+++ b/examples/basic.rs
@@ -6,11 +6,7 @@ fn main() {
height: stretch::style::Dimension::Points(100.0),
justify_content: stretch::style::JustifyContent::Center,
- children: vec![stretch::style::Node {
- width: stretch::style::Dimension::Percent(0.5),
-
- ..Default::default()
- }],
+ children: vec![stretch::style::Node { width: stretch::style::Dimension::Percent(0.5), ..Default::default() }],
..Default::default()
};
diff --git a/rustfmt.toml b/rustfmt.toml
new file mode 100644
index 000000000..53f62a6d9
--- /dev/null
+++ b/rustfmt.toml
@@ -0,0 +1,3 @@
+max_width = 120
+use_field_init_shorthand = true
+use_small_heuristics = "Max"
\ No newline at end of file
diff --git a/src/algo.rs b/src/algo.rs
index a563f6eb5..b19e63127 100644
--- a/src/algo.rs
+++ b/src/algo.rs
@@ -33,35 +33,23 @@ struct SizeConstraint {
impl SizeConstraint {
fn exactly(size: f32) -> SizeConstraint {
- SizeConstraint {
- min: size,
- max: size,
- }
+ SizeConstraint { min: size, max: size }
}
fn undefined() -> SizeConstraint {
- SizeConstraint {
- min: f32::NAN,
- max: f32::NAN,
- }
+ SizeConstraint { min: f32::NAN, max: f32::NAN }
}
fn at_least(size: f32) -> SizeConstraint {
- SizeConstraint {
- min: size,
- max: f32::NAN,
- }
+ SizeConstraint { min: size, max: f32::NAN }
}
fn at_most(size: f32) -> SizeConstraint {
- SizeConstraint {
- min: f32::NAN,
- max: size,
- }
+ SizeConstraint { min: f32::NAN, max: size }
}
fn between(min: f32, max: f32) -> SizeConstraint {
- SizeConstraint { min: min, max: max }
+ SizeConstraint { min, max }
}
}
@@ -106,19 +94,19 @@ struct FlexLine<'a> {
}
pub fn compute(root: &style::Node) -> layout::Node {
- let result = compute_internal(
- root,
- SizeConstraint::undefined(),
- SizeConstraint::undefined(),
- );
-
- round_layout(&layout::Node {
- width: result.size.width,
- height: result.size.height,
- x: 0.0,
- y: 0.0,
- children: result.children,
- }, 0.0, 0.0)
+ let result = compute_internal(root, SizeConstraint::undefined(), SizeConstraint::undefined());
+
+ round_layout(
+ &layout::Node {
+ width: result.size.width,
+ height: result.size.height,
+ x: 0.0,
+ y: 0.0,
+ children: result.children,
+ },
+ 0.0,
+ 0.0,
+ )
}
fn round_layout(layout: &layout::Node, abs_x: f32, abs_y: f32) -> layout::Node {
@@ -131,9 +119,7 @@ fn round_layout(layout: &layout::Node, abs_x: f32, abs_y: f32) -> layout::Node {
let rounded_width = (abs_x + layout.width).round() - abs_x.round();
let rounded_height = (abs_y + layout.height).round() - abs_y.round();
- let rounded_children = layout.children.iter().map(|child| {
- round_layout(child, abs_x, abs_y)
- }).collect();
+ let rounded_children = layout.children.iter().map(|child| round_layout(child, abs_x, abs_y)).collect();
layout::Node {
width: rounded_width,
@@ -159,73 +145,49 @@ fn compute_internal(
};
let (intrinsic_main_size, intrinsic_cross_size) = (
- node.main_size(node.flex_direction)
- .resolve(main_constraint.max, f32::NAN),
- node.cross_size(node.flex_direction)
- .resolve(cross_constraint.max, f32::NAN),
+ node.main_size(node.flex_direction).resolve(main_constraint.max, f32::NAN),
+ node.cross_size(node.flex_direction).resolve(cross_constraint.max, f32::NAN),
);
let (margin_main_start, margin_cross_start) = (
- node.main_margin_start(node.flex_direction)
- .resolve(main_constraint.max, 0.0),
- node.cross_margin_start(node.flex_direction)
- .resolve(main_constraint.max, 0.0),
+ node.main_margin_start(node.flex_direction).resolve(main_constraint.max, 0.0),
+ node.cross_margin_start(node.flex_direction).resolve(main_constraint.max, 0.0),
);
let (margin_main_end, margin_cross_end) = (
- node.main_margin_end(node.flex_direction)
- .resolve(main_constraint.max, 0.0),
- node.cross_margin_end(node.flex_direction)
- .resolve(main_constraint.max, 0.0),
+ node.main_margin_end(node.flex_direction).resolve(main_constraint.max, 0.0),
+ node.cross_margin_end(node.flex_direction).resolve(main_constraint.max, 0.0),
);
- let (margin_main, margin_cross) = (
- margin_main_start + margin_main_end,
- margin_cross_start + margin_cross_end,
- );
+ let (margin_main, margin_cross) = (margin_main_start + margin_main_end, margin_cross_start + margin_cross_end);
let (padding_main_start, padding_cross_start) = (
- node.main_padding_start(node.flex_direction)
- .resolve(main_constraint.max, 0.0),
- node.cross_padding_start(node.flex_direction)
- .resolve(main_constraint.max, 0.0),
+ node.main_padding_start(node.flex_direction).resolve(main_constraint.max, 0.0),
+ node.cross_padding_start(node.flex_direction).resolve(main_constraint.max, 0.0),
);
let (padding_main_end, padding_cross_end) = (
- node.main_padding_end(node.flex_direction)
- .resolve(main_constraint.max, 0.0),
- node.cross_padding_end(node.flex_direction)
- .resolve(main_constraint.max, 0.0),
+ node.main_padding_end(node.flex_direction).resolve(main_constraint.max, 0.0),
+ node.cross_padding_end(node.flex_direction).resolve(main_constraint.max, 0.0),
);
- let (padding_main, padding_cross) = (
- padding_main_start + padding_main_end,
- padding_cross_start + padding_cross_end,
- );
+ let (padding_main, padding_cross) =
+ (padding_main_start + padding_main_end, padding_cross_start + padding_cross_end);
let (border_main_start, border_cross_start) = (
- node.main_border_start(node.flex_direction)
- .resolve(main_constraint.max, 0.0),
- node.cross_border_start(node.flex_direction)
- .resolve(main_constraint.max, 0.0),
+ node.main_border_start(node.flex_direction).resolve(main_constraint.max, 0.0),
+ node.cross_border_start(node.flex_direction).resolve(main_constraint.max, 0.0),
);
let (border_main_end, border_cross_end) = (
- node.main_border_end(node.flex_direction)
- .resolve(main_constraint.max, 0.0),
- node.cross_border_end(node.flex_direction)
- .resolve(main_constraint.max, 0.0),
+ node.main_border_end(node.flex_direction).resolve(main_constraint.max, 0.0),
+ node.cross_border_end(node.flex_direction).resolve(main_constraint.max, 0.0),
);
- let (border_main, border_cross) = (
- border_main_start + border_main_end,
- border_cross_start + border_cross_end,
- );
+ let (border_main, border_cross) = (border_main_start + border_main_end, border_cross_start + border_cross_end);
- let (inner_intrinsic_main_size, inner_intrinsic_cross_size) = (
- intrinsic_main_size - padding_main - border_main,
- intrinsic_cross_size - padding_cross - border_cross,
- );
+ let (inner_intrinsic_main_size, inner_intrinsic_cross_size) =
+ (intrinsic_main_size - padding_main - border_main, intrinsic_cross_size - padding_cross - border_cross);
// 9.2. Line Length Determination
@@ -266,17 +228,15 @@ fn compute_internal(
// margin, border, and padding from the space available to the flex container
// in that dimension and use that value. This might result in an infinite value.
- let avaliable_main = node
- .main_size(node.flex_direction)
- .resolve(main_constraint.max, main_constraint.max - margin_main)
- - padding_main
- - border_main;
+ let avaliable_main =
+ node.main_size(node.flex_direction).resolve(main_constraint.max, main_constraint.max - margin_main)
+ - padding_main
+ - border_main;
- let avaliable_cross = node
- .cross_size(node.flex_direction)
- .resolve(cross_constraint.max, cross_constraint.max - margin_cross)
- - padding_cross
- - border_cross;
+ let avaliable_cross =
+ node.cross_size(node.flex_direction).resolve(cross_constraint.max, cross_constraint.max - margin_cross)
+ - padding_cross
+ - border_cross;
// 3. Determine the flex base size and hypothetical main size of each item:
for child in &mut flex_items {
@@ -294,10 +254,7 @@ fn compute_internal(
// cross size and the flex item’s intrinsic aspect ratio.
if let Some(ratio) = child.node.aspect_ratio {
- let cross_size = child
- .node
- .cross_size(node.flex_direction)
- .resolve(avaliable_cross, f32::NAN);
+ let cross_size = child.node.cross_size(node.flex_direction).resolve(avaliable_cross, f32::NAN);
if intrinsic_cross_size.is_finite() && child.node.flex_basis == style::Dimension::Auto {
child.flex_basis = ratio * cross_size;
@@ -314,16 +271,8 @@ fn compute_internal(
if main_constraint.min.is_finite() || main_constraint.max.is_finite() {
let size = compute_internal(
child.node,
- if node.flex_direction.is_row() {
- main_constraint
- } else {
- SizeConstraint::undefined()
- },
- if node.flex_direction.is_column() {
- main_constraint
- } else {
- SizeConstraint::undefined()
- },
+ if node.flex_direction.is_row() { main_constraint } else { SizeConstraint::undefined() },
+ if node.flex_direction.is_column() { main_constraint } else { SizeConstraint::undefined() },
).size;
child.flex_basis = size.main(node.flex_direction);
continue;
@@ -336,11 +285,7 @@ fn compute_internal(
// is the item’s max-content main size.
if avaliable_main.is_nan() {
- let size = compute_internal(
- child.node,
- SizeConstraint::undefined(),
- SizeConstraint::undefined(),
- ).size;
+ let size = compute_internal(child.node, SizeConstraint::undefined(), SizeConstraint::undefined()).size;
child.flex_basis = size.main(node.flex_direction);
continue;
}
@@ -372,48 +317,21 @@ fn compute_internal(
// used min and max main sizes (and flooring the content box size at zero).
for child in &mut flex_items {
- let padding_start = child
- .node
- .main_padding_start(node.flex_direction)
- .resolve(avaliable_main, 0.0);
- let padding_end = child
- .node
- .main_padding_end(node.flex_direction)
- .resolve(avaliable_main, 0.0);
- let border_start = child
- .node
- .main_border_start(node.flex_direction)
- .resolve(avaliable_main, 0.0);
- let border_end = child
- .node
- .main_border_end(node.flex_direction)
- .resolve(avaliable_main, 0.0);
- child.inner_flex_basis =
- child.flex_basis - (padding_start + padding_end + border_start + border_end);
+ let padding_start = child.node.main_padding_start(node.flex_direction).resolve(avaliable_main, 0.0);
+ let padding_end = child.node.main_padding_end(node.flex_direction).resolve(avaliable_main, 0.0);
+ let border_start = child.node.main_border_start(node.flex_direction).resolve(avaliable_main, 0.0);
+ let border_end = child.node.main_border_end(node.flex_direction).resolve(avaliable_main, 0.0);
+ child.inner_flex_basis = child.flex_basis - (padding_start + padding_end + border_start + border_end);
child.hypothetical_inner_main_size = child
.flex_basis
- .max(
- child
- .node
- .min_main_size(node.flex_direction)
- .resolve(avaliable_main, f32::MIN),
- ).min(
- child
- .node
- .max_main_size(node.flex_direction)
- .resolve(avaliable_main, f32::MAX),
- ).max(0.0);
+ .max(child.node.min_main_size(node.flex_direction).resolve(avaliable_main, f32::MIN))
+ .min(child.node.max_main_size(node.flex_direction).resolve(avaliable_main, f32::MAX))
+ .max(0.0);
child.hypothetical_outer_main_size = child.hypothetical_inner_main_size
- + child
- .node
- .main_margin_start(node.flex_direction)
- .resolve(avaliable_main, 0.0)
- + child
- .node
- .main_margin_end(node.flex_direction)
- .resolve(avaliable_main, 0.0);
+ + child.node.main_margin_start(node.flex_direction).resolve(avaliable_main, 0.0)
+ + child.node.main_margin_end(node.flex_direction).resolve(avaliable_main, 0.0);
}
// 9.3. Main Size Determination
@@ -438,17 +356,9 @@ fn compute_internal(
let mut line_length = 0.0;
if node.wrap == style::Wrap::NoWrap {
- lines.push(FlexLine {
- items: flex_items,
- cross_size: 0.0,
- offset_cross: 0.0,
- });
+ lines.push(FlexLine { items: flex_items, cross_size: 0.0, offset_cross: 0.0 });
} else {
- let mut line = FlexLine {
- items: vec![],
- cross_size: 0.0,
- offset_cross: 0.0,
- };
+ let mut line = FlexLine { items: vec![], cross_size: 0.0, offset_cross: 0.0 };
for child in flex_items {
line_length += child.hypothetical_outer_main_size;
@@ -456,11 +366,7 @@ fn compute_internal(
if line_length > avaliable_main && line.items.len() > 0 {
line_length = child.hypothetical_outer_main_size;
lines.push(line);
- line = FlexLine {
- items: vec![],
- cross_size: 0.0,
- offset_cross: 0.0,
- };
+ line = FlexLine { items: vec![], cross_size: 0.0, offset_cross: 0.0 };
}
line.items.push(child);
@@ -483,11 +389,7 @@ fn compute_internal(
// use the flex grow factor for the rest of this algorithm; otherwise, use the
// flex shrink factor.
- let used_flex_factor: f32 = line
- .items
- .iter()
- .map(|child| child.hypothetical_outer_main_size)
- .sum();
+ let used_flex_factor: f32 = line.items.iter().map(|child| child.hypothetical_outer_main_size).sum();
let growing = used_flex_factor < avaliable_main;
let shrinking = !growing;
@@ -517,19 +419,9 @@ fn compute_internal(
.items
.iter()
.map(|child| {
- child
- .node
- .main_margin_start(node.flex_direction)
- .resolve(avaliable_main, 0.0)
- + child
- .node
- .main_margin_end(node.flex_direction)
- .resolve(avaliable_main, 0.0)
- + if child.frozen {
- child.target_main_size
- } else {
- child.flex_basis
- }
+ child.node.main_margin_start(node.flex_direction).resolve(avaliable_main, 0.0)
+ + child.node.main_margin_end(node.flex_direction).resolve(avaliable_main, 0.0)
+ + if child.frozen { child.target_main_size } else { child.flex_basis }
}).sum();
let initial_free_space = avaliable_main - used_space;
@@ -563,19 +455,9 @@ fn compute_internal(
let used_space: f32 = Iterator::chain(frozen.iter(), unfrozen.iter())
.map(|child| {
- child
- .node
- .main_margin_start(node.flex_direction)
- .resolve(avaliable_main, 0.0)
- + child
- .node
- .main_margin_end(node.flex_direction)
- .resolve(avaliable_main, 0.0)
- + if child.frozen {
- child.target_main_size
- } else {
- child.flex_basis
- }
+ child.node.main_margin_start(node.flex_direction).resolve(avaliable_main, 0.0)
+ + child.node.main_margin_end(node.flex_direction).resolve(avaliable_main, 0.0)
+ + if child.frozen { child.target_main_size } else { child.flex_basis }
}).sum();
let sum_flex_grow: f32 = unfrozen.iter().map(|item| item.node.flex_grow).sum();
@@ -610,19 +492,16 @@ fn compute_internal(
if free_space > 0.0 && growing && sum_flex_grow > 0.0 {
for child in &mut unfrozen {
- child.target_main_size =
- child.flex_basis + free_space * (child.node.flex_grow / sum_flex_grow);
+ child.target_main_size = child.flex_basis + free_space * (child.node.flex_grow / sum_flex_grow);
}
} else if free_space < 0.0 && shrinking && sum_flex_shrink > 0.0 {
- let sum_scaled_shrink_factor: f32 = unfrozen
- .iter()
- .map(|child| child.inner_flex_basis * child.node.flex_shrink)
- .sum();
+ let sum_scaled_shrink_factor: f32 =
+ unfrozen.iter().map(|child| child.inner_flex_basis * child.node.flex_shrink).sum();
for child in &mut unfrozen {
let scaled_shrink_factor = child.inner_flex_basis * child.node.flex_shrink;
- child.target_main_size = child.flex_basis
- + free_space * (scaled_shrink_factor / sum_scaled_shrink_factor);
+ child.target_main_size =
+ child.flex_basis + free_space * (scaled_shrink_factor / sum_scaled_shrink_factor);
println!("child.flex_basis: {}, scaled_shrink_factor: {}, sum_scaled_shrink_factor: {}, child.inner_flex_basis: {}", child.flex_basis, scaled_shrink_factor, sum_scaled_shrink_factor, child.inner_flex_basis);
}
@@ -635,15 +514,8 @@ fn compute_internal(
let mut total_violation = 0.0;
for child in &mut unfrozen {
- let max = child
- .node
- .max_main_size(node.flex_direction)
- .resolve(avaliable_main, f32::MAX);
- let min = child
- .node
- .min_main_size(node.flex_direction)
- .resolve(avaliable_main, f32::MIN)
- .max(0.0);
+ let max = child.node.max_main_size(node.flex_direction).resolve(avaliable_main, f32::MAX);
+ let min = child.node.min_main_size(node.flex_direction).resolve(avaliable_main, f32::MIN).max(0.0);
let clamped = if child.target_main_size > max {
max
@@ -687,25 +559,17 @@ fn compute_internal(
// Not part of the spec from what i can see but seems correct
let container_main_size = if intrinsic_main_size.is_finite() {
- intrinsic_main_size
- .min(main_constraint.max)
- .max(main_constraint.min)
+ intrinsic_main_size.min(main_constraint.max).max(main_constraint.min)
} else {
let mut longest_line = f32::MIN;
for line in &flex_lines {
let length: f32 = line.items.iter().map(|item| item.target_main_size).sum();
- longest_line = if length > longest_line {
- length
- } else {
- longest_line
- };
+ longest_line = if length > longest_line { length } else { longest_line };
}
- (longest_line + padding_main + border_main)
- .min(main_constraint.max)
- .max(main_constraint.min)
+ (longest_line + padding_main + border_main).min(main_constraint.max).max(main_constraint.min)
};
// 9.4. Cross Size Determination
@@ -731,27 +595,13 @@ fn compute_internal(
child.hypothetical_inner_cross_size = size
.cross(node.flex_direction)
- .max(
- child
- .node
- .min_cross_size(node.flex_direction)
- .resolve(avaliable_cross, f32::MIN),
- ).min(
- child
- .node
- .max_cross_size(node.flex_direction)
- .resolve(avaliable_cross, f32::MAX),
- ).max(0.0);
+ .max(child.node.min_cross_size(node.flex_direction).resolve(avaliable_cross, f32::MIN))
+ .min(child.node.max_cross_size(node.flex_direction).resolve(avaliable_cross, f32::MAX))
+ .max(0.0);
child.hypothetical_outer_cross_size = child.hypothetical_inner_cross_size
- + child
- .node
- .cross_margin_start(node.flex_direction)
- .resolve(avaliable_cross, 0.0)
- + child
- .node
- .cross_margin_end(node.flex_direction)
- .resolve(avaliable_cross, 0.0);
+ + child.node.cross_margin_start(node.flex_direction).resolve(avaliable_cross, 0.0)
+ + child.node.cross_margin_end(node.flex_direction).resolve(avaliable_cross, 0.0);
}
}
@@ -774,18 +624,13 @@ fn compute_internal(
// of min/max-width/height applied more generally, this behavior would fall out automatically.
if flex_lines.len() == 1 && intrinsic_cross_size.is_finite() {
- flex_lines[0].cross_size = inner_intrinsic_cross_size
- .min(cross_constraint.max)
- .max(cross_constraint.min);
+ flex_lines[0].cross_size = inner_intrinsic_cross_size.min(cross_constraint.max).max(cross_constraint.min);
} else {
for line in &mut flex_lines {
// TODO handle baseline (1)
- line.cross_size = line
- .items
- .iter()
- .map(|child| child.hypothetical_outer_cross_size)
- .fold(0.0, |acc, x| acc.max(x));
+ line.cross_size =
+ line.items.iter().map(|child| child.hypothetical_outer_cross_size).fold(0.0, |acc, x| acc.max(x));
}
}
@@ -846,17 +691,8 @@ fn compute_internal(
{
child.target_cross_size = line
.cross_size
- .min(
- child
- .node
- .max_cross_size(node.flex_direction)
- .resolve(avaliable_cross, f32::MAX),
- ).max(
- child
- .node
- .min_cross_size(node.flex_direction)
- .resolve(avaliable_cross, f32::MIN),
- );
+ .min(child.node.max_cross_size(node.flex_direction).resolve(avaliable_cross, f32::MAX))
+ .max(child.node.min_cross_size(node.flex_direction).resolve(avaliable_cross, f32::MIN));
} else {
child.target_cross_size = child.hypothetical_inner_cross_size;
}
@@ -920,14 +756,10 @@ fn compute_internal(
let mut is_first = true;
for child in &mut line.items {
- child.main_margin_start = child
- .node
- .main_margin_start(node.flex_direction)
- .resolve(container_main_size, 0.0);
- child.main_margin_end = child
- .node
- .main_margin_end(node.flex_direction)
- .resolve(container_main_size, 0.0);
+ child.main_margin_start =
+ child.node.main_margin_start(node.flex_direction).resolve(container_main_size, 0.0);
+ child.main_margin_end =
+ child.node.main_margin_end(node.flex_direction).resolve(container_main_size, 0.0);
child.offset_main = match node.justify_content {
style::JustifyContent::FlexStart => 0.0,
@@ -980,22 +812,15 @@ fn compute_internal(
{
child.cross_margin_start = free_space / 2.0;
child.cross_margin_end = free_space / 2.0;
- } else if child.node.cross_margin_start(node.flex_direction)
- == style::Dimension::Auto
- {
+ } else if child.node.cross_margin_start(node.flex_direction) == style::Dimension::Auto {
child.cross_margin_start = free_space;
- } else if child.node.cross_margin_end(node.flex_direction) == style::Dimension::Auto
- {
+ } else if child.node.cross_margin_end(node.flex_direction) == style::Dimension::Auto {
child.cross_margin_end = free_space;
} else {
- child.cross_margin_start = child
- .node
- .cross_margin_start(node.flex_direction)
- .resolve(line.cross_size, 0.0);
- child.cross_margin_end = child
- .node
- .cross_margin_end(node.flex_direction)
- .resolve(line.cross_size, 0.0);
+ child.cross_margin_start =
+ child.node.cross_margin_start(node.flex_direction).resolve(line.cross_size, 0.0);
+ child.cross_margin_end =
+ child.node.cross_margin_end(node.flex_direction).resolve(line.cross_size, 0.0);
// 14. Align all flex items along the cross-axis per align-self, if neither of the item’s
// cross-axis margins are auto.
@@ -1021,13 +846,9 @@ fn compute_internal(
let total_cross_size: f32 = flex_lines.iter().map(|line| line.cross_size).sum();
let container_cross_size = if intrinsic_cross_size.is_finite() {
- intrinsic_cross_size
- .min(cross_constraint.max)
- .max(cross_constraint.min)
+ intrinsic_cross_size.min(cross_constraint.max).max(cross_constraint.min)
} else {
- (total_cross_size + padding_cross + border_cross)
- .min(cross_constraint.max)
- .max(cross_constraint.min)
+ (total_cross_size + padding_cross + border_cross).min(cross_constraint.max).max(cross_constraint.min)
};
// 16. Align all flex lines per align-content.
@@ -1090,14 +911,8 @@ fn compute_internal(
total_offset_main
+ child.offset_main
+ child.main_margin_start
- + (child
- .node
- .main_start(node.flex_direction)
- .resolve(container_main_size, 0.0)
- - child
- .node
- .main_end(node.flex_direction)
- .resolve(container_main_size, 0.0))
+ + (child.node.main_start(node.flex_direction).resolve(container_main_size, 0.0)
+ - child.node.main_end(node.flex_direction).resolve(container_main_size, 0.0))
};
let offset_cross = {
@@ -1105,34 +920,19 @@ fn compute_internal(
+ child.offset_cross
+ line.offset_cross
+ child.cross_margin_start
- + (child
- .node
- .cross_start(node.flex_direction)
- .resolve(container_main_size, 0.0)
- - child
- .node
- .cross_end(node.flex_direction)
- .resolve(container_main_size, 0.0))
+ + (child.node.cross_start(node.flex_direction).resolve(container_main_size, 0.0)
+ - child.node.cross_end(node.flex_direction).resolve(container_main_size, 0.0))
};
children.push(layout::Node {
width: result.size.width,
height: result.size.height,
- x: if node.flex_direction.is_row() {
- offset_main
- } else {
- offset_cross
- },
- y: if node.flex_direction.is_column() {
- offset_main
- } else {
- offset_cross
- },
+ x: if node.flex_direction.is_row() { offset_main } else { offset_cross },
+ y: if node.flex_direction.is_column() { offset_main } else { offset_cross },
children: result.children,
});
- total_offset_main =
- offset_main + result.size.main(node.flex_direction) + child.main_margin_end;
+ total_offset_main = offset_main + result.size.main(node.flex_direction) + child.main_margin_end;
}
total_offset_cross += line.offset_cross + line.cross_size;
@@ -1140,17 +940,9 @@ fn compute_internal(
ComputeResult {
size: FlexSize {
- width: if node.flex_direction.is_row() {
- container_main_size
- } else {
- container_cross_size
- },
- height: if node.flex_direction.is_column() {
- container_main_size
- } else {
- container_cross_size
- },
+ width: if node.flex_direction.is_row() { container_main_size } else { container_cross_size },
+ height: if node.flex_direction.is_column() { container_main_size } else { container_cross_size },
},
- children: children,
+ children,
}
}
diff --git a/tests/generated.rs b/tests/generated.rs
index 526b4de67..45c700a4f 100644
--- a/tests/generated.rs
+++ b/tests/generated.rs
@@ -7,18 +7,9 @@ mod generated {
width: stretch::style::Dimension::Points(100.0),
height: stretch::style::Dimension::Points(100.0),
children: vec![
- stretch::style::Node {
- width: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- width: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- width: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
+ stretch::style::Node { width: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { width: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { width: stretch::style::Dimension::Points(10.0), ..Default::default() },
],
..Default::default()
});
@@ -507,11 +498,7 @@ mod generated {
children: vec![stretch::style::Node {
flex_grow: 1.0,
flex_shrink: 1.0,
- children: vec![stretch::style::Node {
- flex_grow: 1.0,
- flex_shrink: 1.0,
- ..Default::default()
- }],
+ children: vec![stretch::style::Node { flex_grow: 1.0, flex_shrink: 1.0, ..Default::default() }],
..Default::default()
}],
..Default::default()
@@ -568,14 +555,8 @@ mod generated {
width: stretch::style::Dimension::Points(150.0),
height: stretch::style::Dimension::Points(100.0),
children: vec![
- stretch::style::Node {
- width: stretch::style::Dimension::Points(50.0),
- ..Default::default()
- },
- stretch::style::Node {
- width: stretch::style::Dimension::Points(50.0),
- ..Default::default()
- },
+ stretch::style::Node { width: stretch::style::Dimension::Points(50.0), ..Default::default() },
+ stretch::style::Node { width: stretch::style::Dimension::Points(50.0), ..Default::default() },
],
..Default::default()
});
@@ -603,18 +584,9 @@ mod generated {
width: stretch::style::Dimension::Points(100.0),
height: stretch::style::Dimension::Points(100.0),
children: vec![
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
],
..Default::default()
});
@@ -757,18 +729,9 @@ mod generated {
width: stretch::style::Dimension::Points(100.0),
height: stretch::style::Dimension::Points(100.0),
children: vec![
- stretch::style::Node {
- width: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- width: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- width: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
+ stretch::style::Node { width: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { width: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { width: stretch::style::Dimension::Points(10.0), ..Default::default() },
],
..Default::default()
});
@@ -895,14 +858,8 @@ mod generated {
width: stretch::style::Dimension::Points(100.0),
height: stretch::style::Dimension::Points(100.0),
children: vec![
- stretch::style::Node {
- flex_basis: stretch::style::Dimension::Points(100.0),
- ..Default::default()
- },
- stretch::style::Node {
- flex_basis: stretch::style::Dimension::Points(50.0),
- ..Default::default()
- },
+ stretch::style::Node { flex_basis: stretch::style::Dimension::Points(100.0), ..Default::default() },
+ stretch::style::Node { flex_basis: stretch::style::Dimension::Points(50.0), ..Default::default() },
],
..Default::default()
});
@@ -1071,18 +1028,9 @@ mod generated {
width: stretch::style::Dimension::Points(100.0),
height: stretch::style::Dimension::Points(100.0),
children: vec![
- stretch::style::Node {
- width: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- width: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- width: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
+ stretch::style::Node { width: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { width: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { width: stretch::style::Dimension::Points(10.0), ..Default::default() },
],
..Default::default()
});
@@ -1126,10 +1074,7 @@ mod generated {
flex_basis: stretch::style::Dimension::Points(200.0),
..Default::default()
},
- stretch::style::Node {
- height: stretch::style::Dimension::Points(100.0),
- ..Default::default()
- },
+ stretch::style::Node { height: stretch::style::Dimension::Points(100.0), ..Default::default() },
],
..Default::default()
}],
@@ -1162,9 +1107,7 @@ mod generated {
let layout = stretch::compute(&stretch::style::Node {
width: stretch::style::Dimension::Points(100.0),
height: stretch::style::Dimension::Points(100.0),
- children: vec![stretch::style::Node {
- ..Default::default()
- }],
+ children: vec![stretch::style::Node { ..Default::default() }],
..Default::default()
});
@@ -1185,14 +1128,8 @@ mod generated {
min_width: stretch::style::Dimension::Points(100.0),
height: stretch::style::Dimension::Points(100.0),
children: vec![
- stretch::style::Node {
- flex_grow: 1.0,
- ..Default::default()
- },
- stretch::style::Node {
- width: stretch::style::Dimension::Points(50.0),
- ..Default::default()
- },
+ stretch::style::Node { flex_grow: 1.0, ..Default::default() },
+ stretch::style::Node { width: stretch::style::Dimension::Points(50.0), ..Default::default() },
],
..Default::default()
});
@@ -1274,15 +1211,8 @@ mod generated {
min_height: stretch::style::Dimension::Points(100.0),
max_height: stretch::style::Dimension::Points(500.0),
children: vec![
- stretch::style::Node {
- flex_grow: 1.0,
- flex_shrink: 1.0,
- ..Default::default()
- },
- stretch::style::Node {
- height: stretch::style::Dimension::Points(50.0),
- ..Default::default()
- },
+ stretch::style::Node { flex_grow: 1.0, flex_shrink: 1.0, ..Default::default() },
+ stretch::style::Node { height: stretch::style::Dimension::Points(50.0), ..Default::default() },
],
..Default::default()
});
@@ -1343,10 +1273,7 @@ mod generated {
min_height: stretch::style::Dimension::Points(60.0),
..Default::default()
},
- stretch::style::Node {
- flex_grow: 1.0,
- ..Default::default()
- },
+ stretch::style::Node { flex_grow: 1.0, ..Default::default() },
],
..Default::default()
});
@@ -1374,18 +1301,9 @@ mod generated {
width: stretch::style::Dimension::Points(100.0),
height: stretch::style::Dimension::Points(100.0),
children: vec![
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
],
..Default::default()
});
@@ -1446,10 +1364,7 @@ mod generated {
width: stretch::style::Dimension::Points(100.0),
max_width: stretch::style::Dimension::Points(100.0),
height: stretch::style::Dimension::Points(100.0),
- margin: stretch::style::Edges {
- start: stretch::style::Dimension::Points(20.0),
- ..Default::default()
- },
+ margin: stretch::style::Edges { start: stretch::style::Dimension::Points(20.0), ..Default::default() },
..Default::default()
}],
..Default::default()
@@ -1505,10 +1420,7 @@ mod generated {
height: stretch::style::Dimension::Points(100.0),
children: vec![stretch::style::Node {
width: stretch::style::Dimension::Points(10.0),
- margin: stretch::style::Edges {
- end: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
+ margin: stretch::style::Edges { end: stretch::style::Dimension::Points(10.0), ..Default::default() },
..Default::default()
}],
..Default::default()
@@ -1535,11 +1447,7 @@ mod generated {
children: vec![stretch::style::Node {
flex_grow: 1.0,
flex_shrink: 1.0,
- children: vec![stretch::style::Node {
- flex_grow: 1.0,
- flex_shrink: 1.0,
- ..Default::default()
- }],
+ children: vec![stretch::style::Node { flex_grow: 1.0, flex_shrink: 1.0, ..Default::default() }],
..Default::default()
}],
..Default::default()
@@ -1769,14 +1677,8 @@ mod generated {
width: stretch::style::Dimension::Points(100.0),
height: stretch::style::Dimension::Points(100.0),
children: vec![
- stretch::style::Node {
- flex_basis: stretch::style::Dimension::Points(100.0),
- ..Default::default()
- },
- stretch::style::Node {
- flex_basis: stretch::style::Dimension::Points(50.0),
- ..Default::default()
- },
+ stretch::style::Node { flex_basis: stretch::style::Dimension::Points(100.0), ..Default::default() },
+ stretch::style::Node { flex_basis: stretch::style::Dimension::Points(50.0), ..Default::default() },
],
..Default::default()
});
@@ -1829,10 +1731,7 @@ mod generated {
let layout = stretch::compute(&stretch::style::Node {
justify_content: stretch::style::JustifyContent::Center,
min_width: stretch::style::Dimension::Points(50.0),
- margin: stretch::style::Edges {
- start: stretch::style::Dimension::Points(100.0),
- ..Default::default()
- },
+ margin: stretch::style::Edges { start: stretch::style::Dimension::Points(100.0), ..Default::default() },
children: vec![stretch::style::Node {
width: stretch::style::Dimension::Points(20.0),
height: stretch::style::Dimension::Points(20.0),
@@ -2168,14 +2067,8 @@ mod generated {
flex_direction: stretch::style::FlexDirection::Column,
min_height: stretch::style::Dimension::Points(100.0),
children: vec![
- stretch::style::Node {
- flex_grow: 1.0,
- ..Default::default()
- },
- stretch::style::Node {
- height: stretch::style::Dimension::Points(50.0),
- ..Default::default()
- },
+ stretch::style::Node { flex_grow: 1.0, ..Default::default() },
+ stretch::style::Node { height: stretch::style::Dimension::Points(50.0), ..Default::default() },
],
..Default::default()
});
@@ -2239,10 +2132,7 @@ mod generated {
stretch::style::Node {
width: stretch::style::Dimension::Points(50.0),
height: stretch::style::Dimension::Points(50.0),
- margin: stretch::style::Edges {
- start: stretch::style::Dimension::Auto,
- ..Default::default()
- },
+ margin: stretch::style::Edges { start: stretch::style::Dimension::Auto, ..Default::default() },
..Default::default()
},
stretch::style::Node {
@@ -2346,10 +2236,7 @@ mod generated {
flex_basis: stretch::style::Dimension::Points(50.0),
..Default::default()
},
- stretch::style::Node {
- flex_grow: 1.0,
- ..Default::default()
- },
+ stretch::style::Node { flex_grow: 1.0, ..Default::default() },
],
..Default::default()
});
@@ -2403,18 +2290,9 @@ mod generated {
width: stretch::style::Dimension::Points(100.0),
height: stretch::style::Dimension::Points(100.0),
children: vec![
- stretch::style::Node {
- width: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- width: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- width: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
+ stretch::style::Node { width: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { width: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { width: stretch::style::Dimension::Points(10.0), ..Default::default() },
],
..Default::default()
});
@@ -2569,10 +2447,7 @@ mod generated {
flex_grow: 1.0,
flex_shrink: 1.0,
flex_basis: stretch::style::Dimension::Percent(0.0),
- margin: stretch::style::Edges {
- start: stretch::style::Dimension::Auto,
- ..Default::default()
- },
+ margin: stretch::style::Edges { start: stretch::style::Dimension::Auto, ..Default::default() },
..Default::default()
},
stretch::style::Node {
@@ -2836,18 +2711,9 @@ mod generated {
width: stretch::style::Dimension::Points(100.0),
height: stretch::style::Dimension::Points(100.0),
children: vec![
- stretch::style::Node {
- width: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- width: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- width: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
+ stretch::style::Node { width: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { width: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { width: stretch::style::Dimension::Points(10.0), ..Default::default() },
],
..Default::default()
});
@@ -2882,10 +2748,7 @@ mod generated {
height: stretch::style::Dimension::Points(100.0),
children: vec![stretch::style::Node {
height: stretch::style::Dimension::Points(10.0),
- margin: stretch::style::Edges {
- bottom: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
+ margin: stretch::style::Edges { bottom: stretch::style::Dimension::Points(10.0), ..Default::default() },
..Default::default()
}],
..Default::default()
@@ -2911,10 +2774,7 @@ mod generated {
width: stretch::style::Dimension::Points(100.0),
height: stretch::style::Dimension::Points(100.0),
max_height: stretch::style::Dimension::Points(100.0),
- margin: stretch::style::Edges {
- top: stretch::style::Dimension::Points(20.0),
- ..Default::default()
- },
+ margin: stretch::style::Edges { top: stretch::style::Dimension::Points(20.0), ..Default::default() },
..Default::default()
}],
..Default::default()
@@ -3056,18 +2916,9 @@ mod generated {
width: stretch::style::Dimension::Points(100.0),
height: stretch::style::Dimension::Points(100.0),
children: vec![
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
],
..Default::default()
});
@@ -3168,19 +3019,13 @@ mod generated {
stretch::style::Node {
width: stretch::style::Dimension::Points(50.0),
height: stretch::style::Dimension::Points(50.0),
- margin: stretch::style::Edges {
- top: stretch::style::Dimension::Auto,
- ..Default::default()
- },
+ margin: stretch::style::Edges { top: stretch::style::Dimension::Auto, ..Default::default() },
..Default::default()
},
stretch::style::Node {
width: stretch::style::Dimension::Points(50.0),
height: stretch::style::Dimension::Points(50.0),
- margin: stretch::style::Edges {
- top: stretch::style::Dimension::Auto,
- ..Default::default()
- },
+ margin: stretch::style::Edges { top: stretch::style::Dimension::Auto, ..Default::default() },
..Default::default()
},
stretch::style::Node {
@@ -3400,10 +3245,7 @@ mod generated {
},
..Default::default()
},
- stretch::style::Node {
- flex_grow: 1.0,
- ..Default::default()
- },
+ stretch::style::Node { flex_grow: 1.0, ..Default::default() },
],
..Default::default()
});
@@ -3499,10 +3341,7 @@ mod generated {
children: vec![stretch::style::Node {
width: stretch::style::Dimension::Points(10.0),
height: stretch::style::Dimension::Points(10.0),
- margin: stretch::style::Edges {
- top: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
+ margin: stretch::style::Edges { top: stretch::style::Dimension::Points(10.0), ..Default::default() },
..Default::default()
}],
..Default::default()
@@ -3526,18 +3365,9 @@ mod generated {
width: stretch::style::Dimension::Points(100.0),
height: stretch::style::Dimension::Points(100.0),
children: vec![
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
],
..Default::default()
});
@@ -3570,18 +3400,9 @@ mod generated {
width: stretch::style::Dimension::Points(100.0),
height: stretch::style::Dimension::Points(100.0),
children: vec![
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
],
..Default::default()
});
@@ -3971,18 +3792,9 @@ mod generated {
width: stretch::style::Dimension::Points(100.0),
height: stretch::style::Dimension::Points(100.0),
children: vec![
- stretch::style::Node {
- width: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- width: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- width: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
+ stretch::style::Node { width: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { width: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { width: stretch::style::Dimension::Points(10.0), ..Default::default() },
],
..Default::default()
});
@@ -4083,10 +3895,7 @@ mod generated {
stretch::style::Node {
width: stretch::style::Dimension::Points(50.0),
height: stretch::style::Dimension::Points(50.0),
- margin: stretch::style::Edges {
- top: stretch::style::Dimension::Auto,
- ..Default::default()
- },
+ margin: stretch::style::Edges { top: stretch::style::Dimension::Auto, ..Default::default() },
..Default::default()
},
stretch::style::Node {
@@ -4128,10 +3937,7 @@ mod generated {
flex_basis: stretch::style::Dimension::Points(100.0),
..Default::default()
},
- stretch::style::Node {
- width: stretch::style::Dimension::Points(50.0),
- ..Default::default()
- },
+ stretch::style::Node { width: stretch::style::Dimension::Points(50.0), ..Default::default() },
],
..Default::default()
}],
@@ -4220,10 +4026,7 @@ mod generated {
children: vec![stretch::style::Node {
width: stretch::style::Dimension::Points(72.0),
height: stretch::style::Dimension::Points(72.0),
- margin: stretch::style::Edges {
- start: stretch::style::Dimension::Auto,
- ..Default::default()
- },
+ margin: stretch::style::Edges { start: stretch::style::Dimension::Auto, ..Default::default() },
..Default::default()
}],
..Default::default()
@@ -4579,10 +4382,7 @@ mod generated {
align_items: stretch::style::AlignItems::Center,
width: stretch::style::Dimension::Points(100.0),
height: stretch::style::Dimension::Points(100.0),
- margin: stretch::style::Edges {
- top: stretch::style::Dimension::Points(20.0),
- ..Default::default()
- },
+ margin: stretch::style::Edges { top: stretch::style::Dimension::Points(20.0), ..Default::default() },
children: vec![stretch::style::Node {
justify_content: stretch::style::JustifyContent::Center,
flex_grow: 0.0,
@@ -4633,10 +4433,7 @@ mod generated {
stretch::style::Node {
width: stretch::style::Dimension::Points(50.0),
height: stretch::style::Dimension::Points(50.0),
- margin: stretch::style::Edges {
- end: stretch::style::Dimension::Auto,
- ..Default::default()
- },
+ margin: stretch::style::Edges { end: stretch::style::Dimension::Auto, ..Default::default() },
..Default::default()
},
stretch::style::Node {
@@ -4764,10 +4561,7 @@ mod generated {
},
..Default::default()
},
- stretch::style::Node {
- flex_grow: 1.0,
- ..Default::default()
- },
+ stretch::style::Node { flex_grow: 1.0, ..Default::default() },
],
..Default::default()
});
@@ -4793,18 +4587,9 @@ mod generated {
let layout = stretch::compute(&stretch::style::Node {
height: stretch::style::Dimension::Points(100.0),
children: vec![
- stretch::style::Node {
- width: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- width: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- width: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
+ stretch::style::Node { width: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { width: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { width: stretch::style::Dimension::Points(10.0), ..Default::default() },
],
..Default::default()
});
@@ -4891,18 +4676,9 @@ mod generated {
flex_direction: stretch::style::FlexDirection::Column,
width: stretch::style::Dimension::Points(100.0),
children: vec![
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
],
..Default::default()
});
@@ -5033,10 +4809,7 @@ mod generated {
min_width: stretch::style::Dimension::Points(60.0),
..Default::default()
},
- stretch::style::Node {
- flex_grow: 1.0,
- ..Default::default()
- },
+ stretch::style::Node { flex_grow: 1.0, ..Default::default() },
],
..Default::default()
});
@@ -5329,10 +5102,7 @@ mod generated {
justify_content: stretch::style::JustifyContent::Center,
width: stretch::style::Dimension::Points(100.0),
max_width: stretch::style::Dimension::Points(80.0),
- margin: stretch::style::Edges {
- start: stretch::style::Dimension::Points(100.0),
- ..Default::default()
- },
+ margin: stretch::style::Edges { start: stretch::style::Dimension::Points(100.0), ..Default::default() },
children: vec![stretch::style::Node {
width: stretch::style::Dimension::Points(20.0),
height: stretch::style::Dimension::Points(20.0),
@@ -5359,10 +5129,7 @@ mod generated {
height: stretch::style::Dimension::Points(100.0),
children: vec![stretch::style::Node {
width: stretch::style::Dimension::Points(10.0),
- margin: stretch::style::Edges {
- start: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
+ margin: stretch::style::Edges { start: stretch::style::Dimension::Points(10.0), ..Default::default() },
..Default::default()
}],
..Default::default()
@@ -5510,10 +5277,7 @@ mod generated {
width: stretch::style::Dimension::Points(350.0),
height: stretch::style::Dimension::Points(100.0),
children: vec![
- stretch::style::Node {
- width: stretch::style::Dimension::Points(100.0),
- ..Default::default()
- },
+ stretch::style::Node { width: stretch::style::Dimension::Points(100.0), ..Default::default() },
stretch::style::Node {
flex_direction: stretch::style::FlexDirection::Column,
flex_grow: 1.0,
@@ -5523,10 +5287,7 @@ mod generated {
}],
..Default::default()
},
- stretch::style::Node {
- width: stretch::style::Dimension::Points(100.0),
- ..Default::default()
- },
+ stretch::style::Node { width: stretch::style::Dimension::Points(100.0), ..Default::default() },
],
..Default::default()
});
@@ -5593,10 +5354,7 @@ mod generated {
height: stretch::style::Dimension::Points(100.0),
children: vec![stretch::style::Node {
height: stretch::style::Dimension::Points(10.0),
- margin: stretch::style::Edges {
- top: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
+ margin: stretch::style::Edges { top: stretch::style::Dimension::Points(10.0), ..Default::default() },
..Default::default()
}],
..Default::default()
@@ -5821,10 +5579,7 @@ mod generated {
justify_content: stretch::style::JustifyContent::Center,
height: stretch::style::Dimension::Points(100.0),
max_height: stretch::style::Dimension::Points(80.0),
- margin: stretch::style::Edges {
- top: stretch::style::Dimension::Points(100.0),
- ..Default::default()
- },
+ margin: stretch::style::Edges { top: stretch::style::Dimension::Points(100.0), ..Default::default() },
children: vec![stretch::style::Node {
width: stretch::style::Dimension::Points(20.0),
height: stretch::style::Dimension::Points(20.0),
@@ -5856,10 +5611,7 @@ mod generated {
flex_basis: stretch::style::Dimension::Points(50.0),
..Default::default()
},
- stretch::style::Node {
- flex_grow: 1.0,
- ..Default::default()
- },
+ stretch::style::Node { flex_grow: 1.0, ..Default::default() },
],
..Default::default()
});
@@ -5996,18 +5748,9 @@ mod generated {
width: stretch::style::Dimension::Points(100.0),
height: stretch::style::Dimension::Points(100.0),
children: vec![
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
],
..Default::default()
});
@@ -6045,10 +5788,7 @@ mod generated {
flex_basis: stretch::style::Dimension::Points(100.0),
..Default::default()
},
- stretch::style::Node {
- height: stretch::style::Dimension::Points(50.0),
- ..Default::default()
- },
+ stretch::style::Node { height: stretch::style::Dimension::Points(50.0), ..Default::default() },
],
..Default::default()
});
@@ -6077,18 +5817,9 @@ mod generated {
width: stretch::style::Dimension::Points(100.0),
height: stretch::style::Dimension::Points(100.0),
children: vec![
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
],
..Default::default()
});
@@ -6190,10 +5921,7 @@ mod generated {
stretch::style::Node {
width: stretch::style::Dimension::Points(50.0),
height: stretch::style::Dimension::Points(50.0),
- margin: stretch::style::Edges {
- bottom: stretch::style::Dimension::Auto,
- ..Default::default()
- },
+ margin: stretch::style::Edges { bottom: stretch::style::Dimension::Auto, ..Default::default() },
..Default::default()
},
stretch::style::Node {
@@ -6227,11 +5955,7 @@ mod generated {
width: stretch::style::Dimension::Points(100.0),
height: stretch::style::Dimension::Points(100.0),
children: vec![stretch::style::Node {
- children: vec![stretch::style::Node {
- flex_grow: 1.0,
- flex_shrink: 1.0,
- ..Default::default()
- }],
+ children: vec![stretch::style::Node { flex_grow: 1.0, flex_shrink: 1.0, ..Default::default() }],
..Default::default()
}],
..Default::default()
@@ -6353,19 +6077,13 @@ mod generated {
stretch::style::Node {
width: stretch::style::Dimension::Points(50.0),
height: stretch::style::Dimension::Points(50.0),
- margin: stretch::style::Edges {
- end: stretch::style::Dimension::Auto,
- ..Default::default()
- },
+ margin: stretch::style::Edges { end: stretch::style::Dimension::Auto, ..Default::default() },
..Default::default()
},
stretch::style::Node {
width: stretch::style::Dimension::Points(50.0),
height: stretch::style::Dimension::Points(50.0),
- margin: stretch::style::Edges {
- end: stretch::style::Dimension::Auto,
- ..Default::default()
- },
+ margin: stretch::style::Edges { end: stretch::style::Dimension::Auto, ..Default::default() },
..Default::default()
},
stretch::style::Node {
@@ -6571,18 +6289,9 @@ mod generated {
width: stretch::style::Dimension::Points(100.0),
height: stretch::style::Dimension::Points(100.0),
children: vec![
- stretch::style::Node {
- width: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- width: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- width: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
+ stretch::style::Node { width: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { width: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { width: stretch::style::Dimension::Points(10.0), ..Default::default() },
],
..Default::default()
});
@@ -6823,16 +6532,8 @@ mod generated {
flex_basis: stretch::style::Dimension::Points(40.0),
..Default::default()
},
- stretch::style::Node {
- flex_grow: 0.2,
- flex_shrink: 0.0,
- ..Default::default()
- },
- stretch::style::Node {
- flex_grow: 0.4,
- flex_shrink: 0.0,
- ..Default::default()
- },
+ stretch::style::Node { flex_grow: 0.2, flex_shrink: 0.0, ..Default::default() },
+ stretch::style::Node { flex_grow: 0.4, flex_shrink: 0.0, ..Default::default() },
],
..Default::default()
});
@@ -6863,14 +6564,8 @@ mod generated {
let layout = stretch::compute(&stretch::style::Node {
min_height: stretch::style::Dimension::Points(100.0),
children: vec![
- stretch::style::Node {
- flex_grow: 1.0,
- ..Default::default()
- },
- stretch::style::Node {
- height: stretch::style::Dimension::Points(50.0),
- ..Default::default()
- },
+ stretch::style::Node { flex_grow: 1.0, ..Default::default() },
+ stretch::style::Node { height: stretch::style::Dimension::Points(50.0), ..Default::default() },
],
..Default::default()
});
@@ -6938,18 +6633,9 @@ mod generated {
width: stretch::style::Dimension::Points(100.0),
height: stretch::style::Dimension::Points(100.0),
children: vec![
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
],
..Default::default()
});
@@ -6981,18 +6667,9 @@ mod generated {
width: stretch::style::Dimension::Points(100.0),
height: stretch::style::Dimension::Points(100.0),
children: vec![
- stretch::style::Node {
- flex_grow: 1.0,
- ..Default::default()
- },
- stretch::style::Node {
- flex_grow: 1.0,
- ..Default::default()
- },
- stretch::style::Node {
- flex_grow: 1.0,
- ..Default::default()
- },
+ stretch::style::Node { flex_grow: 1.0, ..Default::default() },
+ stretch::style::Node { flex_grow: 1.0, ..Default::default() },
+ stretch::style::Node { flex_grow: 1.0, ..Default::default() },
],
..Default::default()
});
@@ -7187,14 +6864,8 @@ mod generated {
flex_basis: stretch::style::Dimension::Points(100.0),
..Default::default()
},
- stretch::style::Node {
- flex_basis: stretch::style::Dimension::Points(25.0),
- ..Default::default()
- },
- stretch::style::Node {
- flex_basis: stretch::style::Dimension::Points(25.0),
- ..Default::default()
- },
+ stretch::style::Node { flex_basis: stretch::style::Dimension::Points(25.0), ..Default::default() },
+ stretch::style::Node { flex_basis: stretch::style::Dimension::Points(25.0), ..Default::default() },
],
..Default::default()
});
@@ -7301,26 +6972,11 @@ mod generated {
width: stretch::style::Dimension::Points(113.0),
height: stretch::style::Dimension::Points(100.0),
children: vec![
- stretch::style::Node {
- flex_grow: 1.0,
- ..Default::default()
- },
- stretch::style::Node {
- flex_grow: 1.0,
- ..Default::default()
- },
- stretch::style::Node {
- flex_grow: 1.0,
- ..Default::default()
- },
- stretch::style::Node {
- flex_grow: 1.0,
- ..Default::default()
- },
- stretch::style::Node {
- flex_grow: 1.0,
- ..Default::default()
- },
+ stretch::style::Node { flex_grow: 1.0, ..Default::default() },
+ stretch::style::Node { flex_grow: 1.0, ..Default::default() },
+ stretch::style::Node { flex_grow: 1.0, ..Default::default() },
+ stretch::style::Node { flex_grow: 1.0, ..Default::default() },
+ stretch::style::Node { flex_grow: 1.0, ..Default::default() },
],
..Default::default()
});
@@ -7456,10 +7112,7 @@ mod generated {
flex_basis: stretch::style::Dimension::Points(200.0),
..Default::default()
},
- stretch::style::Node {
- height: stretch::style::Dimension::Points(100.0),
- ..Default::default()
- },
+ stretch::style::Node { height: stretch::style::Dimension::Points(100.0), ..Default::default() },
],
..Default::default()
}],
@@ -7569,14 +7222,8 @@ mod generated {
height: stretch::style::Dimension::Points(50.0),
start: stretch::style::Dimension::Percent(0.5),
children: vec![
- stretch::style::Node {
- width: stretch::style::Dimension::Percent(1.0),
- ..Default::default()
- },
- stretch::style::Node {
- width: stretch::style::Dimension::Percent(1.0),
- ..Default::default()
- },
+ stretch::style::Node { width: stretch::style::Dimension::Percent(1.0), ..Default::default() },
+ stretch::style::Node { width: stretch::style::Dimension::Percent(1.0), ..Default::default() },
],
..Default::default()
}],
@@ -7617,10 +7264,7 @@ mod generated {
flex_basis: stretch::style::Dimension::Points(200.0),
..Default::default()
},
- stretch::style::Node {
- height: stretch::style::Dimension::Points(100.0),
- ..Default::default()
- },
+ stretch::style::Node { height: stretch::style::Dimension::Points(100.0), ..Default::default() },
],
..Default::default()
});
@@ -7649,18 +7293,9 @@ mod generated {
width: stretch::style::Dimension::Points(100.0),
height: stretch::style::Dimension::Points(100.0),
children: vec![
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
- stretch::style::Node {
- height: stretch::style::Dimension::Points(10.0),
- ..Default::default()
- },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
+ stretch::style::Node { height: stretch::style::Dimension::Points(10.0), ..Default::default() },
],
..Default::default()
});
@@ -7779,10 +7414,7 @@ mod generated {
flex_grow: 1.0,
flex_shrink: 1.0,
flex_basis: stretch::style::Dimension::Percent(0.0),
- margin: stretch::style::Edges {
- top: stretch::style::Dimension::Auto,
- ..Default::default()
- },
+ margin: stretch::style::Edges { top: stretch::style::Dimension::Auto, ..Default::default() },
..Default::default()
},
stretch::style::Node {
@@ -7816,10 +7448,7 @@ mod generated {
flex_direction: stretch::style::FlexDirection::Column,
justify_content: stretch::style::JustifyContent::Center,
min_height: stretch::style::Dimension::Points(50.0),
- margin: stretch::style::Edges {
- top: stretch::style::Dimension::Points(100.0),
- ..Default::default()
- },
+ margin: stretch::style::Edges { top: stretch::style::Dimension::Points(100.0), ..Default::default() },
children: vec![stretch::style::Node {
width: stretch::style::Dimension::Points(20.0),
height: stretch::style::Dimension::Points(20.0),
@@ -7849,11 +7478,7 @@ mod generated {
children: vec![stretch::style::Node {
flex_grow: 1.0,
flex_shrink: 1.0,
- children: vec![stretch::style::Node {
- flex_grow: 1.0,
- flex_shrink: 1.0,
- ..Default::default()
- }],
+ children: vec![stretch::style::Node { flex_grow: 1.0, flex_shrink: 1.0, ..Default::default() }],
..Default::default()
}],
..Default::default()
diff --git a/tests/manual.rs b/tests/manual.rs
index 6a4fa0e3a..5ec59cf73 100644
--- a/tests/manual.rs
+++ b/tests/manual.rs
@@ -38,16 +38,8 @@ mod tests {
height: stretch::style::Dimension::Points(100.0),
children: vec![
- stretch::style::Node {
- width: stretch::style::Dimension::Percent(0.5),
-
- ..Default::default()
- },
- stretch::style::Node {
- width: stretch::style::Dimension::Percent(0.5),
-
- ..Default::default()
- },
+ stretch::style::Node { width: stretch::style::Dimension::Percent(0.5), ..Default::default() },
+ stretch::style::Node { width: stretch::style::Dimension::Percent(0.5), ..Default::default() },
],
..Default::default()
@@ -77,11 +69,7 @@ mod tests {
..Default::default()
},
- stretch::style::Node {
- width: stretch::style::Dimension::Points(20.0),
-
- ..Default::default()
- },
+ stretch::style::Node { width: stretch::style::Dimension::Points(20.0), ..Default::default() },
],
..Default::default()
@@ -140,11 +128,7 @@ mod tests {
height: stretch::style::Dimension::Points(100.0),
children: vec![
- stretch::style::Node {
- width: stretch::style::Dimension::Points(50.0),
-
- ..Default::default()
- },
+ stretch::style::Node { width: stretch::style::Dimension::Points(50.0), ..Default::default() },
stretch::style::Node {
width: stretch::style::Dimension::Points(20.0),
margin: stretch::style::Edges {
@@ -183,16 +167,8 @@ mod tests {
},
children: vec![
- stretch::style::Node {
- width: stretch::style::Dimension::Points(40.0),
-
- ..Default::default()
- },
- stretch::style::Node {
- width: stretch::style::Dimension::Points(40.0),
-
- ..Default::default()
- },
+ stretch::style::Node { width: stretch::style::Dimension::Points(40.0), ..Default::default() },
+ stretch::style::Node { width: stretch::style::Dimension::Points(40.0), ..Default::default() },
],
..Default::default()
@@ -222,16 +198,8 @@ mod tests {
},
children: vec![
- stretch::style::Node {
- width: stretch::style::Dimension::Points(40.0),
-
- ..Default::default()
- },
- stretch::style::Node {
- width: stretch::style::Dimension::Points(40.0),
-
- ..Default::default()
- },
+ stretch::style::Node { width: stretch::style::Dimension::Points(40.0), ..Default::default() },
+ stretch::style::Node { width: stretch::style::Dimension::Points(40.0), ..Default::default() },
],
..Default::default()