Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-09 00:10:11 -05:00
Code Issues Activity

Fix shapes drawing when zoom is activated.

Browse source
This commit is contained in:
Andrey Antukh 2016-11-18 20:47:51 +01:00
parent f0b6b9363c
commit 732a42924b
No known key found for this signature in database
GPG key ID: 4DFEBCB8316A8B95
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/uxbox/main/ui/workspace/drawarea.cljs
View file

@ -150,14 +150,23 @@
pos
immanted-zones))
(defn- translate-to-canvas
[point]
(let [zoom @wb/zoom-ref
ccords (gpt/multiply canvas-coords zoom)]
(-> point
(gpt/subtract ccords)
(gpt/divide zoom))))
(defn- conditional-align
[point]
(if @wb/alignment-ref
(uds/align-point point)
(rx/of point)))
(defn- on-init-draw-path
[shape]
(letfn [(conditional-align-point [point]
(if @wb/alignment-ref
(uds/align-point point)
(rx/of point)))
(stoper-event? [[type opts]]
(letfn [(stoper-event? [[type opts]]
(or (and (= type :key/down)
(= (:key opts) 13))
(and (= type :mouse/double-click)
@ -169,9 +178,8 @@
(false? (:shift? opts))))]
(let [mouse (->> (rx/sample 10 wb/mouse-viewport-s)
(rx/mapcat conditional-align-point)
(rx/map #(gpt/subtract % canvas-coords)))
(rx/mapcat conditional-align)
(rx/map translate-to-canvas))
stoper (->> (rx/merge
(rx/take 1 drawing-stoper)
(rx/filter stoper-event? wb/events-s))
@ -238,11 +246,8 @@
(defn- on-init-draw-free-path
[shape]
(let [mouse (->> (rx/sample 10 wb/mouse-viewport-s)
(rx/mapcat (fn [point]
(if @wb/alignment-ref
(uds/align-point point)
(rx/of point))))
(rx/map #(gpt/subtract % canvas-coords)))
(rx/mapcat conditional-align)
(rx/map translate-to-canvas))
stoper (->> wb/events-s
(rx/map first)
(rx/filter #(= % :mouse/up))
@ -275,12 +280,8 @@
(defn- on-init-draw-generic
[shape]
(let [mouse (->> wb/mouse-viewport-s
(rx/mapcat (fn [point]
(if @wb/alignment-ref
(uds/align-point point)
(rx/of point))))
(rx/map #(gpt/subtract % canvas-coords)))
(rx/mapcat conditional-align)
(rx/map translate-to-canvas))
stoper (->> wb/events-s
(rx/map first)
(rx/filter #(= % :mouse/up))
@ -295,8 +296,7 @@
(reset! drawing-shape shape)))
(on-draw [[pt ctrl?]]
(let [pt (gpt/divide pt @wb/zoom-ref)]
(reset! drawing-position (assoc pt :lock ctrl?))))
(reset! drawing-position (assoc pt :lock ctrl?)))
(on-end []
(let [shape @drawing-shape
shpos @drawing-position