From 391b926397ec7ef97d6a9e864f93c584d9d2c856 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Fri, 31 Jan 2020 11:16:30 +0100 Subject: [PATCH] :bug: Fix circle dimensions update. --- frontend/src/uxbox/main/geom.cljs | 9 ++++++--- .../uxbox/main/ui/workspace/sidebar/options/circle.cljs | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/frontend/src/uxbox/main/geom.cljs b/frontend/src/uxbox/main/geom.cljs index b3a2a34fba..b3433a53c1 100644 --- a/frontend/src/uxbox/main/geom.cljs +++ b/frontend/src/uxbox/main/geom.cljs @@ -203,8 +203,12 @@ instead of absolute positions." [shape opts] (case (:type shape) - :cirle (resize-dim-circle shape opts) - (resize-dim-rect shape opts))) + :rect (resize-dim-rect shape opts) + :canvas (resize-dim-rect shape opts) + :icon (resize-dim-rect shape opts) + :image (resize-dim-rect shape opts) + :text (resize-dim-rect shape opts) + :circle (resize-dim-circle shape opts))) (defn- resize-dim-rect [{:keys [proportion proportion-lock x y] :as shape} @@ -224,7 +228,6 @@ (defn- resize-dim-circle [{:keys [proportion proportion-lock] :as shape} {:keys [rx ry]}] - {:pre [(not (and rx ry))]} (if-not proportion-lock (if rx (assoc shape :rx rx) diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/circle.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/circle.cljs index ecebc54e37..0caa53dd12 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/circle.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/circle.cljs @@ -73,7 +73,7 @@ :on-change on-size-rx-change :value (-> (:rx shape) (math/precision 2) - (d/coalesce-str "0"))}]] + (d/coalesce-str "0"))}]] [:div.lock-size {:class (when (:proportion-lock shape) "selected") :on-click on-proportion-lock-change} (if (:proportion-lock shape)