Rename geometric eval and apply to resolve ✏

4 files changed, 8 insertions, 8 deletions

diff --git a/src/layout/fixed.rs b/src/layout/fixed.rs
index 8a42a9d3..d0daa2ca 100644
--- a/src/layout/fixed.rs
+++ b/src/layout/fixed.rs
@@ -16,8 +16,8 @@ impl Layout for Fixed {
     fn layout(&self, ctx: &mut LayoutContext, areas: &Areas) -> Layouted {
         let Area { rem, full } = areas.current;
         let size = Size::new(
-            self.width.map(|w| w.eval(full.width)).unwrap_or(rem.width),
-            self.height.map(|h| h.eval(full.height)).unwrap_or(rem.height),
+            self.width.map(|w| w.resolve(full.width)).unwrap_or(rem.width),
+            self.height.map(|h| h.resolve(full.height)).unwrap_or(rem.height),
         );
 
         let areas = Areas::once(size);
diff --git a/src/layout/pad.rs b/src/layout/pad.rs
index f574e823..09cf016b 100644
--- a/src/layout/pad.rs
+++ b/src/layout/pad.rs
@@ -31,7 +31,7 @@ impl Layout for Pad {
 
 /// Shrink all areas by the padding.
 fn shrink_areas(areas: &Areas, padding: Sides<Linear>) -> Areas {
-    let shrink = |size| size - padding.eval(size).size();
+    let shrink = |size| size - padding.resolve(size).size();
     Areas {
         current: Area {
             rem: shrink(areas.current.rem),
@@ -44,7 +44,7 @@ fn shrink_areas(areas: &Areas, padding: Sides<Linear>) -> Areas {
 
 /// Enlarge the box and move all elements inwards.
 fn pad_layout(layout: &mut BoxLayout, padding: Sides<Linear>) {
-    let padding = padding.eval(layout.size);
+    let padding = padding.resolve(layout.size);
     let origin = Point::new(padding.left, padding.top);
 
     layout.size += padding.size();
diff --git a/src/layout/par.rs b/src/layout/par.rs
index b1bba790..bd38442d 100644
--- a/src/layout/par.rs
+++ b/src/layout/par.rs
@@ -125,7 +125,7 @@ impl<'a> ParLayouter<'a> {
             let child_cross_size = layout.size.get(self.cross);
 
             // Position along the cross axis.
-            let cross = align.apply(if self.dirs.cross.is_positive() {
+            let cross = align.resolve(if self.dirs.cross.is_positive() {
                 let after_with_self = self.run_size.cross - before;
                 before .. full_size.cross - after_with_self
             } else {
@@ -164,7 +164,7 @@ impl<'a> ParLayouter<'a> {
             };
 
             // Align along the cross axis.
-            let cross = cross_align.apply(if self.dirs.cross.is_positive() {
+            let cross = cross_align.resolve(if self.dirs.cross.is_positive() {
                 Length::ZERO .. size.cross - child_size.cross
             } else {
                 size.cross - child_size.cross .. Length::ZERO
diff --git a/src/layout/stack.rs b/src/layout/stack.rs
index 13c585e3..7e1bb2c5 100644
--- a/src/layout/stack.rs
+++ b/src/layout/stack.rs
@@ -117,7 +117,7 @@ impl<'a> StackLayouter<'a> {
             let child_size = layout.size.switch(self.dirs);
 
             // Align along the main axis.
-            let main = aligns.main.apply(if self.dirs.main.is_positive() {
+            let main = aligns.main.resolve(if self.dirs.main.is_positive() {
                 let after_with_self = self.used.main - before;
                 before .. full_size.main - after_with_self
             } else {
@@ -127,7 +127,7 @@ impl<'a> StackLayouter<'a> {
             });
 
             // Align along the cross axis.
-            let cross = aligns.cross.apply(if self.dirs.cross.is_positive() {
+            let cross = aligns.cross.resolve(if self.dirs.cross.is_positive() {
                 Length::ZERO .. full_size.cross - child_size.cross
             } else {
                 full_size.cross - child_size.cross .. Length::ZERO