3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-30 20:06:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add alignment to drawarea.

Browse source
This commit is contained in:
Andrey Antukh 2016-04-22 20:41:03 +03:00
parent a63c9f7d33
commit 53c657e8a4
No known key found for this signature in database
GPG key ID: 4DFEBCB8316A8B95
3 changed files with 63 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/uxbox/data/shapes.cljs
View file

@ -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 %})))))))

1
src/uxbox/ui/workspace/base.cljs
View file

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

98
src/uxbox/ui/workspace/drawarea.cljs
View file

@ -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-shape-drawing)
(declare initialize)
(defn- watch-draw-actions
[]
(letfn [(initialize [shape]
(println "initialize" shape)
(if (= (:type shape) :icon)
(initialize-icon-drawing shape)
(initialize-shape-drawing shape)))]
(as-> uuc/actions-s $
(rx/map :type $)
(rx/dedupe $)
(rx/filter #(= "ui.shape.draw" %) $)
(rx/map #(:drawing @wb/workspace-l) $)
(rx/filter identity $)
(rx/on-value $ initialize))))
(let [stream (->> uuc/actions-s
(rx/map :type)
(rx/dedupe)
(rx/filter #(= "ui.shape.draw" %))
(rx/map #(:drawing @wb/workspace-l))
(rx/filter identity))]
(rx/subscribe stream initialize)))
(declare initialize-icon-drawing)
(declare initialize-shape-drawing)
(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 [pt (gpt/divide pt @wb/zoom-l)]
(reset! drawing-position (assoc pt :lock ctrl?))))
(on-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)))]
(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})
(let [mouse (->> (rx/sample 10 wb/mouse-viewport-s)
(rx/mapcat (fn [point]
(if @wb/alignment-l
(uds/align-point point)
(rx/of point))))
(rx/map #(gpt/subtract % canvas-coords)))
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)
(reset! drawing-position (assoc pt :lock false))
(rx/subscribe firstpos #(on-first-draw shape %))
(rx/subscribe stream on-draw nil on-draw-complete)))
(as-> wb/mouse-canvas-s $
(rx/take-until stoper $)
(rx/with-latest-from vector wb/mouse-ctrl-s $)
(rx/subscribe $ on-value nil on-complete)))))
(defn- on-first-draw
[shape {:keys [x y] :as pt}]
(let [shape (geom/setup shape {:x1 x :y1 y :x2 x :y2 y})]
(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)))