Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-03 04:49:03 -05:00
Code Issues Activity

Merge pull request #1713 from penpot/keep-pencil-cursor

Browse source 
🐛 Pencil cursor changes when activated
This commit is contained in:
Alejandro 2022-03-23 11:47:18 +01:00 • committed by GitHub
commit 7d483b36d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -41,6 +41,7 @@
### :bug: Bugs fixed ### :bug: Bugs fixed
- Pencil cursor changes when activated [Taiga #2276](https://tree.taiga.io/project/penpot/issue/2276)
- Fix icon placement in Mixed message [Taiga #3037](https://tree.taiga.io/project/penpot/issue/3037) - Fix icon placement in Mixed message [Taiga #3037](https://tree.taiga.io/project/penpot/issue/3037)
- Fix scroll in comment section [Taiga #3068](https://tree.taiga.io/project/penpot/issue/3068) - Fix scroll in comment section [Taiga #3068](https://tree.taiga.io/project/penpot/issue/3068)
- Remove a decimal sets value to 0 [Taiga #3059](https://tree.taiga.io/project/penpot/issue/3054) - Remove a decimal sets value to 0 [Taiga #3059](https://tree.taiga.io/project/penpot/issue/3054)

8
frontend/src/app/main/ui/workspace/viewport/hooks.cljs
View file

@ -62,7 +62,10 @@
(mf/use-effect (mf/use-effect
(mf/deps @cursor @alt? @ctrl? @space? panning drawing-tool drawing-path? path-editing?) (mf/deps @cursor @alt? @ctrl? @space? panning drawing-tool drawing-path? path-editing?)
(fn [] (fn []
(let [new-cursor (let [show-pen? (or (= drawing-tool :path)
(and drawing-path?
(not= drawing-tool :curve)))
new-cursor
(cond (cond
(and @ctrl? @space?) (utils/get-cursor :zoom) (and @ctrl? @space?) (utils/get-cursor :zoom)
(or panning @space?) (utils/get-cursor :hand) (or panning @space?) (utils/get-cursor :hand)
@ -70,8 +73,7 @@
(= drawing-tool :frame) (utils/get-cursor :create-artboard) (= drawing-tool :frame) (utils/get-cursor :create-artboard)
(= drawing-tool :rect) (utils/get-cursor :create-rectangle) (= drawing-tool :rect) (utils/get-cursor :create-rectangle)
(= drawing-tool :circle) (utils/get-cursor :create-ellipse) (= drawing-tool :circle) (utils/get-cursor :create-ellipse)
(or (= drawing-tool :path) show-pen? (utils/get-cursor :pen)
drawing-path?) (utils/get-cursor :pen)
(= drawing-tool :curve) (utils/get-cursor :pencil) (= drawing-tool :curve) (utils/get-cursor :pencil)
drawing-tool (utils/get-cursor :create-shape) drawing-tool (utils/get-cursor :create-shape)
(and @alt? (not path-editing?)) (utils/get-cursor :duplicate) (and @alt? (not path-editing?)) (utils/get-cursor :duplicate)