Revert changes to margin, padding, and border.

7733026e5a32f8fbb11f6aae3c981d7d2dbb2c73 · ruwaq Dusty DeWeese · 2021-07-17T23:53:46Z (5 wata ñawpaq) · tayta 3f760dc2f · kay commitpi sach'ata qhaway

Semántico sayk'uy · 1

src/algo.rs

ukhunpi t'ikrakurqan fn compute_internal

1 qillqakuna · +6 −6

src/algo.rs +6 −6

diff --git a/src/algo.rs b/src/algo.rs
index 26cf003f2..255d41b8b 100644
--- a/src/algo.rs
+++ b/src/algo.rs
@@ -156,9 +156,9 @@ impl Forest {
         let is_column = dir.is_column();
         let is_wrap_reverse = self.nodes[node].style.flex_wrap == FlexWrap::WrapReverse;
 
-        let margin = self.nodes[node].style.margin.zip_size(parent_size, |n, s| n.resolve(s).or_else(0.0));
-        let padding = self.nodes[node].style.padding.zip_size(parent_size, |n, s| n.resolve(s).or_else(0.0));
-        let border = self.nodes[node].style.border.zip_size(parent_size, |n, s| n.resolve(s).or_else(0.0));
+        let margin = self.nodes[node].style.margin.map(|n| n.resolve(parent_size.width).or_else(0.0));
+        let padding = self.nodes[node].style.padding.map(|n| n.resolve(parent_size.width).or_else(0.0));
+        let border = self.nodes[node].style.border.map(|n| n.resolve(parent_size.width).or_else(0.0));
 
         let padding_border = Rect {
             start: padding.start + border.start,
@@ -229,9 +229,9 @@ impl Forest {
                 max_size: child_style.max_size.resolve(node_inner_size),
 
                 position: child_style.position.zip_size(node_inner_size, |p, s| p.resolve(s)),
-                margin: child_style.margin.zip_size(node_inner_size, |m, s| m.resolve(s).or_else(0.0)),
-                padding: child_style.padding.zip_size(node_inner_size, |p, s| p.resolve(s).or_else(0.0)),
-                border: child_style.border.zip_size(node_inner_size, |b, s| b.resolve(s).or_else(0.0)),
+                margin: child_style.margin.map(|m| m.resolve(node_inner_size.width).or_else(0.0)),
+                padding: child_style.padding.map(|p| p.resolve(node_inner_size.width).or_else(0.0)),
+                border: child_style.border.map(|b| b.resolve(node_inner_size.width).or_else(0.0)),
 
                 flex_basis: 0.0,
                 inner_flex_basis: 0.0,