From a5554b51cd2c6cdc460fc3b0eabc87ac710e428c Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Wed, 11 Jan 2017 21:06:29 +0100
Subject: [PATCH] Fix path drawing.

---
 frontend/src/uxbox/main/ui/shapes.cljs                    | 2 +-
 frontend/src/uxbox/main/ui/shapes/attrs.cljs              | 6 ++++--
 .../src/uxbox/main/ui/workspace/sidebar/drawtools.cljs    | 8 ++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/frontend/src/uxbox/main/ui/shapes.cljs b/frontend/src/uxbox/main/ui/shapes.cljs
index 3c72a50c9..6a0890fa2 100644
--- a/frontend/src/uxbox/main/ui/shapes.cljs
+++ b/frontend/src/uxbox/main/ui/shapes.cljs
@@ -2,7 +2,7 @@
 ;; License, v. 2.0. If a copy of the MPL was not distributed with this
 ;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 ;;
-;; Copyright (c) 2016 Andrey Antukh <niwi@niwi.nz>
+;; Copyright (c) 2016-2017 Andrey Antukh <niwi@niwi.nz>
 
 (ns uxbox.main.ui.shapes
   (:require [uxbox.main.ui.shapes.group :as group]))
diff --git a/frontend/src/uxbox/main/ui/shapes/attrs.cljs b/frontend/src/uxbox/main/ui/shapes/attrs.cljs
index da55e4e89..10d2ade0e 100644
--- a/frontend/src/uxbox/main/ui/shapes/attrs.cljs
+++ b/frontend/src/uxbox/main/ui/shapes/attrs.cljs
@@ -42,8 +42,10 @@
 
 (defn- transform-stroke-attrs
   [{:keys [stroke-style] :or {stroke-style :none} :as attrs}]
-  (if (= stroke-style :none)
-    (dissoc attrs :stroke-style :stroke-width :stroke-opacity :stroke-color)
+  (case stroke-style
+    :none (dissoc attrs :stroke-style :stroke-width :stroke-opacity :stroke-color)
+    :solid (-> (merge shape-default-attrs attrs)
+               (dissoc :stroke-style))
     (-> (merge shape-default-attrs attrs)
         (assoc :stroke-dasharray (stroke-type->dasharray stroke-style))
         (dissoc :stroke-style))))
diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/drawtools.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/drawtools.cljs
index 2b6cf3bcd..5e37a075f 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/drawtools.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/drawtools.cljs
@@ -34,7 +34,7 @@
 (def +draw-tool-rect+
   {:type :rect
    :name "Rect"
-   :stroke "#000000"})
+   :stroke-color "#000000"})
 
 (def +draw-tool-circle+
   {:type :circle
@@ -43,10 +43,10 @@
 (def +draw-tool-path+
   {:type :path
    :name "Path"
-   :stroke-type :solid
-   :stroke "#000000"
+   :stroke-style :solid
+   :stroke-color "#000000"
    :stroke-width 2
-   :fill "#000000"
+   :fill-color "#000000"
    :fill-opacity 0
    ;; :close? true
    :points []})