Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-13 10:38:13 -05:00
Code Issues Activity

Merge pull request #216 from uxbox/397/fixes_rotation

Browse source 
🐛 Fixes problem with rotation input
This commit is contained in:
Hirunatan 2020-05-19 09:21:52 +02:00 • committed by GitHub
commit d54b5509bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
frontend/src/uxbox/main/data/workspace/transforms.cljs
View file

@ -357,29 +357,32 @@
;; Set-rotation is custom because applies different modifiers to each shape adjusting their position
(defn set-rotation
[delta-rotation shapes center]
(ptk/reify ::set-rotation
dwc/IUpdateGroup
(get-ids [_] (map :id shapes))
([delta-rotation shapes]
(set-rotation delta-rotation shapes (-> shapes gsh/selection-rect gsh/center)))
ptk/UpdateEvent
(update [_ state]
(let [page-id (:current-page-id state)]
(letfn [(rotate-shape [state angle shape center]
(let [objects (get-in state [:workspace-data page-id :objects])
path [:workspace-data page-id :objects (:id shape) :modifiers]
modifiers (rotation-modifiers center shape angle)]
(-> state
(update-in path merge modifiers))))
([delta-rotation shapes center]
(ptk/reify ::set-rotation
dwc/IUpdateGroup
(get-ids [_] (map :id shapes))
(rotate-around-center [state angle center shapes]
(reduce #(rotate-shape %1 angle %2 center) state shapes))]
ptk/UpdateEvent
(update [_ state]
(let [page-id (:current-page-id state)]
(letfn [(rotate-shape [state angle shape center]
(let [objects (get-in state [:workspace-data page-id :objects])
path [:workspace-data page-id :objects (:id shape) :modifiers]
modifiers (rotation-modifiers center shape angle)]
(-> state
(update-in path merge modifiers))))
(let [objects (get-in state [:workspace-data page-id :objects])
id->obj #(get objects %)
get-children (fn [shape] (map id->obj (cp/get-children (:id shape) objects)))
shapes (concat shapes (mapcat get-children shapes))]
(rotate-around-center state delta-rotation center shapes)))))))
(rotate-around-center [state angle center shapes]
(reduce #(rotate-shape %1 angle %2 center) state shapes))]
(let [objects (get-in state [:workspace-data page-id :objects])
id->obj #(get objects %)
get-children (fn [shape] (map id->obj (cp/get-children (:id shape) objects)))
shapes (concat shapes (mapcat get-children shapes))]
(rotate-around-center state delta-rotation center shapes))))))))
(defn apply-modifiers
[ids]

34
frontend/src/uxbox/main/ui/workspace/sidebar/options/measures.cljs
View file

@ -34,24 +34,27 @@
dx (- rec-x sel-x)
dy (- rec-y sel-y)]
(gpt/point dx dy)))
(-> (gpt/point dx dy)
(gpt/round 2))))
(defn user->draw
[{:keys [x y width height] :as shape}]
(let [dv (user-coords-vector shape)]
(-> shape (gsh/move dv))))
(-> shape
(gsh/move dv))))
(defn draw->user
[{:keys [x y width height] :as shape}]
(let [dv (user-coords-vector shape)]
(-> shape (gsh/move (gpt/negate dv)))))
(-> shape
(gsh/move (gpt/negate dv)))))
(mf/defc measures-menu
[{:keys [shape options] :as props}]
(let [options (or options #{:size :position :rotation :radius})
locale (i18n/use-locale)
frame (deref (refs/object-by-id (:frame-id shape)))
old-shape shape
shape (->> shape
(gsh/transform-shape frame)
(draw->user))
@ -83,7 +86,7 @@
(let [value (-> (dom/get-target event)
(dom/get-value)
(d/parse-integer 0))]
(st/emit! (udw/set-rotation (- value (:rotation shape)) [shape])
(st/emit! (udw/set-rotation (- value (:rotation shape)) [old-shape])
(udw/apply-modifiers #{(:id shape)}))))
on-radius-change
@ -138,21 +141,13 @@
:type "number"
:no-validate true
:on-change on-pos-x-change
:value (:x shape)
;;:value (str (-> (- (x shape) (:x parent)) ; Show to user position relative to frame
;; (d/coalesce 0)
;; (math/round)))
}]]
:value (:x shape)}]]
[:div.input-element.Yaxis
[:input.input-text {:placeholder "y"
:type "number"
:no-validate true
:on-change on-pos-y-change
:value (:y shape)
;;:value (str (-> (- (y shape) (:y parent))
;; (d/coalesce 0)
;; (math/round)))
}]]])
:value (:y shape)}]]])
(when (options :rotation)
[:div.row-flex
@ -163,7 +158,7 @@
:type "number"
:no-validate true
:min "0"
:max "360"
:max "359"
:on-change on-rotation-change
:value (str (-> (:rotation shape)
(d/coalesce 0)
@ -171,12 +166,13 @@
[:input.slidebar
{:type "range"
:min "0"
:max "360"
:step "1"
:max "359"
:step "10"
:no-validate true
:on-change on-rotation-change
:value (str (-> (:rotation shape)
(d/coalesce 0)))}]])
(d/coalesce 0)
(math/round)))}]])
(when (options :radius)
[:div.row-flex