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

Revert "🎉 Allow resizing from center"

Browse source 
This reverts commit 2a70964dce.
This commit is contained in:
Andrés Moya 2021-08-05 15:39:09 +02:00
parent 982aa874f2
commit cc0f99333f
1 changed files with 10 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

29
frontend/src/app/main/data/workspace/transforms.cljs
View file

@ -222,7 +222,7 @@
root root
transformed-root)))] transformed-root)))]
(reduce set-child (reduce set-child
(assoc-in modif-tree [(:id shape) :modifiers] modifiers) (update-in modif-tree [(:id shape) :modifiers] #(merge % modifiers))
children))) children)))
(defn- check-delta (defn- check-delta
@ -281,7 +281,7 @@
(defn start-resize (defn start-resize
"Enter mouse resize mode, until mouse button is released." "Enter mouse resize mode, until mouse button is released."
[handler ids shape] [handler ids shape]
(letfn [(resize [shape initial layout [point lock? center? point-snap]] (letfn [(resize [shape initial layout [point lock? point-snap]]
(let [{:keys [width height]} (:selrect shape) (let [{:keys [width height]} (:selrect shape)
{:keys [rotation]} shape {:keys [rotation]} shape
rotation (or rotation 0) rotation (or rotation 0)
@ -303,11 +303,6 @@
(gpt/transform (gmt/rotate-matrix (- rotation))) (gpt/transform (gmt/rotate-matrix (- rotation)))
(gpt/multiply handler-mult)) (gpt/multiply handler-mult))
displacement (when center?
(-> (gpt/point (/ (:x deltav) (if (neg? (:x handler-mult)) 2 -2))
(/ (:y deltav) (if (neg? (:y handler-mult)) 2 -2)))
(gpt/transform (:transform shape))))
;; Resize vector ;; Resize vector
scalev (gpt/divide (gpt/add shapev deltav) shapev) scalev (gpt/divide (gpt/add shapev deltav) shapev)
@ -330,12 +325,8 @@
(gsh/transform-point-center shape-center shape-transform))] (gsh/transform-point-center shape-center shape-transform))]
(rx/of (set-modifiers ids (rx/of (set-modifiers ids
{:displacement (when displacement {:resize-vector scalev
(gmt/translate-matrix displacement)) :resize-origin origin
:resize-vector scalev
:resize-origin (if displacement
(gpt/add origin displacement)
origin)
:resize-transform shape-transform :resize-transform shape-transform
:resize-scale-text scale-text :resize-scale-text scale-text
:resize-transform-inverse shape-transform-inverse})))) :resize-transform-inverse shape-transform-inverse}))))
@ -343,9 +334,9 @@
;; Unifies the instantaneous proportion lock modifier ;; Unifies the instantaneous proportion lock modifier
;; activated by Shift key and the shapes own proportion ;; activated by Shift key and the shapes own proportion
;; lock flag that can be activated on element options. ;; lock flag that can be activated on element options.
(normalize-proportion-lock [[point shift? alt?]] (normalize-proportion-lock [[point shift?]]
(let [proportion-lock? (:proportion-lock shape)] (let [proportion-lock? (:proportion-lock shape)]
[point (or proportion-lock? shift?) alt?]))] [point (or proportion-lock? shift?)]))]
(reify (reify
ptk/UpdateEvent ptk/UpdateEvent
(update [_ state] (update [_ state]
@ -367,11 +358,11 @@
(rx/concat (rx/concat
(rx/of (dch/update-shapes text-shapes-ids #(assoc % :grow-type :fixed))) (rx/of (dch/update-shapes text-shapes-ids #(assoc % :grow-type :fixed)))
(->> ms/mouse-position (->> ms/mouse-position
(rx/with-latest-from ms/mouse-position-shift ms/mouse-position-alt) (rx/with-latest vector ms/mouse-position-shift)
(rx/map normalize-proportion-lock) (rx/map normalize-proportion-lock)
(rx/switch-map (fn [[point _ _as current]] (rx/switch-map (fn [[point :as current]]
(->> (snap/closest-snap-point page-id resizing-shapes layout zoom point) (->> (snap/closest-snap-point page-id resizing-shapes layout zoom point)
(rx/map #(conj current %))))) (rx/map #(conj current %)))))
(rx/mapcat (partial resize shape initial-position layout)) (rx/mapcat (partial resize shape initial-position layout))
(rx/take-until stoper)) (rx/take-until stoper))
(rx/of (apply-modifiers ids) (rx/of (apply-modifiers ids)