Merge pull request #61 from bcmi-labs/file-menu-fix

Fixed file menu

Author: jbicker

arduino-ide-extension/src/electron-browser/electron-arduino-menu-contribution.ts

@@ -1,27 +1,31 @@
 import * as electron from 'electron';
-import { injectable } from "inversify";
+import { injectable, inject } from "inversify";
 import { ElectronMenuContribution } from "@theia/core/lib/electron-browser/menu/electron-menu-contribution";
 import { FrontendApplication } from "@theia/core/lib/browser";
 import { isOSX } from '@theia/core';
+import { WorkspaceService } from '@theia/workspace/lib/browser';
 
 @injectable()
 export class ElectronArduinoMenuContribution extends ElectronMenuContribution {
-    onStart(app: FrontendApplication): void {
-        const currentWindow = electron.remote.getCurrentWindow();
-        const createdMenuBar = this.factory.createMenuBar();
 
-        if (isOSX) {
-            electron.remote.Menu.setApplicationMenu(createdMenuBar);
-            currentWindow.on('focus', () =>
-                // OSX: Recreate the menus when changing windows.
-                // OSX only has one menu bar for all windows, so we need to swap
-                // between them as the user switch windows.
-                electron.remote.Menu.setApplicationMenu(this.factory.createMenuBar())
-            );
+    @inject(WorkspaceService) protected readonly workspaceService: WorkspaceService;
 
-        } else {
-            // Unix/Windows: Set the per-window menus
-            currentWindow.setMenu(createdMenuBar);
-        }
+    onStart(app: FrontendApplication): void {
+        this.workspaceService.onWorkspaceChanged(() => {
+            const createdMenuBar = this.factory.createMenuBar();
+            const currentWindow = electron.remote.getCurrentWindow();
+            if (isOSX) {
+                electron.remote.Menu.setApplicationMenu(createdMenuBar);
+                currentWindow.on('focus', () =>
+                    // OSX: Recreate the menus when changing windows.
+                    // OSX only has one menu bar for all windows, so we need to swap
+                    // between them as the user switch windows.
+                    electron.remote.Menu.setApplicationMenu(this.factory.createMenuBar())
+                );
+            } else {
+                // Unix/Windows: Set the per-window menus
+                currentWindow.setMenu(createdMenuBar);
+            }
+        });
     }
 }