From 1991b44c001cff4e89fb07c5faa0416cbfd7253f Mon Sep 17 00:00:00 2001
From: Aitor <asakon28@gmail.com>
Date: Mon, 22 Jan 2024 18:22:18 +0100
Subject: [PATCH] :bug: Fix toolbar not centered in workspace

---
 frontend/src/app/main/ui/workspace.cljs       |  2 --
 .../src/app/main/ui/workspace/viewport.cljs   |  5 ++--
 .../main/ui/workspace/viewport/top_bar.cljs   | 24 ++++++++++++-------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/frontend/src/app/main/ui/workspace.cljs b/frontend/src/app/main/ui/workspace.cljs
index c12f88a18..8363e438f 100644
--- a/frontend/src/app/main/ui/workspace.cljs
+++ b/frontend/src/app/main/ui/workspace.cljs
@@ -29,7 +29,6 @@
    [app.main.ui.workspace.sidebar :refer [left-sidebar right-sidebar]]
    [app.main.ui.workspace.sidebar.collapsable-button :refer [collapsed-button]]
    [app.main.ui.workspace.sidebar.history :refer [history-toolbox]]
-   [app.main.ui.workspace.top-toolbar :refer [top-toolbar]]
    [app.main.ui.workspace.viewport :refer [viewport]]
    [app.util.debug :as dbg]
    [app.util.dom :as dom]
@@ -110,7 +109,6 @@
 
      (when-not hide-ui?
        [:*
-        [:& top-toolbar {:layout layout}]
         (if (:collapse-left-sidebar layout)
           [:& collapsed-button]
           [:& left-sidebar {:layout layout
diff --git a/frontend/src/app/main/ui/workspace/viewport.cljs b/frontend/src/app/main/ui/workspace/viewport.cljs
index 7fdc82f6c..23c5714e8 100644
--- a/frontend/src/app/main/ui/workspace/viewport.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport.cljs
@@ -274,6 +274,7 @@
     (hooks/setup-active-frames base-objects hover-ids selected active-frames zoom transform vbox)
 
     [:div.viewport {:style #js {"--zoom" zoom}}
+     [:& top-bar/top-bar {:layout layout}]
      [:div.viewport-overlays
       ;; The behaviour inside a foreign object is a bit different that in plain HTML so we wrap
       ;; inside a foreign object "dummy" so this awkward behaviour is take into account
@@ -302,9 +303,7 @@
                                          :vbox vbox
                                          :options options
                                          :layout layout
-                                         :viewport-ref viewport-ref}])
-
-      [:& top-bar/top-bar]]
+                                         :viewport-ref viewport-ref}])]
 
      [:svg.render-shapes
       {:id "render"
diff --git a/frontend/src/app/main/ui/workspace/viewport/top_bar.cljs b/frontend/src/app/main/ui/workspace/viewport/top_bar.cljs
index 04eeb79d1..d7b7776f7 100644
--- a/frontend/src/app/main/ui/workspace/viewport/top_bar.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/top_bar.cljs
@@ -13,6 +13,7 @@
    [app.main.refs :as refs]
    [app.main.store :as st]
    [app.main.ui.context :as ctx]
+   [app.main.ui.workspace.top-toolbar :refer [top-toolbar]]
    [app.main.ui.workspace.viewport.grid-layout-editor :refer [grid-edition-actions]]
    [app.main.ui.workspace.viewport.path-actions :refer [path-actions]]
    [app.util.i18n :as i18n :refer [tr]]
@@ -36,7 +37,7 @@
 
 (mf/defc top-bar
   {::mf/wrap [mf/memo]}
-  []
+  [{:keys [layout]}]
   (let [edition     (mf/deref refs/selected-edition)
         selected    (mf/deref refs/selected-objects)
         drawing     (mf/deref refs/workspace-drawing)
@@ -50,6 +51,7 @@
                         (not= :curve (:tool drawing)))
 
         workspace-read-only? (mf/use-ctx ctx/workspace-read-only?)
+        hide-ui?       (:hide-ui layout)
 
         path-edition? (or (and single? editing?
                                (and (not (cfh/text-shape? shape))
@@ -58,13 +60,17 @@
 
         grid-edition? (and single? editing? (ctl/grid-layout? shape))]
 
-    (cond
-      workspace-read-only?
-      [:& view-only-actions]
+    [:*
+     (when-not hide-ui?
+       [:& top-toolbar {:layout layout}])
 
-      path-edition?
-      [:div.viewport-actions
-       [:& path-actions {:shape shape}]]
+     (cond
+       workspace-read-only?
+       [:& view-only-actions]
 
-      grid-edition?
-      [:& grid-edition-actions {:shape shape}])))
+       path-edition?
+       [:div.viewport-actions
+        [:& path-actions {:shape shape}]]
+
+       grid-edition?
+       [:& grid-edition-actions {:shape shape}])]))