From e3d3751468961ddec7039d751e0b71984e6fcdcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Moya?= <andres.moya@kaleidos.net>
Date: Thu, 16 Apr 2020 15:24:57 +0200
Subject: [PATCH] :tada: Show circle diameter in options form instead of radius

---
 frontend/src/uxbox/main/data/workspace.cljs        |  4 ++--
 .../ui/workspace/sidebar/options/measures.cljs     | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/frontend/src/uxbox/main/data/workspace.cljs b/frontend/src/uxbox/main/data/workspace.cljs
index 9cf9855ce..6ada617f2 100644
--- a/frontend/src/uxbox/main/data/workspace.cljs
+++ b/frontend/src/uxbox/main/data/workspace.cljs
@@ -1875,7 +1875,7 @@
 (defn update-circle-dimensions
   [id attr value]
   (us/verify ::us/uuid id)
-  (us/verify #{::rx ::ry} attr)
+  (us/verify #{:rx :ry} attr)
   (us/verify ::us/number value)
   (ptk/reify ::update-rect-dimensions
     IBatchedChange
@@ -1883,7 +1883,7 @@
     (update [_ state]
       (let [page-id (::page-id state)]
         (update-in state [:workspace-data page-id :objects id]
-                   geom/resize-rect attr value)))))
+                   geom/resize-circle attr value)))))
 
 ;; --- Shape Proportions
 
diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/measures.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/measures.cljs
index 2e084c144..7241a8692 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/measures.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/measures.cljs
@@ -46,7 +46,8 @@
         (fn [event attr]
           (let [value (-> (dom/get-target event)
                           (dom/get-value)
-                          (d/parse-integer 0))]
+                          (d/parse-integer 0)
+                          (/ 2))] ; Convert back to radius before update
             (st/emit! (udw/update-circle-dimensions (:id shape) attr value))))
 
         on-proportion-lock-change
@@ -57,10 +58,9 @@
         (fn [event attr]
           (let [value (-> (dom/get-target event)
                           (dom/get-value)
-                          (d/parse-integer 0))
-                ; Convert back to absolute position before update
-                abs-value (+ value (attr parent))]
-            (st/emit! (udw/update-position (:id shape) {attr abs-value}))))
+                          (d/parse-integer 0)
+                          (+ (attr parent)))] ; Convert back to absolute position before update
+            (st/emit! (udw/update-position (:id shape) {attr value}))))
 
         on-rotation-change
         (fn [event]
@@ -127,14 +127,14 @@
           [:input.input-text {:type "number"
                               :min "0"
                               :on-change on-size-rx-change
-                              :value (str (-> (:rx shape)
+                              :value (str (-> (* 2 (:rx shape)) ; Show to user diameter and not radius
                                               (d/coalesce 0)
                                               (math/round)))}]]
          [:div.input-element.pixels
           [:input.input-text {:type "number"
                               :min "0"
                               :on-change on-size-ry-change
-                              :value (str (-> (:ry shape)
+                              :value (str (-> (* 2 (:ry shape))
                                               (d/coalesce 0)
                                               (math/round)))}]]])