@@ -40,0 +51,4 @@
+                                            || rect.contains(cubic.p1)
+                                            || rect.contains(cubic.p2),
+    }
+}

@@ -43,0 +74,4 @@
+                    CanvasElement::Freehand{path, thickness: _} => {
+                        // Remove segments intersecting the eraser
+                        let new_segments = (*path).kurbo_path.segments().filter(|path| ! segment_intersects_rect(path, eraser_rect));
+                        path.kurbo_path = druid::kurbo::BezPath::from_path_segments(new_segments);

@@ -43,0 +81,4 @@
+        }
+    }
+
+    pub fn push_back(&mut self, element: CanvasElement) {

@@ -24,0 +24,4 @@
+// Tools that can be used to interact with the canvas
+#[derive(Clone, Data)]
+enum CanvasTool {
+    Pen { current_element: Option<CanvasElement> },

@@ -25,3 +41,2 @@
 struct CanvasData {
-    current_element: Option<CanvasElement>,
-    //elements: Vector<CanvasElement>,
+    current_tool: CanvasTool,

@@ -113,0 +183,4 @@
+            }
+            _ => {
+                // we just changed the canvas tool, there is no need to repaint
+                return;

@@ -144,3 +216,3 @@
         ctx.fill(rect, &Color::WHITE);
 
-        for element in data.elements.get().iter() {
+        for element in data.elements.get().elements.iter() {