3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-06 15:41:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix toolbar not centered in workspace

Browse source
This commit is contained in:
Aitor 2024-01-22 18:22:18 +01:00
parent e6fcb418b1
commit 1991b44c00
3 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/app/main/ui/workspace.cljs
View file

@ -29,7 +29,6 @@
[app.main.ui.workspace.sidebar :refer [left-sidebar right-sidebar]] [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.collapsable-button :refer [collapsed-button]]
[app.main.ui.workspace.sidebar.history :refer [history-toolbox]] [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.main.ui.workspace.viewport :refer [viewport]]
[app.util.debug :as dbg] [app.util.debug :as dbg]
[app.util.dom :as dom] [app.util.dom :as dom]
@ -110,7 +109,6 @@
(when-not hide-ui? (when-not hide-ui?
[:* [:*
[:& top-toolbar {:layout layout}]
(if (:collapse-left-sidebar layout) (if (:collapse-left-sidebar layout)
[:& collapsed-button] [:& collapsed-button]
[:& left-sidebar {:layout layout [:& left-sidebar {:layout layout

5
frontend/src/app/main/ui/workspace/viewport.cljs
View file

@ -274,6 +274,7 @@
(hooks/setup-active-frames base-objects hover-ids selected active-frames zoom transform vbox) (hooks/setup-active-frames base-objects hover-ids selected active-frames zoom transform vbox)
[:div.viewport {:style #js {"--zoom" zoom}} [:div.viewport {:style #js {"--zoom" zoom}}
[:& top-bar/top-bar {:layout layout}]
[:div.viewport-overlays [:div.viewport-overlays
;; The behaviour inside a foreign object is a bit different that in plain HTML so we wrap ;; 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 ;; inside a foreign object "dummy" so this awkward behaviour is take into account
@ -302,9 +303,7 @@
:vbox vbox :vbox vbox
:options options :options options
:layout layout :layout layout
:viewport-ref viewport-ref}]) :viewport-ref viewport-ref}])]
[:& top-bar/top-bar]]
[:svg.render-shapes [:svg.render-shapes
{:id "render" {:id "render"

10
frontend/src/app/main/ui/workspace/viewport/top_bar.cljs
View file

@ -13,6 +13,7 @@
[app.main.refs :as refs] [app.main.refs :as refs]
[app.main.store :as st] [app.main.store :as st]
[app.main.ui.context :as ctx] [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.grid-layout-editor :refer [grid-edition-actions]]
[app.main.ui.workspace.viewport.path-actions :refer [path-actions]] [app.main.ui.workspace.viewport.path-actions :refer [path-actions]]
[app.util.i18n :as i18n :refer [tr]] [app.util.i18n :as i18n :refer [tr]]
@ -36,7 +37,7 @@
(mf/defc top-bar (mf/defc top-bar
{::mf/wrap [mf/memo]} {::mf/wrap [mf/memo]}
[] [{:keys [layout]}]
(let [edition (mf/deref refs/selected-edition) (let [edition (mf/deref refs/selected-edition)
selected (mf/deref refs/selected-objects) selected (mf/deref refs/selected-objects)
drawing (mf/deref refs/workspace-drawing) drawing (mf/deref refs/workspace-drawing)
@ -50,6 +51,7 @@
(not= :curve (:tool drawing))) (not= :curve (:tool drawing)))
workspace-read-only? (mf/use-ctx ctx/workspace-read-only?) workspace-read-only? (mf/use-ctx ctx/workspace-read-only?)
hide-ui? (:hide-ui layout)
path-edition? (or (and single? editing? path-edition? (or (and single? editing?
(and (not (cfh/text-shape? shape)) (and (not (cfh/text-shape? shape))
@ -58,6 +60,10 @@
grid-edition? (and single? editing? (ctl/grid-layout? shape))] grid-edition? (and single? editing? (ctl/grid-layout? shape))]
[:*
(when-not hide-ui?
[:& top-toolbar {:layout layout}])
(cond (cond
workspace-read-only? workspace-read-only?
[:& view-only-actions] [:& view-only-actions]
@ -67,4 +73,4 @@
[:& path-actions {:shape shape}]] [:& path-actions {:shape shape}]]
grid-edition? grid-edition?
[:& grid-edition-actions {:shape shape}]))) [:& grid-edition-actions {:shape shape}])]))