johanels/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-12-12 06:24:17 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge pull request #7285 from penpot/superalex-fix-cornder-radius

Browse Source 
🐛 Fix corner radius
This commit is contained in:
Elena Torró
2025-09-10 14:59:06 +02:00
committed by GitHub
parent 563f608255 41751d60d2
commit 534c7864fc
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
frontend/src/app/render_wasm/api.cljs
View File

@@ -378,16 +378,9 @@
(h/call wasm/internal-module "_set_shape_blur" type hidden value)))
(defn set-shape-corners
[shape]
(let [r1 (get shape :r1)
r2 (get shape :r2)
r3 (get shape :r3)
r4 (get shape :r4)]
(h/call wasm/internal-module "_set_shape_corners"
(d/nilv r1 0)
(d/nilv r2 0)
(d/nilv r3 0)
(d/nilv r4 0))))
[corners]
(let [[r1 r2 r3 r4] (map #(d/nilv % 0) corners)]
(h/call wasm/internal-module "_set_shape_corners" r1 r2 r3 r4)))
(defn set-flex-layout
[shape]
@@ -747,7 +740,8 @@
grow-type (get shape :grow-type)
blur (get shape :blur)
svg-attrs (get shape :svg-attrs)
shadows (get shape :shadow)]
shadows (get shape :shadow)
corners (map #(get shape %) [:r1 :r2 :r3 :r4])]
(use-shape id)
(set-parent-id parent-id)
@@ -761,7 +755,7 @@
(set-shape-opacity opacity)
(set-shape-hidden hidden)
(set-shape-children children)
(set-shape-corners shape)
(set-shape-corners corners)
(when (and (= type :group) masked)
(set-masked masked))
(when (some? blur)

16
frontend/src/app/render_wasm/shape.cljs
View File

@@ -145,11 +145,17 @@
:constraints-h (api/set-constraints-h v)
:constraints-v (api/set-constraints-v v)
(:r1 :r2 :r3 :r4)
(api/set-shape-corners [(dm/get-prop shape :r1)
(dm/get-prop shape :r2)
(dm/get-prop shape :r3)
(dm/get-prop shape :r4)])
:r1
(api/set-shape-corners [v (dm/get-prop shape :r2) (dm/get-prop shape :r3) (dm/get-prop shape :r4)])
:r2
(api/set-shape-corners [(dm/get-prop shape :r1) v (dm/get-prop shape :r3) (dm/get-prop shape :r4)])
:r3
(api/set-shape-corners [(dm/get-prop shape :r1) (dm/get-prop shape :r2) v (dm/get-prop shape :r4)])
:r4
(api/set-shape-corners [(dm/get-prop shape :r1) (dm/get-prop shape :r2) (dm/get-prop shape :r3) v])
:svg-attrs
(when (= (:type shape) :path)