Delta semántico · 5
benches/generated/gap_column_gap_percentage_flexible_with_padding.rs
tests/generated/gap_column_gap_percentage_flexible_with_padding.rs
diff --git a/benches/generated/gap_column_gap_percentage_flexible_with_padding.rs b/benches/generated/gap_column_gap_percentage_flexible_with_padding.rs
new file mode 100644
index 000000000..3b00d9009
--- /dev/null
+++ b/benches/generated/gap_column_gap_percentage_flexible_with_padding.rs
@@ -0,0 +1,52 @@
+pub fn compute() {
+ #[allow(unused_imports)]
+ use taffy::prelude::*;
+ let mut taffy = taffy::Taffy::new();
+ let node0 = taffy
+ .new_leaf(taffy::style::Style {
+ flex_grow: 1f32,
+ flex_shrink: 1f32,
+ flex_basis: taffy::style::Dimension::Percent(0f32),
+ ..Default::default()
+ })
+ .unwrap();
+ let node1 = taffy
+ .new_leaf(taffy::style::Style {
+ flex_grow: 1f32,
+ flex_shrink: 1f32,
+ flex_basis: taffy::style::Dimension::Percent(0f32),
+ ..Default::default()
+ })
+ .unwrap();
+ let node2 = taffy
+ .new_leaf(taffy::style::Style {
+ flex_grow: 1f32,
+ flex_shrink: 1f32,
+ flex_basis: taffy::style::Dimension::Percent(0f32),
+ ..Default::default()
+ })
+ .unwrap();
+ let node = taffy
+ .new_with_children(
+ taffy::style::Style {
+ gap: taffy::geometry::Size {
+ width: taffy::style::LengthPercentage::Percent(0.1f32),
+ height: taffy::style::LengthPercentage::Points(20f32),
+ },
+ size: taffy::geometry::Size {
+ width: taffy::style::Dimension::Points(100f32),
+ height: taffy::style::Dimension::Points(100f32),
+ },
+ padding: taffy::geometry::Rect {
+ left: taffy::style::LengthPercentage::Points(10f32),
+ right: taffy::style::LengthPercentage::Points(10f32),
+ top: taffy::style::LengthPercentage::Points(10f32),
+ bottom: taffy::style::LengthPercentage::Points(10f32),
+ },
+ ..Default::default()
+ },
+ &[node0, node1, node2],
+ )
+ .unwrap();
+ taffy.compute_layout(node, taffy::geometry::Size::MAX_CONTENT).unwrap();
+}
diff --git a/benches/generated/mod.rs b/benches/generated/mod.rs
index 8989a50d6..f0d1949fc 100644
--- a/benches/generated/mod.rs
+++ b/benches/generated/mod.rs
@@ -187,6 +187,7 @@ mod gap_column_gap_percentage_cyclic_partially_shrinkable;
mod gap_column_gap_percentage_cyclic_shrinkable;
mod gap_column_gap_percentage_cyclic_unshrinkable;
mod gap_column_gap_percentage_flexible;
+mod gap_column_gap_percentage_flexible_with_padding;
mod gap_column_gap_percentage_inflexible;
mod gap_column_gap_wrap_align_center;
mod gap_column_gap_wrap_align_flex_end;
@@ -687,6 +688,7 @@ fn benchmark(c: &mut Criterion) {
gap_column_gap_percentage_cyclic_shrinkable::compute();
gap_column_gap_percentage_cyclic_unshrinkable::compute();
gap_column_gap_percentage_flexible::compute();
+ gap_column_gap_percentage_flexible_with_padding::compute();
gap_column_gap_percentage_inflexible::compute();
gap_column_gap_wrap_align_center::compute();
gap_column_gap_wrap_align_flex_end::compute();
diff --git a/test_fixtures/gap_column_gap_percentage_flexible_with_padding.html b/test_fixtures/gap_column_gap_percentage_flexible_with_padding.html
new file mode 100644
index 000000000..9404120bf
--- /dev/null
+++ b/test_fixtures/gap_column_gap_percentage_flexible_with_padding.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <script src="../scripts/gentest/test_helper.js"></script>
+ <link rel="stylesheet" type="text/css" href="../scripts/gentest/test_base_style.css">
+ <title>
+ Test description
+ </title>
+<head/>
+<body>
+
+<div id="test-root" style="flex-direction: row; width: 100px; height: 100px; column-gap: 10%; row-gap: 20px;padding: 10px">
+ <div style="flex: 1;"></div>
+ <div style="flex: 1;"></div>
+ <div style="flex: 1;"></div>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/generated/gap_column_gap_percentage_flexible_with_padding.rs b/tests/generated/gap_column_gap_percentage_flexible_with_padding.rs
new file mode 100644
index 000000000..9fff69660
--- /dev/null
+++ b/tests/generated/gap_column_gap_percentage_flexible_with_padding.rs
@@ -0,0 +1,77 @@
+#[test]
+fn gap_column_gap_percentage_flexible_with_padding() {
+ use slotmap::Key;
+ #[allow(unused_imports)]
+ use taffy::{layout::Layout, prelude::*};
+ let mut taffy = taffy::Taffy::new();
+ let node0 = taffy
+ .new_leaf(taffy::style::Style {
+ flex_grow: 1f32,
+ flex_shrink: 1f32,
+ flex_basis: taffy::style::Dimension::Percent(0f32),
+ ..Default::default()
+ })
+ .unwrap();
+ let node1 = taffy
+ .new_leaf(taffy::style::Style {
+ flex_grow: 1f32,
+ flex_shrink: 1f32,
+ flex_basis: taffy::style::Dimension::Percent(0f32),
+ ..Default::default()
+ })
+ .unwrap();
+ let node2 = taffy
+ .new_leaf(taffy::style::Style {
+ flex_grow: 1f32,
+ flex_shrink: 1f32,
+ flex_basis: taffy::style::Dimension::Percent(0f32),
+ ..Default::default()
+ })
+ .unwrap();
+ let node = taffy
+ .new_with_children(
+ taffy::style::Style {
+ gap: taffy::geometry::Size {
+ width: taffy::style::LengthPercentage::Percent(0.1f32),
+ height: taffy::style::LengthPercentage::Points(20f32),
+ },
+ size: taffy::geometry::Size {
+ width: taffy::style::Dimension::Points(100f32),
+ height: taffy::style::Dimension::Points(100f32),
+ },
+ padding: taffy::geometry::Rect {
+ left: taffy::style::LengthPercentage::Points(10f32),
+ right: taffy::style::LengthPercentage::Points(10f32),
+ top: taffy::style::LengthPercentage::Points(10f32),
+ bottom: taffy::style::LengthPercentage::Points(10f32),
+ },
+ ..Default::default()
+ },
+ &[node0, node1, node2],
+ )
+ .unwrap();
+ taffy.compute_layout(node, taffy::geometry::Size::MAX_CONTENT).unwrap();
+ println!("\nComputed tree:");
+ taffy::debug::print_tree(&taffy, node);
+ println!();
+ let Layout { size, location, .. } = taffy.layout(node).unwrap();
+ assert_eq!(size.width, 100f32, "width of node {:?}. Expected {}. Actual {}", node.data(), 100f32, size.width);
+ assert_eq!(size.height, 100f32, "height of node {:?}. Expected {}. Actual {}", node.data(), 100f32, size.height);
+ assert_eq!(location.x, 0f32, "x of node {:?}. Expected {}. Actual {}", node.data(), 0f32, location.x);
+ assert_eq!(location.y, 0f32, "y of node {:?}. Expected {}. Actual {}", node.data(), 0f32, location.y);
+ let Layout { size, location, .. } = taffy.layout(node0).unwrap();
+ assert_eq!(size.width, 21f32, "width of node {:?}. Expected {}. Actual {}", node0.data(), 21f32, size.width);
+ assert_eq!(size.height, 80f32, "height of node {:?}. Expected {}. Actual {}", node0.data(), 80f32, size.height);
+ assert_eq!(location.x, 10f32, "x of node {:?}. Expected {}. Actual {}", node0.data(), 10f32, location.x);
+ assert_eq!(location.y, 10f32, "y of node {:?}. Expected {}. Actual {}", node0.data(), 10f32, location.y);
+ let Layout { size, location, .. } = taffy.layout(node1).unwrap();
+ assert_eq!(size.width, 21f32, "width of node {:?}. Expected {}. Actual {}", node1.data(), 21f32, size.width);
+ assert_eq!(size.height, 80f32, "height of node {:?}. Expected {}. Actual {}", node1.data(), 80f32, size.height);
+ assert_eq!(location.x, 39f32, "x of node {:?}. Expected {}. Actual {}", node1.data(), 39f32, location.x);
+ assert_eq!(location.y, 10f32, "y of node {:?}. Expected {}. Actual {}", node1.data(), 10f32, location.y);
+ let Layout { size, location, .. } = taffy.layout(node2).unwrap();
+ assert_eq!(size.width, 21f32, "width of node {:?}. Expected {}. Actual {}", node2.data(), 21f32, size.width);
+ assert_eq!(size.height, 80f32, "height of node {:?}. Expected {}. Actual {}", node2.data(), 80f32, size.height);
+ assert_eq!(location.x, 69f32, "x of node {:?}. Expected {}. Actual {}", node2.data(), 69f32, location.x);
+ assert_eq!(location.y, 10f32, "y of node {:?}. Expected {}. Actual {}", node2.data(), 10f32, location.y);
+}
diff --git a/tests/generated/mod.rs b/tests/generated/mod.rs
index b735d5697..aa64bfe80 100644
--- a/tests/generated/mod.rs
+++ b/tests/generated/mod.rs
@@ -186,6 +186,7 @@ mod gap_column_gap_percentage_cyclic_partially_shrinkable;
mod gap_column_gap_percentage_cyclic_shrinkable;
mod gap_column_gap_percentage_cyclic_unshrinkable;
mod gap_column_gap_percentage_flexible;
+mod gap_column_gap_percentage_flexible_with_padding;
mod gap_column_gap_percentage_inflexible;
mod gap_column_gap_wrap_align_center;
mod gap_column_gap_wrap_align_flex_end;