From 75a22381d289b2426ea64239c04af648beb3d112 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Wed, 13 Apr 2016 20:55:35 +0300
Subject: [PATCH] Only align when grid is activated.

---
 src/uxbox/ui/workspace/movement.cljs | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/uxbox/ui/workspace/movement.cljs b/src/uxbox/ui/workspace/movement.cljs
index 1d3b49020..dda50a074 100644
--- a/src/uxbox/ui/workspace/movement.cljs
+++ b/src/uxbox/ui/workspace/movement.cljs
@@ -38,9 +38,19 @@
   (-> (l/getter resolve-selected)
       (l/focus-atom st/state)))
 
-(def ^:const ^:privae page-options-l
-  (-> (l/key :options)
-      (l/focus-atom wb/page-l)))
+;; (def ^:const ^:privae page-options-l
+;;   (-> (l/key :options)
+;;       (l/focus-atom wb/page-l)))
+
+(def ^:const ^:private alignment-l
+  (letfn [(getter [state]
+            (let [{:keys [page flags]} (:workspace state)
+                  {:keys [options]} (get-in state [:pages-by-id page])]
+              (and (contains? flags :alignment/indexed)
+                   (contains? flags :grid)
+                   (:grid/align options false))))]
+    (-> (l/getter getter)
+        (l/focus-atom st/state))))
 
 ;; --- Public Api
 
@@ -85,9 +95,7 @@
 (defn- initialize
   []
   (let [shapes @selected-shapes-l
-        options @page-options-l
-        flags @wb/flags-l
-        indexed? (:alignment/indexed flags)
+        align? @alignment-l
         stoper (->> uuc/actions-s
                     (rx/map :type)
                     (rx/filter empty?)
@@ -99,7 +107,7 @@
                  (let [xf (map #(sh/move % delta))]
                    (into [] xf acc))) shapes $)
       (rx/mapcat (fn [items]
-                   (if (and (:grid/align options) indexed?)
+                   (if align?
                      (->> (apply rx/of items)
                           (rx/mapcat align/translate)
                           (rx/reduce conj []))