From e95c1c76c086e16453d0889130fee78d18b95132 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 24 Aug 2016 17:10:46 +0300 Subject: [PATCH] Minor code cleaning on assisted path drawing code. --- src/uxbox/main/ui/workspace/drawarea.cljs | 24 ++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/uxbox/main/ui/workspace/drawarea.cljs b/src/uxbox/main/ui/workspace/drawarea.cljs index d1ff44aaa9..52b7380878 100644 --- a/src/uxbox/main/ui/workspace/drawarea.cljs +++ b/src/uxbox/main/ui/workspace/drawarea.cljs @@ -176,18 +176,24 @@ (swap! counter inc) (reset! drawing-shape shape))) - (on-draw [[point ctrl?]] - (if ctrl? - (let [center (get-in @drawing-shape [:points (dec @counter)]) - point (as-> point $ - (gpt/subtract $ center) - (align-position (gpt/angle $) $) - (gpt/add $ center))] - (->> (update-point @drawing-shape point @counter) - (reset! drawing-shape))) + (on-assisted-draw [point] + (let [center (get-in @drawing-shape [:points (dec @counter)]) + point (as-> point $ + (gpt/subtract $ center) + (align-position (gpt/angle $) $) + (gpt/add $ center))] (->> (update-point @drawing-shape point @counter) (reset! drawing-shape)))) + (on-free-draw [point] + (->> (update-point @drawing-shape point @counter) + (reset! drawing-shape))) + + (on-draw [[point ctrl?]] + (if ctrl? + (on-assisted-draw point) + (on-free-draw point))) + (on-end [] (let [shape (normalize-shape @drawing-shape)] (rs/emit! (uds/add-shape shape)