diff --git a/src/renderer/filters.cljs b/src/renderer/toolbar/filters.cljs similarity index 98% rename from src/renderer/filters.cljs rename to src/renderer/toolbar/filters.cljs index f25886c6..89b743aa 100644 --- a/src/renderer/filters.cljs +++ b/src/renderer/toolbar/filters.cljs @@ -1,4 +1,4 @@ -(ns renderer.filters) +(ns renderer.toolbar.filters) (def accessibility [{:id :blur diff --git a/src/renderer/toolbar/status.cljs b/src/renderer/toolbar/status.cljs index 3a788ea5..44240c9b 100644 --- a/src/renderer/toolbar/status.cljs +++ b/src/renderer/toolbar/status.cljs @@ -6,7 +6,7 @@ [re-frame.registrar] [renderer.color.views :as color-v] [renderer.components :as comp] - [renderer.filters :as filters] + [renderer.toolbar.filters :as filters] [renderer.utils.keyboard :as keyb] [renderer.utils.units :as units])) diff --git a/src/renderer/tools/box.cljs b/src/renderer/tools/box.cljs index 7b082dd9..20a23c21 100644 --- a/src/renderer/tools/box.cljs +++ b/src/renderer/tools/box.cljs @@ -5,8 +5,8 @@ [clojure.core.matrix :as mat] [re-frame.core :as rf] [renderer.attribute.hierarchy :as hierarchy] - [renderer.overlay :as overlay] [renderer.tools.base :as tools] + [renderer.tools.overlay :as overlay] [renderer.utils.units :as units])) (derive ::tools/box ::tools/element) diff --git a/src/renderer/tools/container/canvas.cljs b/src/renderer/tools/container/canvas.cljs index 3be61fa2..10baaf8c 100644 --- a/src/renderer/tools/container/canvas.cljs +++ b/src/renderer/tools/container/canvas.cljs @@ -3,10 +3,10 @@ (:require [clojure.string :as str] [re-frame.core :as rf] - [renderer.filters :as filters] - [renderer.overlay :as overlay] [renderer.rulers.views :as rulers] + [renderer.toolbar.filters :as filters] [renderer.tools.base :as tools] + [renderer.tools.overlay :as overlay] [renderer.utils.keyboard :as keyb] [renderer.utils.pointer :as pointer])) diff --git a/src/renderer/tools/custom/arc.cljs b/src/renderer/tools/custom/arc.cljs index e13c6ae1..030e306f 100644 --- a/src/renderer/tools/custom/arc.cljs +++ b/src/renderer/tools/custom/arc.cljs @@ -6,8 +6,8 @@ [renderer.attribute.angle :as angle] [renderer.attribute.hierarchy :as hierarchy] [renderer.element.handlers :as element.h] - [renderer.overlay :as overlay] [renderer.tools.base :as tools] + [renderer.tools.overlay :as overlay] [renderer.utils.math :as math] [renderer.utils.pointer :as pointer] [renderer.utils.units :as units])) diff --git a/src/renderer/tools/custom/blob.cljs b/src/renderer/tools/custom/blob.cljs index 47abac61..5008e8c0 100644 --- a/src/renderer/tools/custom/blob.cljs +++ b/src/renderer/tools/custom/blob.cljs @@ -10,8 +10,8 @@ [renderer.attribute.views :as attr.v] [renderer.components :as comp] [renderer.element.handlers :as element.h] - [renderer.overlay :as overlay] [renderer.tools.base :as tools] + [renderer.tools.overlay :as overlay] [renderer.utils.pointer :as pointer] [renderer.utils.units :as units])) diff --git a/src/renderer/tools/draw/brush.cljs b/src/renderer/tools/draw/brush.cljs index aaeb4d99..cf742cc4 100644 --- a/src/renderer/tools/draw/brush.cljs +++ b/src/renderer/tools/draw/brush.cljs @@ -12,8 +12,8 @@ [renderer.element.handlers :as element.h] [renderer.handlers :as handlers] [renderer.history.handlers :as history.h] - [renderer.overlay :as overlay] [renderer.tools.base :as tools] + [renderer.tools.overlay :as overlay] [renderer.utils.pointer :as pointer] [renderer.utils.units :as units])) diff --git a/src/renderer/tools/misc/measure.cljs b/src/renderer/tools/misc/measure.cljs index f9a25f7f..5c831a35 100644 --- a/src/renderer/tools/misc/measure.cljs +++ b/src/renderer/tools/misc/measure.cljs @@ -5,8 +5,8 @@ [re-frame.core :as rf] [renderer.element.handlers :as element.h] [renderer.handlers :as handlers] - [renderer.overlay :as overlay] [renderer.tools.base :as tools] + [renderer.tools.overlay :as overlay] [renderer.utils.units :as units])) (derive :measure ::tools/misc) diff --git a/src/renderer/overlay.cljs b/src/renderer/tools/overlay.cljs similarity index 99% rename from src/renderer/overlay.cljs rename to src/renderer/tools/overlay.cljs index ebfa18cf..6a3f56ee 100644 --- a/src/renderer/overlay.cljs +++ b/src/renderer/tools/overlay.cljs @@ -1,4 +1,4 @@ -(ns renderer.overlay +(ns renderer.tools.overlay "Render functions for canvas overlay objects (select helpers etc)." (:require [clojure.core.matrix :as mat] diff --git a/src/renderer/tools/shape/circle.cljs b/src/renderer/tools/shape/circle.cljs index 8929afbc..11850988 100644 --- a/src/renderer/tools/shape/circle.cljs +++ b/src/renderer/tools/shape/circle.cljs @@ -6,10 +6,10 @@ [re-frame.core :as rf] [renderer.attribute.hierarchy :as attr.hierarchy] [renderer.element.handlers :as element.h] - [renderer.overlay :as overlay] [renderer.tools.base :as tools] - [renderer.utils.units :as units] - [renderer.utils.bounds :as bounds])) + [renderer.tools.overlay :as overlay] + [renderer.utils.bounds :as bounds] + [renderer.utils.units :as units])) (derive :circle ::tools/shape) diff --git a/src/renderer/tools/shape/ellipse.cljs b/src/renderer/tools/shape/ellipse.cljs index 58deca3a..b50180fc 100644 --- a/src/renderer/tools/shape/ellipse.cljs +++ b/src/renderer/tools/shape/ellipse.cljs @@ -6,10 +6,10 @@ [re-frame.core :as rf] [renderer.attribute.hierarchy :as hierarchy] [renderer.element.handlers :as element.h] - [renderer.overlay :as overlay] [renderer.tools.base :as tools] - [renderer.utils.units :as units] - [renderer.utils.bounds :as bounds])) + [renderer.tools.overlay :as overlay] + [renderer.utils.bounds :as bounds] + [renderer.utils.units :as units])) (derive :ellipse ::tools/shape) diff --git a/src/renderer/tools/shape/line.cljs b/src/renderer/tools/shape/line.cljs index f88b1189..60d2df2f 100644 --- a/src/renderer/tools/shape/line.cljs +++ b/src/renderer/tools/shape/line.cljs @@ -8,10 +8,10 @@ [renderer.element.handlers :as element.h] [renderer.handlers :as handlers] [renderer.history.handlers :as history] - [renderer.overlay :as overlay] [renderer.tools.base :as tools] - [renderer.utils.units :as units] - [renderer.utils.bounds :as bounds])) + [renderer.tools.overlay :as overlay] + [renderer.utils.bounds :as bounds] + [renderer.utils.units :as units])) (derive :line ::tools/shape) diff --git a/src/renderer/tools/shape/polyshape.cljs b/src/renderer/tools/shape/polyshape.cljs index d57908ef..2742dd64 100644 --- a/src/renderer/tools/shape/polyshape.cljs +++ b/src/renderer/tools/shape/polyshape.cljs @@ -10,8 +10,8 @@ [renderer.element.handlers :as element.h] [renderer.handlers :as handlers] [renderer.history.handlers :as history] - [renderer.overlay :as overlay] [renderer.tools.base :as tools] + [renderer.tools.overlay :as overlay] [renderer.utils.units :as units])) (derive ::tools/polyshape ::tools/shape) diff --git a/src/renderer/tools/transform/select.cljs b/src/renderer/tools/transform/select.cljs index 3d60de40..7915136b 100644 --- a/src/renderer/tools/transform/select.cljs +++ b/src/renderer/tools/transform/select.cljs @@ -6,8 +6,8 @@ [renderer.element.handlers :as element.h] [renderer.handlers :as handlers] [renderer.history.handlers :as history] - [renderer.overlay :as overlay] [renderer.tools.base :as tools] + [renderer.tools.overlay :as overlay] [renderer.utils.bounds :as bounds] [renderer.utils.pointer :as pointer] [renderer.utils.units :as units])) diff --git a/src/renderer/tools/transform/zoom.cljs b/src/renderer/tools/transform/zoom.cljs index ad9b6266..6d79395d 100644 --- a/src/renderer/tools/transform/zoom.cljs +++ b/src/renderer/tools/transform/zoom.cljs @@ -3,8 +3,8 @@ [renderer.element.handlers :as element.h] [renderer.frame.handlers :as frame] [renderer.handlers :as handlers] - [renderer.overlay :as overlay] - [renderer.tools.base :as tools])) + [renderer.tools.base :as tools] + [renderer.tools.overlay :as overlay])) (derive :zoom ::tools/transform)