Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-18 21:06:11 -05:00
Code Issues Activity

🐛 Fix guides inside frames issues

Browse source
This commit is contained in:
Alejandro Alonso 2022-12-29 09:44:19 +01:00 • committed by Alonso Torres
parent dcf95a7502
commit d4360be96e
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/app/main/data/workspace/guides.cljs
View file

@ -79,7 +79,7 @@
build-move-event build-move-event
(fn [guide] (fn [guide]
(let [frame (get objects (:frame-id guide)) (let [frame (get objects (:frame-id guide))
frame' (gsh/transform-shape (get object-modifiers (:frame-id guide))) frame' (gsh/transform-shape frame (get-in object-modifiers [(:frame-id guide) :modifiers]))
moved (gpt/to-vec (gpt/point (:x frame) (:y frame)) moved (gpt/to-vec (gpt/point (:x frame) (:y frame))
(gpt/point (:x frame') (:y frame'))) (gpt/point (:x frame') (:y frame')))

3
frontend/src/app/main/ui/workspace/viewport.cljs
View file

@ -437,7 +437,8 @@
{:zoom zoom {:zoom zoom
:vbox vbox :vbox vbox
:hover-frame frame-parent :hover-frame frame-parent
:disabled-guides? disabled-guides?}]) :disabled-guides? disabled-guides?
:modifiers modifiers}])
;; DEBUG LAYOUT DROP-ZONES ;; DEBUG LAYOUT DROP-ZONES
(when (debug? :layout-drop-zones) (when (debug? :layout-drop-zones)

2
frontend/src/app/main/ui/workspace/viewport/guides.cljs
View file

@ -485,7 +485,7 @@
:guide current :guide current
:vbox vbox :vbox vbox
:zoom zoom :zoom zoom
:frame-modifier (get modifiers (:frame-id current)) :frame-modifier (get-in modifiers [(:frame-id current) :modifiers])
:get-hover-frame get-hover-frame :get-hover-frame get-hover-frame
:on-guide-change on-guide-change :on-guide-change on-guide-change
:disabled-guides? disabled-guides?}]))])) :disabled-guides? disabled-guides?}]))]))