Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-03-14 08:41:48 -05:00
Code Issues Activity

🐛 Fix path handler radius

Browse source
This commit is contained in:
alonso.torres 2022-05-10 12:38:29 +02:00 • committed by Andrés Moya
parent 77e9b8aa70
commit 33e776fefe
1 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
frontend/src/app/main/ui/workspace/shapes/path/editor.cljs
View file

@ -25,6 +25,17 @@
[rumext.alpha :as mf]) [rumext.alpha :as mf])
(:import goog.events.EventType)) (:import goog.events.EventType))
(def point-radius 5)
(def point-radius-selected 4)
(def point-radius-active-area 15)
(def point-radius-stroke-width 1)
(def handler-side 6)
(def handler-stroke-width 1)
(def path-preview-dasharray 4)
(def path-snap-stroke-width 1)
(mf/defc path-point [{:keys [position zoom edit-mode hover? selected? preview? start-path? last-p? new-point? curve?]}] (mf/defc path-point [{:keys [position zoom edit-mode hover? selected? preview? start-path? last-p? new-point? curve?]}]
(let [{:keys [x y]} position (let [{:keys [x y]} position
@ -72,8 +83,8 @@
[:circle.path-point [:circle.path-point
{:cx x {:cx x
:cy y :cy y
:r (if (or selected? hover?) (/ 3.5 zoom) (/ 3 zoom)) :r (if (or selected? hover?) (/ point-radius zoom) (/ point-radius-selected zoom))
:style {:stroke-width (/ 1 zoom) :style {:stroke-width (/ point-radius-stroke-width zoom)
:stroke (cond (or selected? hover?) pc/black-color :stroke (cond (or selected? hover?) pc/black-color
preview? pc/secondary-color preview? pc/secondary-color
:else pc/primary-color) :else pc/primary-color)
@ -81,7 +92,7 @@
:else pc/white-color)}}] :else pc/white-color)}}]
[:circle {:cx x [:circle {:cx x
:cy y :cy y
:r (/ 10 zoom) :r (/ point-radius-active-area zoom)
:on-mouse-down on-mouse-down :on-mouse-down on-mouse-down
:on-mouse-enter on-enter :on-mouse-enter on-enter
:on-mouse-leave on-leave :on-mouse-leave on-leave
@ -119,7 +130,7 @@
:x2 x :x2 x
:y2 y :y2 y
:style {:stroke (if hover? pc/black-color pc/gray-color) :style {:stroke (if hover? pc/black-color pc/gray-color)
:stroke-width (/ 1 zoom)}}] :stroke-width (/ point-radius-stroke-width zoom)}}]
(when snap-angle? (when snap-angle?
[:line [:line
@ -128,22 +139,22 @@
:x2 x :x2 x
:y2 y :y2 y
:style {:stroke pc/secondary-color :style {:stroke pc/secondary-color
:stroke-width (/ 1 zoom)}}]) :stroke-width (/ point-radius-stroke-width zoom)}}])
[:rect [:rect
{:x (- x (/ 3 zoom)) {:x (- x (/ handler-side 2 zoom))
:y (- y (/ 3 zoom)) :y (- y (/ handler-side 2 zoom))
:width (/ 6 zoom) :width (/ handler-side zoom)
:height (/ 6 zoom) :height (/ handler-side zoom)
:style {:stroke-width (/ 1 zoom) :style {:stroke-width (/ handler-stroke-width zoom)
:stroke (cond (or selected? hover?) pc/black-color :stroke (cond (or selected? hover?) pc/black-color
:else pc/primary-color) :else pc/primary-color)
:fill (cond selected? pc/primary-color :fill (cond selected? pc/primary-color
:else pc/white-color)}}] :else pc/white-color)}}]
[:circle {:cx x [:circle {:cx x
:cy y :cy y
:r (/ 10 zoom) :r (/ point-radius-active-area zoom)
:on-mouse-down on-mouse-down :on-mouse-down on-mouse-down
:on-mouse-enter on-enter :on-mouse-enter on-enter
:on-mouse-leave on-leave :on-mouse-leave on-leave
@ -156,8 +167,8 @@
(when (not= :move-to (:command command)) (when (not= :move-to (:command command))
[:path {:style {:fill "none" [:path {:style {:fill "none"
:stroke pc/black-color :stroke pc/black-color
:stroke-width (/ 1 zoom) :stroke-width (/ handler-stroke-width zoom)
:stroke-dasharray (/ 4 zoom)} :stroke-dasharray (/ path-preview-dasharray zoom)}
:d (upf/format-path [{:command :move-to :d (upf/format-path [{:command :move-to
:params {:x (:x from) :params {:x (:x from)
:y (:y from)}} :y (:y from)}}
@ -178,7 +189,7 @@
:x2 (:x to) :x2 (:x to)
:y2 (:y to) :y2 (:y to)
:style {:stroke pc/secondary-color :style {:stroke pc/secondary-color
:stroke-width (/ 1 zoom)}}])])) :stroke-width (/ path-snap-stroke-width zoom)}}])]))
(defn matching-handler? [content node handlers] (defn matching-handler? [content node handlers]
(when (= 2 (count handlers)) (when (= 2 (count handlers))