From 9b862b672f8caac6f2f18f43293c5a0b8d379bac Mon Sep 17 00:00:00 2001
From: "alonso.torres" <alonso.torres@kaleidos.net>
Date: Fri, 11 Mar 2022 16:35:46 +0100
Subject: [PATCH] :sparkles: Show pixel grid

---
 frontend/src/app/main/ui/workspace/header.cljs     | 14 +++++++-------
 frontend/src/app/main/ui/workspace/viewport.cljs   |  3 ++-
 .../app/main/ui/workspace/viewport/selection.cljs  | 11 +++++------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/frontend/src/app/main/ui/workspace/header.cljs b/frontend/src/app/main/ui/workspace/header.cljs
index 4f669687e..b7097bd39 100644
--- a/frontend/src/app/main/ui/workspace/header.cljs
+++ b/frontend/src/app/main/ui/workspace/header.cljs
@@ -346,6 +346,13 @@
            (tr "workspace.header.menu.hide-artboard-names")
            (tr "workspace.header.menu.show-artboard-names"))]]
 
+       [:li {:on-click #(st/emit! (toggle-flag :show-pixel-grid))}
+        [:span
+         (if (contains? layout :show-pixel-grid)
+           (tr "workspace.header.menu.hide-pixel-grid")
+           (tr "workspace.header.menu.show-pixel-grid"))]
+        [:span.shortcut (sc/get-tooltip :show-pixel-grid)]]
+
        [:li {:on-click #(st/emit! (-> (toggle-flag :hide-ui)
                                       (vary-meta assoc ::ev/origin "workspace-menu")))}
         [:span
@@ -376,13 +383,6 @@
            (tr "workspace.header.menu.enable-dynamic-alignment"))]
         [:span.shortcut (sc/get-tooltip :toggle-alignment)]]
 
-       [:li {:on-click #(st/emit! (toggle-flag :show-pixel-grid))}
-        [:span
-         (if (contains? layout :show-pixel-grid)
-           (tr "workspace.header.menu.hide-pixel-grid")
-           (tr "workspace.header.menu.show-pixel-grid"))]
-        [:span.shortcut (sc/get-tooltip :show-pixel-grid)]]
-
        [:li {:on-click #(st/emit! (toggle-flag :snap-pixel-grid))}
         [:span
          (if (contains? layout :snap-pixel-grid)
diff --git a/frontend/src/app/main/ui/workspace/viewport.cljs b/frontend/src/app/main/ui/workspace/viewport.cljs
index 45736a9c6..c43b88c14 100644
--- a/frontend/src/app/main/ui/workspace/viewport.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport.cljs
@@ -149,7 +149,8 @@
         show-gradient-handlers?  (= (count selected) 1)
         show-grids?              (contains? layout :display-grid)
         show-outlines?           (and (nil? transform) (not edition) (not drawing-obj) (not (#{:comments :path :curve} drawing-tool)))
-        show-pixel-grid?         (>= zoom 8)
+        show-pixel-grid?         (and (contains? layout :show-pixel-grid)
+                                      (>= zoom 8))
         show-presence?           page-id
         show-prototypes?         (= options-mode :prototype)
         show-selection-handlers? (seq selected)
diff --git a/frontend/src/app/main/ui/workspace/viewport/selection.cljs b/frontend/src/app/main/ui/workspace/viewport/selection.cljs
index df5332ba7..69fecc4f0 100644
--- a/frontend/src/app/main/ui/workspace/viewport/selection.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/selection.cljs
@@ -256,7 +256,7 @@
         current-transform (mf/deref refs/current-transform)
 
         selrect (:selrect shape)
-        transform (geom/transform-matrix shape {:no-flip true})]
+        transform (gsh/transform-matrix shape {:no-flip true})]
 
     (when (not (#{:move :rotate} current-transform))
       [:g.controls {:pointer-events (if disable-handlers "none" "visible")}
@@ -355,9 +355,9 @@
   (let [shape (mf/use-memo
                (mf/deps shapes)
                #(->> shapes
-                     (map geom/transform-shape)
-                     (geom/selection-rect)
-                     (geom/setup {:type :rect})))]
+                     (map gsh/transform-shape)
+                     (gsh/selection-rect)
+                     (cp/setup-shape)))]
 
     [:& controls-selection
      {:shape shape
@@ -394,8 +394,7 @@
 
 (mf/defc single-selection
   [{:keys [shape zoom color disable-handlers on-move-selected on-context-menu] :as props}]
-  (let [shape (geom/transform-shape shape {:round-coords? false})]
-
+  (let [shape (gsh/transform-shape shape)]
     [:& controls-selection
      {:shape shape
       :zoom zoom