#51. cleanup

audulus · Aug 19, 2023 · a7efb61 · a7efb61
1 parent e395953
commit a7efb61
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 27 deletions.
diff --git a/src/context.rs b/src/context.rs
@@ -53,7 +53,7 @@ pub struct RenderInfo<'a> {
 /// shouldn't have to interact with it directly.
 pub struct Context {
     /// Layout information for all views.
-    pub(crate) layout: HashMap<IdPath, LayoutBox>,
+    layout: HashMap<IdPath, LayoutBox>,
 
     /// Which views each touch (or mouse pointer) is interacting with.
     pub(crate) touches: [ViewId; 16],
@@ -346,6 +346,13 @@ impl Context {
         }
     }
 
+    pub(crate) fn get_layout(&self, path: &IdPath) -> LayoutBox {
+        match self.layout.get(path) {
+            Some(b) => *b,
+            None => LayoutBox::default(),
+        }
+    }
+
     pub(crate) fn update_layout(&mut self, path: &IdPath, layout_box: LayoutBox) {
         match self.layout.get_mut(path) {
             Some(bref) => *bref = layout_box,

diff --git a/src/views/canvas.rs b/src/views/canvas.rs
@@ -11,7 +11,7 @@ where
     F: Fn(&mut Context, LocalRect, &mut Vger) + 'static,
 {
     fn draw(&self, path: &mut IdPath, args: &mut DrawArgs) {
-        let rect = args.cx.layout.get(path).map(|b| b.rect).unwrap_or_default();
+        let rect = args.cx.get_layout(path).rect;
 
         args.vger.save();
         (self.func)(args.cx, rect, args.vger);
@@ -30,7 +30,7 @@ where
     }
 
     fn hittest(&self, path: &mut IdPath, pt: LocalPoint, cx: &mut Context) -> Option<ViewId> {
-        let rect = cx.layout.get(path).map(|b| b.rect).unwrap_or_default();
+        let rect = cx.get_layout(path).rect;
 
         if rect.contains(pt) {
             Some(cx.view_id(path))

diff --git a/src/views/clip.rs b/src/views/clip.rs
@@ -10,7 +10,7 @@ where
     V: View,
 {
     fn geom(&self, path: &IdPath, cx: &mut Context) -> LocalRect {
-        cx.layout.get(path).map(|b| b.rect).unwrap_or_default()
+        cx.get_layout(path).rect
     }
 
     pub fn new(child: V) -> Self {

diff --git a/src/views/geom.rs b/src/views/geom.rs
@@ -25,7 +25,7 @@ where
     }
 
     fn draw(&self, path: &mut IdPath, args: &mut DrawArgs) {
-        let rect = args.cx.layout[path].rect;
+        let rect = args.cx.get_layout(path).rect;
         (self.func)(args.cx, rect.size, args.vger.current_transform());
         path.push(0);
         self.child.draw(path, args);

diff --git a/src/views/list.rs b/src/views/list.rs
@@ -29,7 +29,7 @@ where
     ) {
         for child in self.ids.iter().rev() {
             path.push(hh(child));
-            let offset = cx.layout.get(path).map(|b| b.offset).unwrap_or_default();
+            let offset = cx.get_layout(path).offset;
             ((self.func)(child)).process(&event.offset(-offset), path, cx, actions);
             path.pop();
         }
@@ -38,12 +38,7 @@ where
     fn draw(&self, path: &mut IdPath, args: &mut DrawArgs) {
         for child in &self.ids {
             path.push(hh(child));
-            let offset = args
-                .cx
-                .layout
-                .get(path)
-                .map(|b| b.offset)
-                .unwrap_or_default();
+            let offset = args.cx.get_layout(path).offset;
 
             args.vger.save();
 
@@ -160,7 +155,7 @@ where
     fn dirty(&self, path: &mut IdPath, xform: LocalToWorld, cx: &mut Context) {
         for child in &self.ids {
             path.push(hh(child));
-            let offset = cx.layout.get(path).map(|b| b.offset).unwrap_or_default();
+            let offset = cx.get_layout(path).offset;
             let xf = xform.pre_translate(offset);
             ((self.func)(child)).dirty(path, xf, cx);
             path.pop();
@@ -171,7 +166,7 @@ where
         let mut hit = None;
         for child in &self.ids {
             path.push(hh(child));
-            let offset = cx.layout.get(path).map(|b| b.offset).unwrap_or_default();
+            let offset = cx.get_layout(path).offset;
 
             if let Some(h) = ((self.func)(child)).hittest(path, pt - offset, cx) {
                 hit = Some(h)

diff --git a/src/views/shapes.rs b/src/views/shapes.rs
@@ -8,7 +8,7 @@ pub struct Circle {
 
 impl Circle {
     fn geom(&self, path: &IdPath, cx: &mut Context) -> (LocalPoint, f32) {
-        let rect = cx.layout.get(path).map(|b| b.rect).unwrap_or_default();
+        let rect = cx.get_layout(path).rect;
 
         (rect.center(), rect.size.width.min(rect.size.height) / 2.0)
     }
@@ -73,7 +73,7 @@ pub struct Rectangle {
 
 impl Rectangle {
     fn geom(&self, path: &IdPath, cx: &mut Context) -> LocalRect {
-        cx.layout.get(path).map(|b| b.rect).unwrap_or_default()
+        cx.get_layout(path).rect
     }
 
     /// Sets the fill color for the rectangle.

diff --git a/src/views/stack.rs b/src/views/stack.rs
@@ -45,7 +45,7 @@ impl<VT: ViewTuple + 'static, D: StackDirection + 'static> View for Stack<VT, D>
         let mut c = self.children.len() as i64 - 1;
         self.children.foreach_view_rev(&mut |child| {
             path.push(c as u64);
-            let offset = cx.layout.get(path).map(|b| b.offset).unwrap_or_default();
+            let offset = cx.get_layout(path).offset;
             (*child).process(&event.offset(-offset), path, cx, actions);
             path.pop();
             c -= 1;
@@ -56,12 +56,7 @@ impl<VT: ViewTuple + 'static, D: StackDirection + 'static> View for Stack<VT, D>
         let mut c = 0;
         self.children.foreach_view(&mut |child| {
             path.push(c);
-            let layout_box = args
-                .cx
-                .layout
-                .get(path)
-                .map(|b| b.clone())
-                .unwrap_or_default();
+            let layout_box = args.cx.get_layout(path);
 
             args.vger.save();
 
@@ -210,7 +205,7 @@ impl<VT: ViewTuple + 'static, D: StackDirection + 'static> View for Stack<VT, D>
         let mut c = 0;
         self.children.foreach_view(&mut |child| {
             path.push(c);
-            let offset = cx.layout.get(path).map(|b| b.offset).unwrap_or_default();
+            let offset = cx.get_layout(path).offset;
             let xf = xform.pre_translate(offset);
             child.dirty(path, xf, cx);
             path.pop();
@@ -223,7 +218,7 @@ impl<VT: ViewTuple + 'static, D: StackDirection + 'static> View for Stack<VT, D>
         let mut hit = None;
         self.children.foreach_view(&mut |child| {
             path.push(c);
-            let offset = cx.layout.get(path).map(|b| b.offset).unwrap_or_default();
+            let offset = cx.get_layout(path).offset;
 
             if let Some(h) = child.hittest(path, pt - offset, cx) {
                 hit = Some(h)

diff --git a/src/views/state.rs b/src/views/state.rs
@@ -123,7 +123,7 @@ where
             args.cx.id_stack.pop();
         }
 
-        args.cx.layout[path].rect.size
+        args.cx.get_layout(path).rect.size
     }
 
     fn dirty(&self, path: &mut IdPath, xform: LocalToWorld, cx: &mut Context) {
@@ -136,7 +136,7 @@ where
 
         if holder.dirty {
             // Add a region.
-            let rect = cx.layout[path].rect;
+            let rect = cx.get_layout(path).rect;
             let pts: [LocalPoint; 4] = [
                 rect.min(),
                 [rect.max_x(), rect.min_y()].into(),