#51. Avoid cloning

audulus · Aug 19, 2023 · 202a75c · 202a75c
1 parent f114631
commit 202a75c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/src/context.rs b/src/context.rs
@@ -340,6 +340,21 @@ impl Context {
         }
     }
 
+    pub(crate) fn set_layout_offset(&mut self, path: &IdPath, offset: LocalOffset) {
+        match self.layout.get_mut(path) {
+            Some(boxref) => boxref.offset = offset,
+            None => {
+                self.layout.insert(
+                    path.clone(),
+                    LayoutBox {
+                        rect: LocalRect::default(),
+                        offset: offset,
+                    },
+                );
+            }
+        }
+    }
+
     pub(crate) fn set_dirty(&mut self) {
         if self.enable_dirty {
             self.dirty = true

diff --git a/src/views/list.rs b/src/views/list.rs
@@ -92,18 +92,7 @@ where
                         VAlignment::Middle,
                     );
 
-                    match args.cx.layout.get_mut(path) {
-                        Some(boxref) => boxref.offset = child_offset,
-                        None => {
-                            args.cx.layout.insert(
-                                path.clone(),
-                                LayoutBox {
-                                    rect: LocalRect::default(),
-                                    offset: child_offset,
-                                },
-                            );
-                        }
-                    }
+                    args.cx.set_layout_offset(path, child_offset);
 
                     path.pop();
 
@@ -149,7 +138,7 @@ where
                         HAlignment::Center,
                     );
 
-                    args.cx.layout.entry(path.clone()).or_default().offset = child_offset;
+                    args.cx.set_layout_offset(path, child_offset);
                     path.pop();
 
                     y -= child_size.height;

diff --git a/src/views/stack.rs b/src/views/stack.rs
@@ -136,7 +136,7 @@ impl<VT: ViewTuple + 'static, D: StackDirection + 'static> View for Stack<VT, D>
                     );
 
                     path.push(c);
-                    args.cx.layout.entry(path.clone()).or_default().offset = child_offset;
+                    args.cx.set_layout_offset(path, child_offset);
                     path.pop();
                 }
 
@@ -187,7 +187,7 @@ impl<VT: ViewTuple + 'static, D: StackDirection + 'static> View for Stack<VT, D>
                     );
 
                     path.push(c);
-                    args.cx.layout.entry(path.clone()).or_default().offset = child_offset;
+                    args.cx.set_layout_offset(path, child_offset);
                     path.pop();
                 }