3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-29 08:46:49 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/staging' into develop

Browse source
This commit is contained in:
Andrey Antukh 2025-02-06 12:57:33 +01:00
commit 8b466ef0a3
8 changed files with 45 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
frontend/src/app/main/ui/workspace/colorpicker.cljs
View file

@ -181,7 +181,8 @@
(when (or (not= (str/lower (:hex color)) (str/lower (:hex current-color)))
(not= (:h color) (:h current-color))
(not= (:s color) (:s current-color))
(not= (:v color) (:v current-color)))
(not= (:v color) (:v current-color))
(not= (:alpha color) (:alpha current-color)))
(let [recent-color (merge current-color color)
recent-color (dc/materialize-color-components recent-color)]
(st/emit! (dc/update-colorpicker-color recent-color (not @drag?)))))))

1
frontend/src/app/main/ui/workspace/colorpicker/slider_selector.cljs
View file

@ -57,6 +57,7 @@
:hue (= type :hue)
:opacity (= type :opacity)
:value (= type :value)))
:data-testid (when (= type :opacity) "slider-opacity")
:on-pointer-down handle-start-drag
:on-pointer-up handle-stop-drag
:on-lost-pointer-capture handle-stop-drag

2
frontend/src/app/plugins/shape.cljs
View file

@ -954,7 +954,7 @@
:else
(do (st/emit! (dwsl/create-layout-from-id id :flex :from-frame? true :calculate-params? false))
(grid/grid-layout-proxy plugin-id file-id page-id id)))))
(flex/flex-layout-proxy plugin-id file-id page-id id)))))
:addGridLayout
(fn []