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

Merge pull request #4402 from penpot/hiru-fix-rotation-override

Browse source 
Fix rotation override
This commit is contained in:
Alejandro 2024-04-10 16:03:58 +02:00 • committed by GitHub
commit f6f262f387
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
frontend/src/app/main/data/workspace/modifiers.cljs
View file

@ -46,9 +46,10 @@
;; When the interaction is finished (e.g. user releases mouse button), the ;; When the interaction is finished (e.g. user releases mouse button), the
;; apply-modifiers event is done, that consolidates all modifiers into the base ;; apply-modifiers event is done, that consolidates all modifiers into the base
;; geometric attributes of the shapes. ;; geometric attributes of the shapes.
(defn- check-delta (defn- check-delta
"If the shape is a component instance, check its relative position respect the "If the shape is a component instance, check its relative position and rotation respect
root of the component, and see if it changes after applying a transformation." the root of the component, and see if it changes after applying a transformation."
[shape root transformed-shape transformed-root] [shape root transformed-shape transformed-root]
(let [shape-delta (let [shape-delta
(when root (when root
@ -65,6 +66,11 @@
(gpt/distance-vector shape-delta transformed-shape-delta) (gpt/distance-vector shape-delta transformed-shape-delta)
(gpt/point 0 0)) (gpt/point 0 0))
rotation-delta
(if (and (some? (:rotation shape)) (some? (:rotation shape)))
(- (:rotation transformed-shape) (:rotation shape))
0)
selrect (:selrect shape) selrect (:selrect shape)
transformed-selrect (:selrect transformed-shape)] transformed-selrect (:selrect transformed-shape)]
@ -76,7 +82,8 @@
;; shape position unchanged. But in this case we do not want to ignore it. ;; shape position unchanged. But in this case we do not want to ignore it.
(and (and (< (:x distance) 1) (< (:y distance) 1)) (and (and (< (:x distance) 1) (< (:y distance) 1))
(mth/close? (:width selrect) (:width transformed-selrect)) (mth/close? (:width selrect) (:width transformed-selrect))
(mth/close? (:height selrect) (:height transformed-selrect))))) (mth/close? (:height selrect) (:height transformed-selrect))
(mth/close? rotation-delta 0))))
(defn calculate-ignore-tree (defn calculate-ignore-tree
"Retrieves a map with the flag `ignore-geometry?` given a tree of modifiers" "Retrieves a map with the flag `ignore-geometry?` given a tree of modifiers"