Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-28 09:30:07 -05:00
Code Issues Activity

Cosmetic changes on drawarea ns.

Browse source
This commit is contained in:
Andrey Antukh 2016-08-01 20:54:11 +03:00
parent 56d64cf737
commit ffa9d0e8d1
No known key found for this signature in database
GPG key ID: 4DFEBCB8316A8B95
1 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/uxbox/main/ui/workspace/drawarea.cljs
View file

@ -7,18 +7,17 @@
(ns uxbox.main.ui.workspace.drawarea (ns uxbox.main.ui.workspace.drawarea
(:require [sablono.core :as html :refer-macros [html]] (:require [sablono.core :as html :refer-macros [html]]
[rum.core :as rum]
[beicon.core :as rx] [beicon.core :as rx]
[lentes.core :as l] [lentes.core :as l]
[uxbox.main.constants :as c]
[uxbox.util.rstore :as rs] [uxbox.util.rstore :as rs]
[uxbox.util.mixins :as mx :include-macros true]
[uxbox.main.constants :as c]
[uxbox.main.state :as st] [uxbox.main.state :as st]
[uxbox.main.data.workspace :as udw] [uxbox.main.data.workspace :as udw]
[uxbox.main.data.shapes :as uds] [uxbox.main.data.shapes :as uds]
[uxbox.main.ui.core :as uuc] [uxbox.main.ui.core :as uuc]
[uxbox.main.ui.shapes :as shapes] [uxbox.main.ui.shapes :as shapes]
[uxbox.main.ui.workspace.base :as wb] [uxbox.main.ui.workspace.base :as wb]
[uxbox.util.mixins :as mx]
[uxbox.main.geom :as geom] [uxbox.main.geom :as geom]
[uxbox.main.geom.point :as gpt] [uxbox.main.geom.point :as gpt]
[uxbox.util.dom :as dom])) [uxbox.util.dom :as dom]))
@ -32,15 +31,6 @@
(declare watch-draw-actions) (declare watch-draw-actions)
(defn- draw-area-render
[own]
(let [shape (mx/react drawing-shape)
position (mx/react drawing-position)]
(when (and shape position)
(-> (assoc shape :drawing? true)
(geom/resize position)
(shapes/render-component)))))
(defn- draw-area-will-mount (defn- draw-area-will-mount
[own] [own]
(assoc own ::sub (watch-draw-actions))) (assoc own ::sub (watch-draw-actions)))
@ -50,13 +40,17 @@
(.close (::sub own)) (.close (::sub own))
(dissoc own ::sub)) (dissoc own ::sub))
(def draw-area (mx/defc draw-area
(mx/component {:will-mount draw-area-will-mount
{:render draw-area-render :will-unmount draw-area-will-unmount
:name "draw-area" :mixins [mx/static mx/reactive]}
:will-mount draw-area-will-mount [own]
:will-unmount draw-area-will-unmount (let [shape (mx/react drawing-shape)
:mixins [mx/static mx/reactive]})) position (mx/react drawing-position)]
(when (and shape position)
(-> (assoc shape :drawing? true)
(geom/resize position)
(shapes/render-component)))))
;; --- Drawing Logic ;; --- Drawing Logic