Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-15 19:48:22 -05:00
Code Issues Activity

Change movement approach and temporary disable align related stuff.

Browse source
This commit is contained in:
Andrey Antukh 2016-04-20 20:30:36 +03:00
parent 00679d9c68
commit eb82c8dffa
No known key found for this signature in database
GPG key ID: 4DFEBCB8316A8B95
1 changed files with 77 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

133
src/uxbox/ui/workspace/movement.cljs
View file

@ -19,19 +19,23 @@
[uxbox.util.geom :as geom] [uxbox.util.geom :as geom]
[uxbox.util.geom.point :as gpt])) [uxbox.util.geom.point :as gpt]))
(declare initialize)
(declare handle-movement)
;; --- Lenses ;; --- Lenses
(declare translate-to-viewport) ;; (declare translate-to-viewport)
;; (defn- resolve-selected
;; [state]
;; (let [selected (get-in state [:workspace :selected])
;; xf (comp
;; (map #(get-in state [:shapes-by-id %]))
;; (map translate-to-viewport))]
;; (into #{} xf selected)))
(defn- resolve-selected (defn- resolve-selected
[state] [state]
(let [selected (get-in state [:workspace :selected]) (let [selected (get-in state [:workspace :selected])
xf (comp xf (map #(get-in state [:shapes-by-id %]))]
(map #(get-in state [:shapes-by-id %]))
(map translate-to-viewport))]
(into #{} xf selected))) (into #{} xf selected)))
(def ^:const ^:private selected-shapes-l (def ^:const ^:private selected-shapes-l
@ -48,6 +52,8 @@
;; --- Public Api ;; --- Public Api
(declare initialize)
(defn watch-move-actions (defn watch-move-actions
[] []
(as-> uuc/actions-s $ (as-> uuc/actions-s $
@ -56,62 +62,77 @@
;; --- Implementation ;; --- Implementation
(def coords ;; (def coords
(gpt/point c/canvas-start-x ;; (gpt/point c/canvas-start-x
c/canvas-start-y)) ;; c/canvas-start-y))
(defn- translate-to-viewport ;; (defn- translate-to-viewport
[shape] ;; [shape]
(let [dx (- (:x2 shape) (:x1 shape)) ;; (let [dx (- (:x2 shape) (:x1 shape))
dy (- (:y2 shape) (:y1 shape)) ;; dy (- (:y2 shape) (:y1 shape))
p1 (gpt/point (:x1 shape) (:y1 shape)) ;; p1 (gpt/point (:x1 shape) (:y1 shape))
p2 (gpt/add p1 coords) ;; p2 (gpt/add p1 coords)
p3 (gpt/add p2 [dx dy])] ;; p3 (gpt/add p2 [dx dy])]
(assoc shape ;; (assoc shape
:x1 (:x p2) ;; :x1 (:x p2)
:y1 (:y p2) ;; :y1 (:y p2)
:x2 (:x p3) ;; :x2 (:x p3)
:y2 (:y p3)))) ;; :y2 (:y p3))))
(defn- translate-to-canvas ;; (defn- translate-to-canvas
[shape] ;; [shape]
(let [dx (- (:x2 shape) (:x1 shape)) ;; (let [dx (- (:x2 shape) (:x1 shape))
dy (- (:y2 shape) (:y1 shape)) ;; dy (- (:y2 shape) (:y1 shape))
p1 (gpt/point (:x1 shape) (:y1 shape)) ;; p1 (gpt/point (:x1 shape) (:y1 shape))
p2 (gpt/subtract p1 coords) ;; p2 (gpt/subtract p1 coords)
p3 (gpt/add p2 [dx dy])] ;; p3 (gpt/add p2 [dx dy])]
(assoc shape ;; (assoc shape
:x1 (:x p2) ;; :x1 (:x p2)
:y1 (:y p2) ;; :y1 (:y p2)
:x2 (:x p3) ;; :x2 (:x p3)
:y2 (:y p3)))) ;; :y2 (:y p3))))
;; (defn- initialize
;; []
;; (let [shapes @selected-shapes-l
;; align? @alignment-l
;; stoper (->> uuc/actions-s
;; (rx/map :type)
;; (rx/filter empty?)
;; (rx/take 1))]
;; (as-> wb/mouse-delta-s $
;; (rx/take-until stoper $)
;; (rx/map #(gpt/divide % @wb/zoom-l) $)
;; (rx/scan (fn [acc delta]
;; (let [xf (map #(geom/move % delta))]
;; (into [] xf acc))) shapes $)
;; (rx/mapcat (fn [items]
;; (if align?
;; (->> (apply rx/of items)
;; (rx/mapcat align/translate)
;; (rx/reduce conj []))
;; (rx/of items))) $)
;; (rx/map (fn [items]
;; (mapv translate-to-canvas items)) $)
;; (rx/subscribe $ handle-movement))))
(defn- handle-movement
[{:keys [id] :as shape} delta]
(rs/emit! (uds/move-shape id delta)))
(defn- watch-movement
[stoper shape]
(as-> wb/mouse-delta-s $
(rx/take-until stoper $)
(rx/map #(gpt/divide % @wb/zoom-l) $)
(rx/subscribe $ (partial handle-movement shape))))
(defn- initialize (defn- initialize
[] []
(let [shapes @selected-shapes-l (let [;; align? @alignment-l
align? @alignment-l
stoper (->> uuc/actions-s stoper (->> uuc/actions-s
(rx/map :type) (rx/map :type)
(rx/filter empty?) (rx/filter empty?)
(rx/take 1))] (rx/take 1))]
(as-> wb/mouse-delta-s $ (run! (partial watch-movement stoper)
(rx/take-until stoper $) (deref selected-shapes-l))))
(rx/map #(gpt/divide % @wb/zoom-l) $)
(rx/scan (fn [acc delta]
(let [xf (map #(geom/move % delta))]
(into [] xf acc))) shapes $)
(rx/mapcat (fn [items]
(if align?
(->> (apply rx/of items)
(rx/mapcat align/translate)
(rx/reduce conj []))
(rx/of items))) $)
(rx/map (fn [items]
(mapv translate-to-canvas items)) $)
(rx/subscribe $ handle-movement))))
(defn- handle-movement
[delta]
(doseq [shape delta]
(rs/emit! (uds/update-shape shape))))