From 3df32e903f992cc4eea238786377d4970c5252ba Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Fri, 21 Oct 2016 00:20:34 +0200 Subject: [PATCH] Add `:icon-raw` to geom impls. --- src/uxbox/main/geom.cljs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/uxbox/main/geom.cljs b/src/uxbox/main/geom.cljs index f04c52594f..c5250275b3 100644 --- a/src/uxbox/main/geom.cljs +++ b/src/uxbox/main/geom.cljs @@ -38,10 +38,10 @@ [shape dpoint] (case (:type shape) :icon (move-rect shape dpoint) + :icon-raw (move-rect shape dpoint) :rect (move-rect shape dpoint) :text (move-rect shape dpoint) :path (move-path shape dpoint) - ;; :path (move-rect shape dpoint) :circle (move-circle shape dpoint) :group (move-group shape dpoint))) @@ -141,6 +141,7 @@ :text (size-rect shape) :rect (size-rect shape) :icon (size-rect shape) + :icon-raw (size-rect shape) :image (size-rect shape) :path (size-rect shape))) @@ -201,6 +202,7 @@ :rect (move-rect-vertex shape vid dpoint) :text (move-rect-vertex shape vid dpoint) :icon (move-rect-vertex shape vid dpoint) + :icon-raw (move-rect-vertex shape vid dpoint) :path (move-rect-vertex shape vid dpoint) :circle (move-circle-vertex shape vid dpoint))) @@ -281,11 +283,14 @@ (declare setup-proportions-rect) +;; FIXME: improve proportions setup for icons. + (defn setup-proportions [shape] (case (:type shape) :rect (setup-proportions-rect shape) :icon (setup-proportions-rect shape) + :icon-raw (setup-proportions-rect shape) :circle (setup-proportions-rect shape) shape)) @@ -354,6 +359,7 @@ (case (:type shape) :rect (resize-rect shape point) :icon (resize-rect shape point) + :icon-raw (resize-rect shape point) :text (resize-rect shape point) :path (resize-rect shape point) :circle (resize-circle shape point))) @@ -423,6 +429,7 @@ (case (:type shape) :rect (setup-rect shape props) :icon (setup-rect shape props) + :icon-raw (setup-rect shape props) :text (setup-rect shape props) :circle (setup-circle shape props) :group (setup-group shape props))) @@ -530,6 +537,7 @@ :rect (generic-outer-rect state shape) :text (generic-outer-rect state shape) :icon (generic-outer-rect state shape) + :icon-raw (generic-outer-rect state shape) ;; :path (generic-outer-rect state shape) :path (path-outer-rect state shape) :circle (circle-outer-rect state shape) @@ -679,6 +687,7 @@ :text (text-transformation-matrix state shape) :circle (circle-transformation-matrix state shape) :icon (icon-transformation-matrix state shape) + :icon-raw (icon-transformation-matrix state shape) :image (icon-transformation-matrix state shape) :path (path-transformation-matrix state shape) :group (group-transformation-matrix state shape))))