From aa33ac70a704e18a64b8fc029fb96857f8387971 Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Mon, 16 Sep 2019 15:15:08 +0200
Subject: fix(Windows): Fix window menu to get overwritten by Todos menu

---
 src/lib/Menu.js | 5 +++++
 1 file changed, 5 insertions(+)

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

diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 4aa2edaba..41ed174bb 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -547,6 +547,11 @@ const _titleBarTemplateFactory = intl => [
     submenu: [],
     visible: workspaceStore.isFeatureEnabled,
   },
+  {
+    label: intl.formatMessage(menuItems.todos),
+    submenu: [],
+    visible: todosStore.isFeatureEnabled,
+  },
   {
     label: intl.formatMessage(menuItems.window),
     submenu: [
-- 
cgit v1.2.3-54-g00ecf


From e4ec5d4384fe24c2550340cdb34ed17e01fe703f Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Mon, 16 Sep 2019 15:15:26 +0200
Subject: Don't show menu-separator when feature is enabled

---
 src/lib/Menu.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 41ed174bb..b72f0df96 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -948,12 +948,12 @@ export default class FranzMenu {
         gaEvent(GA_CATEGORY_TODOS, 'toggleDrawer', 'menu');
       },
       enabled: this.stores.user.isLoggedIn && isFeatureEnabledByUser,
-    }, {
-      type: 'separator',
     });
 
     if (!isFeatureEnabledByUser) {
       menu.push({
+        type: 'separator',
+      }, {
         label: intl.formatMessage(menuItems.enableTodos),
         click: () => {
           todoActions.toggleTodosFeatureVisibility();
-- 
cgit v1.2.3-54-g00ecf