From 3eb55287d9df74dae7e8196487e7038fec04d4ce Mon Sep 17 00:00:00 2001
From: Bennett <hello@vantezzen.io>
Date: Sun, 11 Oct 2020 20:16:18 +0200
Subject: Add vertical style and "Always show workspace drawer" setting (#567)

---
 src/lib/Menu.js | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'src/lib/Menu.js')

diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 3c5fc6530..dde4f694a 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -1169,17 +1169,21 @@ export default class FranzMenu {
     });
 
     // Open workspace drawer:
-    const drawerLabel = (
-      isWorkspaceDrawerOpen ? menuItems.closeWorkspaceDrawer : menuItems.openWorkspaceDrawer
-    );
+    if (!this.stores.settings.app.alwaysShowWorkspaces) {
+      const drawerLabel = (
+        isWorkspaceDrawerOpen ? menuItems.closeWorkspaceDrawer : menuItems.openWorkspaceDrawer
+      );
+      menu.push({
+        label: intl.formatMessage(drawerLabel),
+        accelerator: `${cmdKey}+D`,
+        click: () => {
+          workspaceActions.toggleWorkspaceDrawer();
+        },
+        enabled: this.stores.user.isLoggedIn,
+      });
+    }
+
     menu.push({
-      label: intl.formatMessage(drawerLabel),
-      accelerator: `${cmdKey}+D`,
-      click: () => {
-        workspaceActions.toggleWorkspaceDrawer();
-      },
-      enabled: this.stores.user.isLoggedIn,
-    }, {
       type: 'separator',
     });
 
-- 
cgit v1.2.3-54-g00ecf