3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-12 18:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3219 from penpot/palba-zoom-picking-color

Browse source 
🐛 Fix zooming while color picker breaks UI
This commit is contained in:
Aitor Moreno 2023-05-22 16:00:33 +02:00 • committed by GitHub
commit 19ce4c1cb7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES.md
View file

@ -1,5 +1,11 @@
# CHANGELOG # CHANGELOG
## 1.18.4
### :bug: Bugs fixed
- Fix zooming while color picker breaks UI [GH #3214](https://github.com/penpot/penpot/issues/3214)
## 1.18.3 ## 1.18.3
### :bug: Bugs fixed ### :bug: Bugs fixed

5
frontend/src/app/main/ui/workspace/viewport/actions.cljs
View file

@ -361,9 +361,10 @@
(fn [event] (fn [event]
(let [event (.getBrowserEvent ^js event) (let [event (.getBrowserEvent ^js event)
target (dom/get-target event) target (dom/get-target event)
mod? (kbd/mod? event)] mod? (kbd/mod? event)
picking-color? (= "pixel-overlay" (.-id target))]
(when (uwvv/inside-viewport? target) (when (or (uwvv/inside-viewport? target) picking-color?)
(dom/prevent-default event) (dom/prevent-default event)
(dom/stop-propagation event) (dom/stop-propagation event)
(let [raw-pt (dom/get-client-position event) (let [raw-pt (dom/get-client-position event)

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

@ -183,7 +183,8 @@
[:* [:*
[:div.pixel-overlay [:div.pixel-overlay
{:tab-index 0 {:id "pixel-overlay"
:tab-index 0
:style {:cursor cur/picker} :style {:cursor cur/picker}
:on-pointer-down handle-pointer-down-picker :on-pointer-down handle-pointer-down-picker
:on-pointer-up handle-pointer-up-picker :on-pointer-up handle-pointer-up-picker

2
version.txt
View file

@ -1 +1 @@
1.18.3 1.18.4