3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-07-26 20:47:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Refactor shapes and selection rendering in order to be aware of rotation.

Browse source
This commit is contained in:
Andrey Antukh 2016-12-25 20:50:04 +01:00
parent 30df813edf
commit c0a81d05eb
No known key found for this signature in database
GPG key ID: 4DFEBCB8316A8B95
9 changed files with 278 additions and 283 deletions
Download patch file Download diff file Expand all files Collapse all files

25
frontend/src/uxbox/main/ui/shapes/rect.cljs
View file

@ -25,21 +25,30 @@
selected? (contains? selected id)
on-mouse-down #(common/on-mouse-down % shape selected)]
[:g.shape {:class (when selected? "selected")
:on-mouse-down on-mouse-down
}
:on-mouse-down on-mouse-down}
(rect-shape shape identity)]))
;; --- Rect Shape
(defn- rotate
[mt {:keys [x1 y1 x2 y2 width height rotation] :as shape}]
(let [x-center (+ x1 (/ width 2))
y-center (+ y1 (/ height 2))
center (gpt/point x-center y-center)]
(gmt/rotate* mt rotation center)))
(mx/defc rect-shape
{:mixins [mx/static]}
[shape]
(let [{:keys [id x1 y1 width height
tmp-resize-xform
tmp-displacement]} (geom/size shape)
[{:keys [id tmp-displacement tmp-resize-xform rotation] :as shape}]
(let [xfmt (cond-> (gmt/matrix)
tmp-displacement (gmt/translate tmp-displacement)
tmp-resize-xform (gmt/multiply tmp-resize-xform))
xfmt (cond-> (or tmp-resize-xform (gmt/matrix))
tmp-displacement (gmt/translate tmp-displacement))
{:keys [x1 y1 width height] :as shape} (-> (geom/transform shape xfmt)
(geom/size))
xfmt (cond-> (gmt/matrix)
(pos? rotation) (rotate shape))
props {:x x1 :y y1 :id id
:width width