Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-04-05 19:41:27 -05:00
Code Issues Activity

🐛 Fix shape radius type toggle on workspace

Browse source
This commit is contained in:
Andrey Antukh 2023-09-04 12:01:29 +02:00
parent c54deb0218
commit b68b802b6d
2 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
common/src/app/common/types/shape/radius.cljc
View file

@ -51,19 +51,14 @@
(defn switch-to-radius-1
[shape]
(let [r (if (all-equal? shape) (:r1 shape) 0)]
(cond-> shape
(:r1 shape)
(-> (assoc :rx r :ry r)
(dissoc :r1 :r2 :r3 :r4)))))
(-> shape
(assoc :rx r :ry r)
(dissoc :r1 :r2 :r3 :r4))))
(defn switch-to-radius-4
[shape]
(cond-> shape
(:rx shape)
(-> (assoc :r1 (:rx shape)
:r2 (:rx shape)
:r3 (:rx shape)
:r4 (:rx shape))
(let [rx (:rx shape 0)]
(-> (assoc shape :r1 rx :r2 rx :r3 rx :r4 rx)
(dissoc :rx :ry))))
(defn set-radius-1

10
frontend/src/app/main/ui/workspace/sidebar/options/menus/measures.cljs
View file

@ -207,7 +207,7 @@
on-switch-to-radius-1
(mf/use-callback
(mf/deps ids)
(mf/deps ids change-radius)
(fn [_value]
(if all-equal?
(st/emit! (change-radius ctsr/switch-to-radius-1))
@ -215,20 +215,20 @@
on-switch-to-radius-4
(mf/use-callback
(mf/deps ids)
(mf/deps ids change-radius)
(fn [_value]
(st/emit! (change-radius ctsr/switch-to-radius-4))
(reset! radius-multi? false)))
on-radius-1-change
(mf/use-callback
(mf/deps ids)
(mf/deps ids change-radius)
(fn [value]
(st/emit! (change-radius #(ctsr/set-radius-1 % value)))))
on-radius-multi-change
(mf/use-callback
(mf/deps ids)
(mf/deps ids change-radius)
(fn [event]
(let [value (-> event dom/get-target dom/get-value d/parse-integer)]
(when (some? value)
@ -238,7 +238,7 @@
on-radius-4-change
(mf/use-callback
(mf/deps ids)
(mf/deps ids change-radius)
(fn [value attr]
(st/emit! (change-radius #(ctsr/set-radius-4 % attr value)))))