mirror of
https://github.com/penpot/penpot.git
synced 2026-09-10 14:09:17 +00:00
Merge pull request #7121 from penpot/superalex-fix-set-corners
🐛 Fix set corners
This commit is contained in:
commit
fc6b64aa68
@ -372,17 +372,13 @@
|
|||||||
(h/call wasm/internal-module "_set_shape_blur" type hidden value)))
|
(h/call wasm/internal-module "_set_shape_blur" type hidden value)))
|
||||||
|
|
||||||
(defn set-shape-corners
|
(defn set-shape-corners
|
||||||
[shape]
|
[corners]
|
||||||
(let [r1 (dm/get-prop shape :r1)]
|
(let [[r1 r2 r3 r4] corners]
|
||||||
(when (some? r1)
|
(h/call wasm/internal-module "_set_shape_corners"
|
||||||
(let [r2 (dm/get-prop shape :r2)
|
(d/nilv r1 0)
|
||||||
r3 (dm/get-prop shape :r3)
|
(d/nilv r2 0)
|
||||||
r4 (dm/get-prop shape :r4)]
|
(d/nilv r3 0)
|
||||||
(h/call wasm/internal-module "_set_shape_corners"
|
(d/nilv r4 0))))
|
||||||
(d/nilv r1 0)
|
|
||||||
(d/nilv r2 0)
|
|
||||||
(d/nilv r3 0)
|
|
||||||
(d/nilv r4 0))))))
|
|
||||||
|
|
||||||
(defn set-flex-layout
|
(defn set-flex-layout
|
||||||
[shape]
|
[shape]
|
||||||
@ -705,7 +701,11 @@
|
|||||||
grow-type (dm/get-prop shape :grow-type)
|
grow-type (dm/get-prop shape :grow-type)
|
||||||
blur (dm/get-prop shape :blur)
|
blur (dm/get-prop shape :blur)
|
||||||
svg-attrs (dm/get-prop shape :svg-attrs)
|
svg-attrs (dm/get-prop shape :svg-attrs)
|
||||||
shadows (dm/get-prop shape :shadow)]
|
shadows (dm/get-prop shape :shadow)
|
||||||
|
r1 (dm/get-prop shape :r1)
|
||||||
|
r2 (dm/get-prop shape :r2)
|
||||||
|
r3 (dm/get-prop shape :r3)
|
||||||
|
r4 (dm/get-prop shape :r4)]
|
||||||
|
|
||||||
(use-shape id)
|
(use-shape id)
|
||||||
(set-parent-id parent-id)
|
(set-parent-id parent-id)
|
||||||
@ -719,7 +719,7 @@
|
|||||||
(set-shape-opacity opacity)
|
(set-shape-opacity opacity)
|
||||||
(set-shape-hidden hidden)
|
(set-shape-hidden hidden)
|
||||||
(set-shape-children children)
|
(set-shape-children children)
|
||||||
(set-shape-corners shape)
|
(set-shape-corners [r1 r2 r3 r4])
|
||||||
(when (and (= type :group) masked)
|
(when (and (= type :group) masked)
|
||||||
(set-masked masked))
|
(set-masked masked))
|
||||||
(when (some? blur)
|
(when (some? blur)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user