Add alignment to drawarea.

src/uxbox/data/shapes.cljs

@@ -61,7 +61,7 @@
 
 (declare align-point)
 
-(def coords
+(def ^:private canvas-coords
   (gpt/point c/canvas-start-x
              c/canvas-start-y))
 
@@ -73,7 +73,7 @@
       (let [shape (get-in state [:shapes-by-id id])
             shape (geom/outer-rect state shape)
             point (gpt/point (:x shape) (:y shape))
-            point (gpt/add point coords)]
+            point (gpt/add point canvas-coords)]
         (->> (align-point point)
              (rx/map #(gpt/subtract % point))
              (rx/map #(move-shape id %)))))))
@@ -139,7 +139,7 @@
     (-apply-watch [_ state s]
       (let [shape (get-in state [:shapes-by-id id])
             point (geom/get-vertex-point shape vid)
-            point (gpt/add point coords)]
+            point (gpt/add point canvas-coords)]
         (->> (align-point point)
              (rx/map #(gpt/subtract % point))
              (rx/map #(update-vertex-position id {:vid vid :delta %})))))))

src/uxbox/ui/workspace/base.cljs

@@ -126,4 +126,3 @@
        (rx/buffer 2 1)
        (rx/map coords-delta)
        (rx/share)))
-

src/uxbox/ui/workspace/drawarea.cljs

@@ -10,6 +10,7 @@
             [rum.core :as rum]
             [beicon.core :as rx]
             [lentes.core :as l]
+            [uxbox.constants :as c]
             [uxbox.rstore :as rs]
             [uxbox.state :as st]
             [uxbox.data.workspace :as udw]
@@ -64,23 +65,26 @@
 
 ;; --- Drawing Logic
 
-(declare initialize-icon-drawing)
+(declare initialize)
-(declare initialize-shape-drawing)
 
 (defn- watch-draw-actions
   []
-  (letfn [(initialize [shape]
+  (let [stream (->> uuc/actions-s
-            (println "initialize" shape)
+                    (rx/map :type)
-            (if (= (:type shape) :icon)
+                    (rx/dedupe)
-              (initialize-icon-drawing shape)
+                    (rx/filter #(= "ui.shape.draw" %))
-              (initialize-shape-drawing shape)))]
+                    (rx/map #(:drawing @wb/workspace-l))
-    (as-> uuc/actions-s $
+                    (rx/filter identity))]
-      (rx/map :type $)
+    (rx/subscribe stream initialize)))
-      (rx/dedupe $)
+
-      (rx/filter #(= "ui.shape.draw" %) $)
+(declare initialize-icon-drawing)
-      (rx/map #(:drawing @wb/workspace-l) $)
+(declare initialize-shape-drawing)
-      (rx/filter identity $)
+
-      (rx/on-value $ initialize))))
+(defn- initialize
+  [shape]
+  (if (= (:type shape) :icon)
+    (initialize-icon-drawing shape)
+    (initialize-shape-drawing shape)))
 
 (defn- initialize-icon-drawing
   "A drawing handler for icons."
@@ -92,34 +96,52 @@
               (udw/select-for-drawing nil)
               (uds/select-first-shape))))
 
+(def ^:private canvas-coords
+  (gpt/point c/canvas-start-x
+             c/canvas-start-y))
+
+(declare on-draw)
+(declare on-draw-complete)
+(declare on-first-draw)
+
 (defn- initialize-shape-drawing
-  "A drawing handler for generic shapes such as rect, circle, text, etc."
   [shape]
-  (letfn [(on-value [[pt ctrl?]]
+  (let [mouse (->> (rx/sample 10 wb/mouse-viewport-s)
-            (let [pt (gpt/divide pt @wb/zoom-l)]
+                   (rx/mapcat (fn [point]
-              (reset! drawing-position (assoc pt :lock ctrl?))))
+                                (if @wb/alignment-l
-
+                                  (uds/align-point point)
-          (on-complete []
+                                  (rx/of point))))
-            (let [shape @drawing-shape
+                   (rx/map #(gpt/subtract % canvas-coords)))
-                  shpos @drawing-position
-                  shape (geom/resize shape shpos)]
-              (rs/emit! (uds/add-shape shape)
-                        (udw/select-for-drawing nil)
-                        (uds/select-first-shape))
-              (reset! drawing-position nil)
-              (reset! drawing-shape nil)))]
-
-  (let [{:keys [x y] :as pt} (gpt/divide @wb/mouse-canvas-a @wb/zoom-l)
-        shape (geom/setup shape {:x1 x :y1 y :x2 x :y2 y})
         stoper (->> uuc/actions-s
                     (rx/map :type)
                     (rx/filter #(empty? %))
-                    (rx/take 1))]
+                    (rx/take 1))
+        firstpos (rx/take 1 mouse)
+        stream (->> mouse
+                    (rx/take-until stoper)
+                    (rx/skip-while #(nil? @drawing-shape))
+                    (rx/with-latest-from vector wb/mouse-ctrl-s))]
 
-    (reset! drawing-shape shape)
+    (rx/subscribe firstpos #(on-first-draw shape %))
-    (reset! drawing-position (assoc pt :lock false))
+    (rx/subscribe stream on-draw nil on-draw-complete)))
 
-    (as-> wb/mouse-canvas-s $
+(defn- on-first-draw
-      (rx/take-until stoper $)
+  [shape {:keys [x y] :as pt}]
-      (rx/with-latest-from vector wb/mouse-ctrl-s $)
+  (let [shape (geom/setup shape {:x1 x :y1 y :x2 x :y2 y})]
-      (rx/subscribe $ on-value nil on-complete)))))
+    (reset! drawing-shape shape)))
+
+(defn- on-draw
+  [[pt ctrl?]]
+  (let [pt (gpt/divide pt @wb/zoom-l)]
+    (reset! drawing-position (assoc pt :lock ctrl?))))
+
+(defn- on-draw-complete
+  []
+  (let [shape @drawing-shape
+        shpos @drawing-position
+                  shape (geom/resize shape shpos)]
+    (rs/emit! (uds/add-shape shape)
+              (udw/select-for-drawing nil)
+              (uds/select-first-shape))
+    (reset! drawing-position nil)
+    (reset! drawing-shape nil)))