From 61e409a09e91369ae41d0fb614e10388269ff688 Mon Sep 17 00:00:00 2001 From: Pablo Alba Date: Tue, 22 Mar 2022 19:50:20 +0100 Subject: [PATCH] :bug: Pencil cursor changes when activated --- CHANGES.md | 1 + frontend/src/app/main/ui/workspace/viewport/hooks.cljs | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 53b0bdb97..2ac9df048 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -41,6 +41,7 @@ ### :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 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) diff --git a/frontend/src/app/main/ui/workspace/viewport/hooks.cljs b/frontend/src/app/main/ui/workspace/viewport/hooks.cljs index 13ace9df3..28239e312 100644 --- a/frontend/src/app/main/ui/workspace/viewport/hooks.cljs +++ b/frontend/src/app/main/ui/workspace/viewport/hooks.cljs @@ -62,7 +62,10 @@ (mf/use-effect (mf/deps @cursor @alt? @ctrl? @space? panning drawing-tool drawing-path? path-editing?) (fn [] - (let [new-cursor + (let [show-pen? (or (= drawing-tool :path) + (and drawing-path? + (not= drawing-tool :curve))) + new-cursor (cond (and @ctrl? @space?) (utils/get-cursor :zoom) (or panning @space?) (utils/get-cursor :hand) @@ -70,8 +73,7 @@ (= drawing-tool :frame) (utils/get-cursor :create-artboard) (= drawing-tool :rect) (utils/get-cursor :create-rectangle) (= drawing-tool :circle) (utils/get-cursor :create-ellipse) - (or (= drawing-tool :path) - drawing-path?) (utils/get-cursor :pen) + show-pen? (utils/get-cursor :pen) (= drawing-tool :curve) (utils/get-cursor :pencil) drawing-tool (utils/get-cursor :create-shape) (and @alt? (not path-editing?)) (utils/get-cursor :duplicate)