Merge pull request #52 from ejjonny/fix

fix padding constraints

Author: cyypherus

Diff for: examples/demo-site/Cargo.lock

@@ -169,6 +169,7 @@ impl eframe::App for MyApp {
                             )
                             .align(Align::Leading)
                             .width_range(120.0..),
+                            space(),
                             draw(|area, state: &mut State| {
                               if state
                                 .ui

Diff for: examples/egui-case-study/src/main.rs

@@ -42,20 +42,28 @@ impl<State> NodeValue<State> {
         );
         match self {
             NodeValue::Padding { amounts, element } => {
-                element.constraints(allocations[0], state).combine_sum(
-                    SizeConstraints {
-                        width: Constraint {
-                            lower: Some(amounts.trailing + amounts.leading),
-                            upper: None,
-                        },
-                        height: Constraint {
-                            lower: Some(amounts.bottom + amounts.top),
-                            upper: None,
-                        },
-                        aspect: None,
+                let child = element.constraints(allocations[0], state);
+                SizeConstraints {
+                    width: Constraint {
+                        lower: Some(
+                            amounts.leading + child.width.lower.unwrap_or(0.) + amounts.trailing,
+                        ),
+                        upper: child
+                            .width
+                            .upper
+                            .map(|upper| upper + amounts.leading + amounts.trailing),
                     },
-                    0.,
-                )
+                    height: Constraint {
+                        lower: Some(
+                            amounts.top + child.height.lower.unwrap_or(0.) + amounts.bottom,
+                        ),
+                        upper: child
+                            .height
+                            .upper
+                            .map(|upper| upper + amounts.top + amounts.bottom),
+                    },
+                    aspect: None,
+                }
             }
             NodeValue::Column {
                 ref mut elements,
@@ -183,13 +191,6 @@ impl SizeConstraints {
             aspect: self.aspect.or(other.aspect),
         }
     }
-    pub(crate) fn combine_sum(self, other: Self, spacing: f32) -> Self {
-        SizeConstraints {
-            width: self.width.combine_sum(other.width, spacing),
-            height: self.height.combine_sum(other.height, spacing),
-            aspect: None,
-        }
-    }
 }
 
 impl Constraint {

Diff for: src/constraints.rs

@@ -571,4 +571,20 @@ mod tests {
         })
         .draw(Area::new(0., 0., 100., 100.), &mut ());
     }
+    #[test]
+    fn test_explicit_with_padding() {
+        Layout::new(|()| {
+            column(vec![
+                draw(|a, _| {
+                    assert_eq!(a, Area::new(10., 10., 80., 20.));
+                })
+                .height(20.)
+                .pad(10.),
+                draw(|a, _| {
+                    assert_eq!(a, Area::new(0., 40., 100., 60.));
+                }),
+            ])
+        })
+        .draw(Area::new(0., 0., 100., 100.), &mut ());
+    }
 }