Update menu instance on theme change

tropy · Jun 2, 2020 · 817ebce · 817ebce
1 parent b22bf72
commit 817ebce
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/browser/menu.js b/src/browser/menu.js
@@ -321,6 +321,18 @@ class AppMenu extends Menu {
       old.destroy()
     }
   }
+
+  setTheme(theme = this.app.state.theme) {
+    let menu = M.getApplicationMenu()
+    let themes = menu?.getMenuItemById('theme')
+
+    if (themes?.submenu) {
+      for (let item of themes.submenu.items) {
+        item.checked = item.id === theme
+        item.enabled = !item.checked
+      }
+    }
+  }
 }
 
 class ContextMenu extends Menu {

diff --git a/src/browser/tropy.js b/src/browser/tropy.js
@@ -570,7 +570,6 @@ class Tropy extends EventEmitter {
       this.state.locale = locale
       await this.load()
       this.updateWindowLocale()
-      this.emit('app:reload-menu')
     })
 
     this.on('app:toggle-debug-flag', () => {
@@ -935,7 +934,7 @@ class Tropy extends EventEmitter {
       contrast: nativeTheme.shouldUseHighContrastColors
     })
 
-    this.emit('app:reload-menu')
+    this.menu.setTheme(theme)
   }
 
   dispatch(action, win = BrowserWindow.getFocusedWindow()) {