refactor draw tools

Author: sprocketc

src/renderer/tool/impl/draw/brush.cljs

@@ -6,20 +6,12 @@
    [renderer.tool.handlers :as h]
    [renderer.tool.hierarchy :as hierarchy]))
 
-(derive :brush ::hierarchy/element)
+(derive :brush ::hierarchy/draw)
 
 (defmethod hierarchy/properties :brush
   []
   {:icon "brush"})
 
-(defmethod hierarchy/help [:brush :idle]
-  []
-  "Click and drag to draw.")
-
-(defmethod hierarchy/activate :brush
-  [db]
-  (h/set-cursor db "none"))
-
 (defmethod hierarchy/pointer-move :brush
   [db e]
   (let [[x y] (:adjusted-pointer-pos db)
@@ -53,5 +45,5 @@
   [db _e]
   (-> db
       (h/create-temp-element)
-      (h/set-state :idle)
+      (h/activate :transform)
       (h/explain "Draw line")))

src/renderer/tool/impl/draw/core.cljs

@@ -1,4 +1,16 @@
 (ns renderer.tool.impl.draw.core
   (:require
+   [renderer.tool.handlers :as h]
+   [renderer.tool.hierarchy :as hierarchy]
    [renderer.tool.impl.draw.brush]
    [renderer.tool.impl.draw.pen]))
+
+(derive ::hierarchy/draw ::hierarchy/tool)
+
+(defmethod hierarchy/help [::hierarchy/draw :idle]
+  []
+  "Click and drag to draw.")
+
+(defmethod hierarchy/activate ::hierarchy/draw
+  [db]
+  (h/set-cursor db "crosshair"))

src/renderer/tool/impl/draw/pen.cljs

@@ -7,12 +7,11 @@
    [renderer.utils.element :as element]
    [renderer.utils.path :as path]))
 
-(derive :pen ::hierarchy/element)
+(derive :pen ::hierarchy/draw)
 
 (defmethod hierarchy/properties :pen
   []
-  {:icon "pencil"
-   :description "Pencil tool"})
+  {:icon "pencil"})
 
 (defmethod hierarchy/drag :pen
   [db]
@@ -35,5 +34,5 @@
     (-> db
         (h/set-temp path)
         (h/create-temp-element)
-        (h/set-state :idle)
+        (h/activate :transform)
         (h/explain "Draw line"))))