diff --git a/frontend/src/app/main/data/workspace/guides.cljs b/frontend/src/app/main/data/workspace/guides.cljs index ba2db70cf..45a27b757 100644 --- a/frontend/src/app/main/data/workspace/guides.cljs +++ b/frontend/src/app/main/data/workspace/guides.cljs @@ -79,7 +79,7 @@ build-move-event (fn [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)) (gpt/point (:x frame') (:y frame'))) diff --git a/frontend/src/app/main/ui/workspace/viewport.cljs b/frontend/src/app/main/ui/workspace/viewport.cljs index e6888a28e..a44943058 100644 --- a/frontend/src/app/main/ui/workspace/viewport.cljs +++ b/frontend/src/app/main/ui/workspace/viewport.cljs @@ -437,7 +437,8 @@ {:zoom zoom :vbox vbox :hover-frame frame-parent - :disabled-guides? disabled-guides?}]) + :disabled-guides? disabled-guides? + :modifiers modifiers}]) ;; DEBUG LAYOUT DROP-ZONES (when (debug? :layout-drop-zones) diff --git a/frontend/src/app/main/ui/workspace/viewport/guides.cljs b/frontend/src/app/main/ui/workspace/viewport/guides.cljs index 5d158ee22..97aa1d805 100644 --- a/frontend/src/app/main/ui/workspace/viewport/guides.cljs +++ b/frontend/src/app/main/ui/workspace/viewport/guides.cljs @@ -65,7 +65,7 @@ (fn [] (st/emit! (dw/set-hover-guide id false)) (swap! state assoc :hover false))) - + on-pointer-down (mf/use-callback (fn [event] @@ -96,7 +96,7 @@ (mf/use-callback (mf/deps position zoom snap-pixel?) (fn [event] - + (when-let [_ (mf/ref-val dragging-ref)] (let [start-pt (mf/ref-val start-ref) start-pos (mf/ref-val start-pos-ref) @@ -142,7 +142,7 @@ :y (- pos (/ guide-active-area 2)) :width (:width frame) :height guide-active-area} - + (= axis :x) {:x (- pos (/ guide-active-area 2)) :y (+ (:y vbox) rules-pos) @@ -476,7 +476,7 @@ :axis :y :get-hover-frame get-hover-frame :disabled-guides? disabled-guides?}] - + (for [current guides] (when (or (nil? (:frame-id current)) (empty? focus) @@ -485,7 +485,7 @@ :guide current :vbox vbox :zoom zoom - :frame-modifier (get modifiers (:frame-id current)) + :frame-modifier (get-in modifiers [(:frame-id current) :modifiers]) :get-hover-frame get-hover-frame :on-guide-change on-guide-change :disabled-guides? disabled-guides?}]))]))