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

Merge pull request #180 from uxbox/show-circle-diameter

Browse source 
🎉 Show circle diameter in options form instead of radius
This commit is contained in:
Hirunatan 2020-04-16 15:30:14 +02:00 • committed by GitHub
commit 5ea72630e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frontend/src/uxbox/main/data/workspace.cljs
View file

@ -1875,7 +1875,7 @@
(defn update-circle-dimensions (defn update-circle-dimensions
[id attr value] [id attr value]
(us/verify ::us/uuid id) (us/verify ::us/uuid id)
(us/verify #{::rx ::ry} attr) (us/verify #{:rx :ry} attr)
(us/verify ::us/number value) (us/verify ::us/number value)
(ptk/reify ::update-rect-dimensions (ptk/reify ::update-rect-dimensions
IBatchedChange IBatchedChange
@ -1883,7 +1883,7 @@
(update [_ state] (update [_ state]
(let [page-id (::page-id state)] (let [page-id (::page-id state)]
(update-in state [:workspace-data page-id :objects id] (update-in state [:workspace-data page-id :objects id]
geom/resize-rect attr value))))) geom/resize-circle attr value)))))
;; --- Shape Proportions ;; --- Shape Proportions

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

@ -46,7 +46,8 @@
(fn [event attr] (fn [event attr]
(let [value (-> (dom/get-target event) (let [value (-> (dom/get-target event)
(dom/get-value) (dom/get-value)
(d/parse-integer 0))] (d/parse-integer 0)
(/ 2))] ; Convert back to radius before update
(st/emit! (udw/update-circle-dimensions (:id shape) attr value)))) (st/emit! (udw/update-circle-dimensions (:id shape) attr value))))
on-proportion-lock-change on-proportion-lock-change
@ -57,10 +58,9 @@
(fn [event attr] (fn [event attr]
(let [value (-> (dom/get-target event) (let [value (-> (dom/get-target event)
(dom/get-value) (dom/get-value)
(d/parse-integer 0)) (d/parse-integer 0)
; Convert back to absolute position before update (+ (attr parent)))] ; Convert back to absolute position before update
abs-value (+ value (attr parent))] (st/emit! (udw/update-position (:id shape) {attr value}))))
(st/emit! (udw/update-position (:id shape) {attr abs-value}))))
on-rotation-change on-rotation-change
(fn [event] (fn [event]
@ -127,14 +127,14 @@
[:input.input-text {:type "number" [:input.input-text {:type "number"
:min "0" :min "0"
:on-change on-size-rx-change :on-change on-size-rx-change
:value (str (-> (:rx shape) :value (str (-> (* 2 (:rx shape)) ; Show to user diameter and not radius
(d/coalesce 0) (d/coalesce 0)
(math/round)))}]] (math/round)))}]]
[:div.input-element.pixels [:div.input-element.pixels
[:input.input-text {:type "number" [:input.input-text {:type "number"
:min "0" :min "0"
:on-change on-size-ry-change :on-change on-size-ry-change
:value (str (-> (:ry shape) :value (str (-> (* 2 (:ry shape))
(d/coalesce 0) (d/coalesce 0)
(math/round)))}]]]) (math/round)))}]]])