@theia/core 1.18.0 → 1.19.0

package/lib/common/window.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"window.js","sourceRoot":"","sources":["../../src/common/window.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF;;GAEG;AACU,QAAA,mBAAmB,GAAW,QAAQ,CAAC"}

package/lib/electron-browser/menu/electron-context-menu-renderer.d.ts

@@ -14,10 +14,11 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 import * as electron from '../../../shared/electron';
-import { ContextMenuRenderer, RenderContextMenuOptions, ContextMenuAccess, FrontendApplicationContribution } from '../../browser';
+import { ContextMenuRenderer, RenderContextMenuOptions, ContextMenuAccess, FrontendApplicationContribution, PreferenceService } from '../../browser';
 import { ElectronMainMenuFactory } from './electron-main-menu-factory';
 import { ContextMenuContext } from '../../browser/menu/context-menu-context';
 import { MenuPath, MenuContribution, MenuModelRegistry } from '../../common';
+import { BrowserContextMenuRenderer } from '../../browser/menu/browser-context-menu-renderer';
 export declare class ElectronContextMenuAccess extends ContextMenuAccess {
     readonly menu: electron.Menu;
     constructor(menu: electron.Menu);
@@ -33,10 +34,13 @@ export declare class ElectronTextInputContextMenuContribution implements Fronten
     onStart(): void;
     registerMenus(registry: MenuModelRegistry): void;
 }
-export declare class ElectronContextMenuRenderer extends ContextMenuRenderer {
-    private menuFactory;
+export declare class ElectronContextMenuRenderer extends BrowserContextMenuRenderer {
+    private electronMenuFactory;
     protected readonly context: ContextMenuContext;
-    constructor(menuFactory: ElectronMainMenuFactory);
-    protected doRender({ menuPath, anchor, args, onHide }: RenderContextMenuOptions): ElectronContextMenuAccess;
+    protected readonly preferenceService: PreferenceService;
+    protected useNativeStyle: boolean;
+    constructor(electronMenuFactory: ElectronMainMenuFactory);
+    protected init(): Promise<void>;
+    protected doRender(options: RenderContextMenuOptions): ContextMenuAccess;
 }
 //# sourceMappingURL=electron-context-menu-renderer.d.ts.map

package/lib/electron-browser/menu/electron-context-menu-renderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"electron-context-menu-renderer.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-context-menu-renderer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAIlF,OAAO,KAAK,QAAQ,MAAM,0BAA0B,CAAC;AAErD,OAAO,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,+BAA+B,EAAwC,MAAM,eAAe,CAAC;AACxK,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAE7E,qBAAa,yBAA0B,SAAQ,iBAAiB;IAChD,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI;gBAAnB,IAAI,EAAE,QAAQ,CAAC,IAAI;CAK3C;AAED,yBAAiB,4BAA4B,CAAC;IACnC,MAAM,SAAS,EAAE,QAAkC,CAAC;IACpD,MAAM,oBAAoB,UAAsC,CAAC;IACjE,MAAM,UAAU,UAAiC,CAAC;IAClD,MAAM,YAAY,UAAmC,CAAC;CAChE;AAED,qBACa,wCAAyC,YAAW,+BAA+B,EAAE,gBAAgB;IAG9G,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAE5D,OAAO,IAAI,IAAI;IAiBf,aAAa,CAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI;CASnD;AAED,qBACa,2BAA4B,SAAQ,mBAAmB;IAKnB,OAAO,CAAC,WAAW;IAFhE,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC;gBAEM,WAAW,EAAE,uBAAuB;IAIzF,SAAS,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,wBAAwB,GAAG,yBAAyB;CAc9G"}
+{"version":3,"file":"electron-context-menu-renderer.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-context-menu-renderer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAIlF,OAAO,KAAK,QAAQ,MAAM,0BAA0B,CAAC;AAErD,OAAO,EACH,mBAAmB,EAAE,wBAAwB,EAAE,iBAAiB,EAAE,+BAA+B,EAAwC,iBAAiB,EAC7J,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAC7E,OAAO,EAAE,0BAA0B,EAAE,MAAM,kDAAkD,CAAC;AAG9F,qBAAa,yBAA0B,SAAQ,iBAAiB;IAChD,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI;gBAAnB,IAAI,EAAE,QAAQ,CAAC,IAAI;CAK3C;AAED,yBAAiB,4BAA4B,CAAC;IACnC,MAAM,SAAS,EAAE,QAAkC,CAAC;IACpD,MAAM,oBAAoB,UAAsC,CAAC;IACjE,MAAM,UAAU,UAAiC,CAAC;IAClD,MAAM,YAAY,UAAmC,CAAC;CAChE;AAED,qBACa,wCAAyC,YAAW,+BAA+B,EAAE,gBAAgB;IAG9G,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAE5D,OAAO,IAAI,IAAI;IAiBf,aAAa,CAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI;CASnD;AAED,qBACa,2BAA4B,SAAQ,0BAA0B;IAU1B,OAAO,CAAC,mBAAmB;IAPxE,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC;IAG/C,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAExD,SAAS,CAAC,cAAc,EAAE,OAAO,CAAQ;gBAEY,mBAAmB,EAAE,uBAAuB;cAKjF,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAOrC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,wBAAwB,GAAG,iBAAiB;CAmB3E"}

package/lib/electron-browser/menu/electron-context-menu-renderer.js

@@ -34,6 +34,8 @@ const inversify_1 = require("inversify");
 const browser_1 = require("../../browser");
 const electron_main_menu_factory_1 = require("./electron-main-menu-factory");
 const context_menu_context_1 = require("../../browser/menu/context-menu-context");
+const browser_context_menu_renderer_1 = require("../../browser/menu/browser-context-menu-renderer");
+const electron_messages_1 = require("../../electron-common/messaging/electron-messages");
 class ElectronContextMenuAccess extends browser_1.ContextMenuAccess {
     constructor(menu) {
         super({
@@ -84,29 +86,52 @@ ElectronTextInputContextMenuContribution = __decorate([
     inversify_1.injectable()
 ], ElectronTextInputContextMenuContribution);
 exports.ElectronTextInputContextMenuContribution = ElectronTextInputContextMenuContribution;
-let ElectronContextMenuRenderer = class ElectronContextMenuRenderer extends browser_1.ContextMenuRenderer {
-    constructor(menuFactory) {
-        super();
-        this.menuFactory = menuFactory;
+let ElectronContextMenuRenderer = class ElectronContextMenuRenderer extends browser_context_menu_renderer_1.BrowserContextMenuRenderer {
+    constructor(electronMenuFactory) {
+        super(electronMenuFactory);
+        this.electronMenuFactory = electronMenuFactory;
+        this.useNativeStyle = true;
     }
-    doRender({ menuPath, anchor, args, onHide }) {
-        const menu = this.menuFactory.createContextMenu(menuPath, args);
-        const { x, y } = browser_1.coordinateFromAnchor(anchor);
-        const zoom = electron.webFrame.getZoomFactor();
-        // x and y values must be Ints or else there is a conversion error
-        menu.popup({ x: Math.round(x * zoom), y: Math.round(y * zoom) });
-        // native context menu stops the event loop, so there is no keyboard events
-        this.context.resetAltPressed();
-        if (onHide) {
-            menu.once('menu-will-close', () => onHide());
+    async init() {
+        electron.ipcRenderer.on(electron_messages_1.TitleBarStyleAtStartup, (_event, style) => {
+            this.useNativeStyle = style === 'native';
+        });
+        electron.ipcRenderer.send(electron_messages_1.RequestTitleBarStyle);
+    }
+    doRender(options) {
+        if (this.useNativeStyle) {
+            const { menuPath, anchor, args, onHide } = options;
+            const menu = this.electronMenuFactory.createElectronContextMenu(menuPath, args);
+            const { x, y } = browser_1.coordinateFromAnchor(anchor);
+            const zoom = electron.webFrame.getZoomFactor();
+            // x and y values must be Ints or else there is a conversion error
+            menu.popup({ x: Math.round(x * zoom), y: Math.round(y * zoom) });
+            // native context menu stops the event loop, so there is no keyboard events
+            this.context.resetAltPressed();
+            if (onHide) {
+                menu.once('menu-will-close', () => onHide());
+            }
+            return new ElectronContextMenuAccess(menu);
+        }
+        else {
+            return super.doRender(options);
         }
-        return new ElectronContextMenuAccess(menu);
     }
 };
 __decorate([
     inversify_1.inject(context_menu_context_1.ContextMenuContext),
     __metadata("design:type", context_menu_context_1.ContextMenuContext)
 ], ElectronContextMenuRenderer.prototype, "context", void 0);
+__decorate([
+    inversify_1.inject(browser_1.PreferenceService),
+    __metadata("design:type", Object)
+], ElectronContextMenuRenderer.prototype, "preferenceService", void 0);
+__decorate([
+    inversify_1.postConstruct(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], ElectronContextMenuRenderer.prototype, "init", null);
 ElectronContextMenuRenderer = __decorate([
     inversify_1.injectable(),
     __param(0, inversify_1.inject(electron_main_menu_factory_1.ElectronMainMenuFactory)),

package/lib/electron-browser/menu/electron-context-menu-renderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"electron-context-menu-renderer.js","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-context-menu-renderer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"electron-context-menu-renderer.js","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-context-menu-renderer.ts"],"names":[],"mappings":"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"}

package/lib/electron-browser/menu/electron-main-menu-factory.d.ts

@@ -16,8 +16,7 @@
 import { CommandRegistry, CompositeMenuNode, MenuModelRegistry, MenuPath, MenuNode } from '../../common';
 import { Keybinding } from '../../common/keybinding';
 import { PreferenceService, KeybindingRegistry } from '../../browser';
-import { ContextKeyService } from '../../browser/context-key-service';
-import { ContextMenuContext } from '../../browser/menu/context-menu-context';
+import { BrowserMainMenuFactory } from '../../browser/menu/browser-menu-plugin';
 /**
  * Representation of possible electron menu options.
  */
@@ -33,21 +32,19 @@ export interface ElectronMenuOptions {
  * be ignored. See [roles](https://www.electronjs.org/docs/api/menu-item#roles).
  */
 export declare type ElectronMenuItemRole = ('undo' | 'redo' | 'cut' | 'copy' | 'paste' | 'pasteAndMatchStyle' | 'delete' | 'selectAll' | 'reload' | 'forceReload' | 'toggleDevTools' | 'resetZoom' | 'zoomIn' | 'zoomOut' | 'togglefullscreen' | 'window' | 'minimize' | 'close' | 'help' | 'about' | 'services' | 'hide' | 'hideOthers' | 'unhide' | 'quit' | 'startSpeaking' | 'stopSpeaking' | 'zoom' | 'front' | 'appMenu' | 'fileMenu' | 'editMenu' | 'viewMenu' | 'recentDocuments' | 'toggleTabBar' | 'selectNextTab' | 'selectPreviousTab' | 'mergeAllWindows' | 'clearRecentDocuments' | 'moveTabToNewWindow' | 'windowMenu');
-export declare class ElectronMainMenuFactory {
+export declare class ElectronMainMenuFactory extends BrowserMainMenuFactory {
     protected readonly commandRegistry: CommandRegistry;
     protected readonly preferencesService: PreferenceService;
     protected readonly menuProvider: MenuModelRegistry;
     protected readonly keybindingRegistry: KeybindingRegistry;
     protected _menu: Electron.Menu | undefined;
     protected _toggledCommands: Set<string>;
-    protected readonly contextKeyService: ContextKeyService;
-    protected readonly context: ContextMenuContext;
     constructor(commandRegistry: CommandRegistry, preferencesService: PreferenceService, menuProvider: MenuModelRegistry, keybindingRegistry: KeybindingRegistry);
     setMenuBar(): Promise<void>;
-    createMenuBar(): Electron.Menu | null;
-    createContextMenu(menuPath: MenuPath, args?: any[]): Electron.Menu;
+    createElectronMenuBar(): Electron.Menu | null;
+    createElectronContextMenu(menuPath: MenuPath, args?: any[]): Electron.Menu;
     protected fillMenuTemplate(items: Electron.MenuItemConstructorOptions[], menuModel: CompositeMenuNode, args?: any[], options?: ElectronMenuOptions): Electron.MenuItemConstructorOptions[];
-    protected handleDefault(menuNode: MenuNode, args?: any[], options?: ElectronMenuOptions): Electron.MenuItemConstructorOptions[];
+    protected handleElectronDefault(menuNode: MenuNode, args?: any[], options?: ElectronMenuOptions): Electron.MenuItemConstructorOptions[];
     /**
      * Return a user visible representation of a keybinding.
      */

package/lib/electron-browser/menu/electron-main-menu-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"electron-main-menu-factory.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-main-menu-factory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"electron-main-menu-factory.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-main-menu-factory.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAMlF,OAAO,EACH,eAAe,EAAyB,iBAAiB,EAC1C,iBAAiB,EAAE,QAAQ,EAAE,QAAQ,EACvD,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAkB,MAAM,eAAe,CAAC;AAGtF,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAEhF;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAChC;;;OAGG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;CACnC;AAED;;;GAGG;AACH,oBAAY,oBAAoB,GAAG,CAAC,MAAM,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,OAAO,GAC1E,oBAAoB,GAAG,QAAQ,GAAG,WAAW,GAAG,QAAQ,GAAG,aAAa,GACxE,gBAAgB,GAAG,WAAW,GAAG,QAAQ,GAAG,SAAS,GAAG,kBAAkB,GAC1E,QAAQ,GAAG,UAAU,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,GAClD,UAAU,GAAG,MAAM,GAAG,YAAY,GAAG,QAAQ,GAAG,MAAM,GACtD,eAAe,GAAG,cAAc,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,GAC/D,UAAU,GAAG,UAAU,GAAG,UAAU,GAAG,iBAAiB,GAAG,cAAc,GACzE,eAAe,GAAG,mBAAmB,GAAG,iBAAiB,GAAG,sBAAsB,GAClF,oBAAoB,GAAG,YAAY,CAAC,CAAC;AAEzC,qBACa,uBAAwB,SAAQ,sBAAsB;IAMlC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe;IACjD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,iBAAiB;IACxD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,iBAAiB;IACjD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB;IAPzF,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,GAAG,SAAS,CAAC;IAC3C,SAAS,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;gBAGJ,eAAe,EAAE,eAAe,EAC9B,kBAAkB,EAAE,iBAAiB,EACrC,YAAY,EAAE,iBAAiB,EAC9B,kBAAkB,EAAE,kBAAkB;IAqBnF,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAWjC,qBAAqB,IAAI,QAAQ,CAAC,IAAI,GAAG,IAAI;IAkB7C,yBAAyB,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,QAAQ,CAAC,IAAI;IAM1E,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,QAAQ,CAAC,0BAA0B,EAAE,EACnE,SAAS,EAAE,iBAAiB,EAC5B,IAAI,GAAE,GAAG,EAAO,EAChB,OAAO,CAAC,EAAE,mBAAmB,GAC9B,QAAQ,CAAC,0BAA0B,EAAE;IAmGxC,SAAS,CAAC,qBAAqB,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,GAAE,GAAG,EAAO,EAAE,OAAO,CAAC,EAAE,mBAAmB,GAAG,QAAQ,CAAC,0BAA0B,EAAE;IAI3I;;OAEG;IACH,SAAS,CAAC,cAAc,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM;IAexD,SAAS,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,oBAAoB,GAAG,SAAS;cA2B/C,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBpE,SAAS,CAAC,aAAa,IAAI,QAAQ,CAAC,0BAA0B;CAoCjE"}

package/lib/electron-browser/menu/electron-main-menu-factory.js

@@ -33,12 +33,12 @@ const electron = require("../../../shared/electron");
 const inversify_1 = require("inversify");
 const common_1 = require("../../common");
 const browser_1 = require("../../browser");
-const context_key_service_1 = require("../../browser/context-key-service");
 const debounce = require("lodash.debounce");
-const context_menu_context_1 = require("../../browser/menu/context-menu-context");
 const theia_dock_panel_1 = require("../../browser/shell/theia-dock-panel");
-let ElectronMainMenuFactory = class ElectronMainMenuFactory {
+const browser_menu_plugin_1 = require("../../browser/menu/browser-menu-plugin");
+let ElectronMainMenuFactory = class ElectronMainMenuFactory extends browser_menu_plugin_1.BrowserMainMenuFactory {
     constructor(commandRegistry, preferencesService, menuProvider, keybindingRegistry) {
+        super();
         this.commandRegistry = commandRegistry;
         this.preferencesService = preferencesService;
         this.menuProvider = menuProvider;
@@ -61,15 +61,16 @@ let ElectronMainMenuFactory = class ElectronMainMenuFactory {
     }
     async setMenuBar() {
         await this.preferencesService.ready;
-        const createdMenuBar = this.createMenuBar();
         if (common_1.isOSX) {
+            const createdMenuBar = this.createElectronMenuBar();
             electron.remote.Menu.setApplicationMenu(createdMenuBar);
         }
-        else {
+        else if (this.preferencesService.get('window.titleBarStyle') === 'native') {
+            const createdMenuBar = this.createElectronMenuBar();
             electron.remote.getCurrentWindow().setMenu(createdMenuBar);
         }
     }
-    createMenuBar() {
+    createElectronMenuBar() {
         const preference = this.preferencesService.get('window.menuBarVisibility') || 'classic';
         const maxWidget = document.getElementsByClassName(theia_dock_panel_1.MAXIMIZED_CLASS);
         if (preference === 'visible' || (preference === 'classic' && maxWidget.length === 0)) {
@@ -86,7 +87,7 @@ let ElectronMainMenuFactory = class ElectronMainMenuFactory {
         // eslint-disable-next-line no-null/no-null
         return null;
     }
-    createContextMenu(menuPath, args) {
+    createElectronContextMenu(menuPath, args) {
         const menuModel = this.menuProvider.getMenu(menuPath);
         const template = this.fillMenuTemplate([], menuModel, args, { showDisabled: false });
         return electron.remote.Menu.buildFromTemplate(template);
@@ -170,12 +171,12 @@ let ElectronMainMenuFactory = class ElectronMainMenuFactory {
                 }
             }
             else {
-                items.push(...this.handleDefault(menu, args, options));
+                items.push(...this.handleElectronDefault(menu, args, options));
             }
         }
         return items;
     }
-    handleDefault(menuNode, args = [], options) {
+    handleElectronDefault(menuNode, args = [], options) {
         return [];
     }
     /**
@@ -273,14 +274,6 @@ let ElectronMainMenuFactory = class ElectronMainMenuFactory {
         };
     }
 };
-__decorate([
-    inversify_1.inject(context_key_service_1.ContextKeyService),
-    __metadata("design:type", context_key_service_1.ContextKeyService)
-], ElectronMainMenuFactory.prototype, "contextKeyService", void 0);
-__decorate([
-    inversify_1.inject(context_menu_context_1.ContextMenuContext),
-    __metadata("design:type", context_menu_context_1.ContextMenuContext)
-], ElectronMainMenuFactory.prototype, "context", void 0);
 ElectronMainMenuFactory = __decorate([
     inversify_1.injectable(),
     __param(0, inversify_1.inject(common_1.CommandRegistry)),

package/lib/electron-browser/menu/electron-main-menu-factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"electron-main-menu-factory.js","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-main-menu-factory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"electron-main-menu-factory.js","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-main-menu-factory.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;;;AAElF,uDAAuD;AAEvD,qDAAqD;AACrD,yCAA+C;AAC/C,yCAGsB;AAEtB,2CAAsF;AACtF,4CAA6C;AAC7C,2EAAuE;AACvE,gFAAgF;AA4BhF,IAAa,uBAAuB,GAApC,MAAa,uBAAwB,SAAQ,4CAAsB;IAK/D,YACgD,eAAgC,EAC9B,kBAAqC,EACrC,YAA+B,EAC9B,kBAAsC;QAErF,KAAK,EAAE,CAAC;QALoC,oBAAe,GAAf,eAAe,CAAiB;QAC9B,uBAAkB,GAAlB,kBAAkB,CAAmB;QACrC,iBAAY,GAAZ,YAAY,CAAmB;QAC9B,uBAAkB,GAAlB,kBAAkB,CAAoB;QAN/E,qBAAgB,GAAgB,IAAI,GAAG,EAAE,CAAC;QAShD,kBAAkB,CAAC,mBAAmB,CAClC,QAAQ,CAAC,CAAC,CAAC,EAAE;YACT,IAAI,CAAC,CAAC,cAAc,KAAK,0BAA0B,EAAE;gBACjD,IAAI,CAAC,UAAU,EAAE,CAAC;aACrB;YACD,IAAI,IAAI,CAAC,KAAK,EAAE;gBACZ,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,gBAAgB,EAAE;oBACtC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;iBACnF;gBACD,QAAQ,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aAC1D;QACL,CAAC,EAAE,EAAE,CAAC,CACT,CAAC;QACF,kBAAkB,CAAC,oBAAoB,CAAC,GAAG,EAAE;YACzC,IAAI,CAAC,UAAU,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,UAAU;QACZ,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC;QACpC,IAAI,cAAK,EAAE;YACP,MAAM,cAAc,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;YACpD,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC;SAC3D;aAAM,IAAI,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,sBAAsB,CAAC,KAAK,QAAQ,EAAE;YACzE,MAAM,cAAc,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;YACpD,QAAQ,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;SAC9D;IACL,CAAC;IAED,qBAAqB;QACjB,MAAM,UAAU,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAS,0BAA0B,CAAC,IAAI,SAAS,CAAC;QAChG,MAAM,SAAS,GAAG,QAAQ,CAAC,sBAAsB,CAAC,kCAAe,CAAC,CAAC;QACnE,IAAI,UAAU,KAAK,SAAS,IAAI,CAAC,UAAU,KAAK,SAAS,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,CAAC,EAAE;YAClF,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,sBAAa,CAAC,CAAC;YAC3D,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;YACtD,IAAI,cAAK,EAAE;gBACP,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;aAC1C;YACD,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YAC9D,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YAClB,OAAO,IAAI,CAAC,KAAK,CAAC;SACrB;QACD,IAAI,CAAC,KAAK,GAAG,SAAS,CAAC;QACvB,2CAA2C;QAC3C,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,yBAAyB,CAAC,QAAkB,EAAE,IAAY;QACtD,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACtD,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC;QACrF,OAAO,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAC5D,CAAC;IAES,gBAAgB,CAAC,KAA4C,EACnE,SAA4B,EAC5B,OAAc,EAAE,EAChB,OAA6B;QAE7B,MAAM,YAAY,GAAG,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,MAAK,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAC;QAC1F,KAAK,MAAM,IAAI,IAAI,SAAS,CAAC,QAAQ,EAAE;YACnC,IAAI,IAAI,YAAY,0BAAiB,EAAE;gBACnC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC1B,4BAA4B;oBAE5B,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE,eAAe;wBAEjC,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;wBAC/D,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;4BACtB,SAAS;yBACZ;wBAED,KAAK,CAAC,IAAI,CAAC;4BACP,KAAK,EAAE,IAAI,CAAC,KAAK;4BACjB,OAAO;yBACV,CAAC,CAAC;qBAEN;yBAAM,EAAE,aAAa;wBAElB,mBAAmB;wBACnB,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;wBAC/D,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;4BACtB,SAAS;yBACZ;wBAED,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;4BAClB,+CAA+C;4BAE/C,KAAK,CAAC,IAAI,CAAC;gCACP,IAAI,EAAE,WAAW;6BACpB,CAAC,CAAC;yBACN;wBAED,kBAAkB;wBAClB,KAAK,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;qBAC1B;iBACJ;aACJ;iBAAM,IAAI,IAAI,YAAY,uBAAc,EAAE;gBACvC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;gBAC3E,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;gBAExC,sDAAsD;gBACtD,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;oBAC7C,OAAO,CAAC,KAAK,CAAC,6CAA6C,SAAS,IAAI,CAAC,CAAC;oBAC1E,SAAS;iBACZ;gBAED,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC;uBAChD,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE;oBAC5E,SAAS;iBACZ;gBAED,kEAAkE;gBAClE,IAAI,CAAC,YAAY,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,EAAE;oBACtE,SAAS;iBACZ;gBAED,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;gBAE7E,IAAI,WAAW,CAAC;gBAEhB,yCAAyC;gBACzC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;oBACrB,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;oBAC5B,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;iBAC9C;gBAED,MAAM,QAAQ,GAAG;oBACb,EAAE,EAAE,IAAI,CAAC,EAAE;oBACX,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,IAAI,EAAE,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ;oBACxF,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC;oBAC3D,OAAO,EAAE,IAAI;oBACb,OAAO,EAAE,IAAI;oBACb,WAAW;oBACX,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC;iBACN,CAAC;gBAEzC,IAAI,cAAK,EAAE;oBACP,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBACnC,IAAI,IAAI,EAAE;wBACN,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;wBACrB,OAAO,QAAQ,CAAC,KAAK,CAAC;qBACzB;iBACJ;gBACD,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAErB,IAAI,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,EAAE;oBAC5D,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;iBACxC;aACJ;iBAAM;gBACH,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;aAClE;SACJ;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAES,qBAAqB,CAAC,QAAkB,EAAE,OAAc,EAAE,EAAE,OAA6B;QAC/F,OAAO,EAAE,CAAC;IACd,CAAC;IAED;;OAEG;IACO,cAAc,CAAC,UAAsB;QAC3C,MAAM,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QACjF,8DAA8D;QAC9D,oEAAoE;QACpE,EAAE;QACF,oFAAoF;QACpF,4EAA4E;QAC5E,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/B,OAAO,EAAE,CAAC;SACb;QAED,MAAM,OAAO,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;QACtC,OAAO,IAAI,CAAC,kBAAkB,CAAC,qBAAqB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACvE,CAAC;IAES,OAAO,CAAC,EAAU;QACxB,IAAI,IAAsC,CAAC;QAC3C,QAAQ,EAAE,EAAE;YACR,KAAK,wBAAc,CAAC,IAAI,CAAC,EAAE;gBACvB,IAAI,GAAG,MAAM,CAAC;gBACd,MAAM;YACV,KAAK,wBAAc,CAAC,IAAI,CAAC,EAAE;gBACvB,IAAI,GAAG,MAAM,CAAC;gBACd,MAAM;YACV,KAAK,wBAAc,CAAC,GAAG,CAAC,EAAE;gBACtB,IAAI,GAAG,KAAK,CAAC;gBACb,MAAM;YACV,KAAK,wBAAc,CAAC,IAAI,CAAC,EAAE;gBACvB,IAAI,GAAG,MAAM,CAAC;gBACd,MAAM;YACV,KAAK,wBAAc,CAAC,KAAK,CAAC,EAAE;gBACxB,IAAI,GAAG,OAAO,CAAC;gBACf,MAAM;YACV,KAAK,wBAAc,CAAC,UAAU,CAAC,EAAE;gBAC7B,IAAI,GAAG,WAAW,CAAC;gBACnB,MAAM;YACV;gBACI,MAAM;SACb;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,KAAK,CAAC,OAAO,CAAC,OAAe,EAAE,IAAW;QAChD,IAAI;YACA,4EAA4E;YAC5E,8FAA8F;YAC9F,yCAAyC;YACzC,IAAI,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,EAAE;gBAClD,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;gBAC5D,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,EAAE;oBAChE,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;oBAC/F,QAAQ,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBAC1D;aACJ;SACJ;QAAC,WAAM;YACJ,QAAQ;SACX;IACL,CAAC;IAES,aAAa;QACnB,OAAO;YACH,KAAK,EAAE,OAAO;YACd,OAAO,EAAE;gBACL;oBACI,IAAI,EAAE,OAAO;iBAChB;gBACD;oBACI,IAAI,EAAE,WAAW;iBACpB;gBACD;oBACI,IAAI,EAAE,UAAU;oBAChB,OAAO,EAAE,EAAE;iBACd;gBACD;oBACI,IAAI,EAAE,WAAW;iBACpB;gBACD;oBACI,IAAI,EAAE,MAAM;iBACf;gBACD;oBACI,IAAI,EAAE,YAAY;iBACrB;gBACD;oBACI,IAAI,EAAE,QAAQ;iBACjB;gBACD;oBACI,IAAI,EAAE,WAAW;iBACpB;gBACD;oBACI,IAAI,EAAE,MAAM;iBACf;aACJ;SACJ,CAAC;IACN,CAAC;CAEJ,CAAA;AA9QY,uBAAuB;IADnC,sBAAU,EAAE;IAOJ,WAAA,kBAAM,CAAC,wBAAe,CAAC,CAAA;IACvB,WAAA,kBAAM,CAAC,2BAAiB,CAAC,CAAA;IACzB,WAAA,kBAAM,CAAC,0BAAiB,CAAC,CAAA;IACzB,WAAA,kBAAM,CAAC,4BAAkB,CAAC,CAAA;qCAHkC,wBAAe,UAEhB,0BAAiB;QACV,4BAAkB;GAThF,uBAAuB,CA8QnC;AA9QY,0DAAuB"}

package/lib/electron-browser/menu/electron-menu-contribution.d.ts

@@ -13,11 +13,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
+import * as electron from '../../../shared/electron';
 import { Command, CommandContribution, CommandRegistry, MenuModelRegistry, MenuContribution } from '../../common';
-import { ApplicationShell, KeybindingContribution, KeybindingRegistry, PreferenceService } from '../../browser';
-import { FrontendApplication, FrontendApplicationContribution } from '../../browser';
+import { ApplicationShell, KeybindingContribution, KeybindingRegistry, FrontendApplication, FrontendApplicationContribution } from '../../browser';
 import { ElectronMainMenuFactory } from './electron-main-menu-factory';
 import { FrontendApplicationStateService } from '../../browser/frontend-application-state';
+import { BrowserMenuBarContribution } from '../../browser/menu/browser-menu-plugin';
+import '../../../src/electron-browser/menu/electron-menu-style.css';
 export declare namespace ElectronCommands {
     const TOGGLE_DEVELOPER_TOOLS: Command;
     const RELOAD: Command;
@@ -37,22 +39,28 @@ export declare namespace ElectronMenus {
 export declare namespace ElectronMenus {
     const FILE_CLOSE: string[];
 }
-export declare class ElectronMenuContribution implements FrontendApplicationContribution, CommandContribution, MenuContribution, KeybindingContribution {
+export declare class ElectronMenuContribution extends BrowserMenuBarContribution implements FrontendApplicationContribution, CommandContribution, MenuContribution, KeybindingContribution {
     protected readonly factory: ElectronMainMenuFactory;
     protected shell: ApplicationShell;
     protected readonly stateService: FrontendApplicationStateService;
-    protected readonly preferenceService: PreferenceService;
+    protected titleBarStyleChangeFlag: boolean;
+    protected titleBarStyle?: string;
     constructor(factory: ElectronMainMenuFactory, shell: ApplicationShell);
     onStart(app: FrontendApplication): void;
+    handleTitleBarStyling(app: FrontendApplication): void;
     handleToggleMaximized(): void;
     /**
-     * Makes the `theia-top-panel` hidden as it is unused for the electron-based application.
+     * Hides the `theia-top-panel` depending on the selected `titleBarStyle`.
      * The `theia-top-panel` is used as the container of the main, application menu-bar for the
-     * browser. Electron has it's own.
+     * browser. Native Electron has it's own.
      * By default, this method is called on application `onStart`.
      */
     protected hideTopPanel(app: FrontendApplication): void;
-    private setMenu;
+    protected setMenu(app: FrontendApplication, electronMenu?: electron.Menu | null, electronWindow?: electron.BrowserWindow): void;
+    protected createCustomTitleBar(app: FrontendApplication, electronWindow: electron.BrowserWindow): void;
+    protected handleWindowControls(electronWindow: electron.BrowserWindow): void;
+    protected createControlButton(id: string, handler: () => void): HTMLElement;
+    protected handleRequiredRestart(): Promise<void>;
     registerCommands(registry: CommandRegistry): void;
     registerKeybindings(registry: KeybindingRegistry): void;
     registerMenus(registry: MenuModelRegistry): void;

package/lib/electron-browser/menu/electron-menu-contribution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"electron-menu-contribution.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-menu-contribution.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAIlF,OAAO,EACH,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAC3B,iBAAiB,EAAE,gBAAgB,EACxD,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,kBAAkB,EAAmB,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACjI,OAAO,EAAE,mBAAmB,EAAE,+BAA+B,EAAe,MAAM,eAAe,CAAC;AAClG,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,+BAA+B,EAA4B,MAAM,0CAA0C,CAAC;AAGrH,yBAAiB,gBAAgB,CAAC;IACvB,MAAM,sBAAsB,EAAE,OAGpC,CAAC;IACK,MAAM,MAAM,EAAE,OAGpB,CAAC;IACK,MAAM,OAAO,EAAE,OAGrB,CAAC;IACK,MAAM,QAAQ,EAAE,OAGtB,CAAC;IACK,MAAM,UAAU,EAAE,OAGxB,CAAC;IACK,MAAM,YAAY,EAAE,OAG1B,CAAC;IACK,MAAM,kBAAkB,EAAE,OAIhC,CAAC;CACL;AAED,yBAAiB,aAAa,CAAC;IACpB,MAAM,WAAW,UAAkC,CAAC;IACpD,MAAM,SAAS,UAAgC,CAAC;CAC1D;AAED,yBAAiB,aAAa,CAAC;IACpB,MAAM,WAAW,UAAoC,CAAC;CAChE;AAED,yBAAiB,aAAa,CAAC;IACpB,MAAM,UAAU,UAA8C,CAAC;CACzE;AAED,qBACa,wBAAyB,YAAW,+BAA+B,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,sBAAsB;IAStG,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,uBAAuB;IAC1D,SAAS,CAAC,KAAK,EAAE,gBAAgB;IAP/D,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,+BAA+B,CAAC;IAGjE,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;gBAGA,OAAO,EAAE,uBAAuB,EAChD,KAAK,EAAE,gBAAgB;IAG/D,OAAO,CAAC,GAAG,EAAE,mBAAmB,GAAG,IAAI;IAkCvC,qBAAqB,IAAI,IAAI;IAO7B;;;;;OAKG;IACH,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,mBAAmB,GAAG,IAAI;IActD,OAAO,CAAC,OAAO;IASf,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IAwDjD,mBAAmB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;IAiCvD,aAAa,CAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI;CA0BnD"}
+{"version":3,"file":"electron-menu-contribution.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-menu-contribution.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,KAAK,QAAQ,MAAM,0BAA0B,CAAC;AAErD,OAAO,EACH,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAC3B,iBAAiB,EAAE,gBAAgB,EACxD,MAAM,cAAc,CAAC;AACtB,OAAO,EACH,gBAAgB,EAA0B,sBAAsB,EAAE,kBAAkB,EAC3D,mBAAmB,EAAE,+BAA+B,EAChF,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,+BAA+B,EAA4B,MAAM,0CAA0C,CAAC;AAIrH,OAAO,EAAE,0BAA0B,EAAE,MAAM,wCAAwC,CAAC;AAEpF,OAAO,4DAA4D,CAAC;AAEpE,yBAAiB,gBAAgB,CAAC;IACvB,MAAM,sBAAsB,SAGS,CAAC;IACtC,MAAM,MAAM,SAGoB,CAAC;IACjC,MAAM,OAAO,SAGa,CAAC;IAC3B,MAAM,QAAQ,SAGa,CAAC;IAC5B,MAAM,UAAU,SAGa,CAAC;IAC9B,MAAM,YAAY,SAGO,CAAC;IAC1B,MAAM,kBAAkB,SAI8C,CAAC;CACjF;AAED,yBAAiB,aAAa,CAAC;IACpB,MAAM,WAAW,UAAkC,CAAC;IACpD,MAAM,SAAS,UAAgC,CAAC;CAC1D;AAED,yBAAiB,aAAa,CAAC;IACpB,MAAM,WAAW,UAAoC,CAAC;CAChE;AAED,yBAAiB,aAAa,CAAC;IACpB,MAAM,UAAU,UAA8C,CAAC;CACzE;AAED,qBACa,wBAAyB,SAAQ,0BAA2B,YAAW,+BAA+B,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,sBAAsB;IASzI,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,uBAAuB;IAC1D,SAAS,CAAC,KAAK,EAAE,gBAAgB;IAP/D,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,+BAA+B,CAAC;IAEjE,SAAS,CAAC,uBAAuB,UAAS;IAC1C,SAAS,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;gBAGuB,OAAO,EAAE,uBAAuB,EAChD,KAAK,EAAE,gBAAgB;IAK/D,OAAO,CAAC,GAAG,EAAE,mBAAmB,GAAG,IAAI;IA2BvC,qBAAqB,CAAC,GAAG,EAAE,mBAAmB,GAAG,IAAI;IAwBrD,qBAAqB,IAAI,IAAI;IAO7B;;;;;OAKG;IACH,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,mBAAmB,GAAG,IAAI;IActD,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE,mBAAmB,EAAE,YAAY,GAAE,QAAQ,CAAC,IAAI,GAAG,IAA2C,EACjH,cAAc,GAAE,QAAQ,CAAC,aAAkD,GAAG,IAAI;IAatF,SAAS,CAAC,oBAAoB,CAAC,GAAG,EAAE,mBAAmB,EAAE,cAAc,EAAE,QAAQ,CAAC,aAAa,GAAG,IAAI;IAiBtG,SAAS,CAAC,oBAAoB,CAAC,cAAc,EAAE,QAAQ,CAAC,aAAa,GAAG,IAAI;IAc5E,SAAS,CAAC,mBAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,IAAI,GAAG,WAAW;cAQ3D,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAoBtD,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IAwDjD,mBAAmB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;IAiCvD,aAAa,CAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI;CA0BnD"}

package/lib/electron-browser/menu/electron-menu-contribution.js

@@ -32,77 +32,75 @@ const electron = require("../../../shared/electron");
 const inversify_1 = require("inversify");
 const common_1 = require("../../common");
 const browser_1 = require("../../browser");
-const browser_2 = require("../../browser");
 const electron_main_menu_factory_1 = require("./electron-main-menu-factory");
 const frontend_application_state_1 = require("../../browser/frontend-application-state");
+const frontend_application_config_provider_1 = require("../../browser/frontend-application-config-provider");
+const electron_messages_1 = require("../../electron-common/messaging/electron-messages");
 const electron_window_preferences_1 = require("../window/electron-window-preferences");
+const browser_menu_plugin_1 = require("../../browser/menu/browser-menu-plugin");
+require("../../../src/electron-browser/menu/electron-menu-style.css");
 var ElectronCommands;
 (function (ElectronCommands) {
-    ElectronCommands.TOGGLE_DEVELOPER_TOOLS = {
+    ElectronCommands.TOGGLE_DEVELOPER_TOOLS = common_1.Command.toLocalizedCommand({
         id: 'theia.toggleDevTools',
         label: 'Toggle Developer Tools'
-    };
-    ElectronCommands.RELOAD = {
+    }, 'vscode/developerActions/toggleDevTools');
+    ElectronCommands.RELOAD = common_1.Command.toLocalizedCommand({
         id: 'view.reload',
         label: 'Reload Window'
-    };
-    ElectronCommands.ZOOM_IN = {
+    }, 'vscode/windowActions/reloadWindow');
+    ElectronCommands.ZOOM_IN = common_1.Command.toLocalizedCommand({
         id: 'view.zoomIn',
         label: 'Zoom In'
-    };
-    ElectronCommands.ZOOM_OUT = {
+    }, 'vscode/windowActions/zoomIn');
+    ElectronCommands.ZOOM_OUT = common_1.Command.toLocalizedCommand({
         id: 'view.zoomOut',
         label: 'Zoom Out'
-    };
-    ElectronCommands.RESET_ZOOM = {
+    }, 'vscode/windowActions/zoomOut');
+    ElectronCommands.RESET_ZOOM = common_1.Command.toLocalizedCommand({
         id: 'view.resetZoom',
         label: 'Reset Zoom'
-    };
-    ElectronCommands.CLOSE_WINDOW = {
+    }, 'vscode/windowActions/zoomReset');
+    ElectronCommands.CLOSE_WINDOW = common_1.Command.toLocalizedCommand({
         id: 'close.window',
         label: 'Close Window'
-    };
-    ElectronCommands.TOGGLE_FULL_SCREEN = {
+    }, 'vscode/windowActions/close');
+    ElectronCommands.TOGGLE_FULL_SCREEN = common_1.Command.toLocalizedCommand({
         id: 'workbench.action.toggleFullScreen',
-        category: 'View',
+        category: browser_1.CommonCommands.VIEW_CATEGORY,
         label: 'Toggle Full Screen'
-    };
+    }, 'vscode/windowActions/toggleFullScreen', browser_1.CommonCommands.VIEW_CATEGORY_KEY);
 })(ElectronCommands = exports.ElectronCommands || (exports.ElectronCommands = {}));
 var ElectronMenus;
 (function (ElectronMenus) {
-    ElectronMenus.VIEW_WINDOW = [...browser_2.CommonMenus.VIEW, 'window'];
-    ElectronMenus.VIEW_ZOOM = [...browser_2.CommonMenus.VIEW, 'zoom'];
+    ElectronMenus.VIEW_WINDOW = [...browser_1.CommonMenus.VIEW, 'window'];
+    ElectronMenus.VIEW_ZOOM = [...browser_1.CommonMenus.VIEW, 'zoom'];
 })(ElectronMenus = exports.ElectronMenus || (exports.ElectronMenus = {}));
 (function (ElectronMenus) {
-    ElectronMenus.HELP_TOGGLE = [...browser_2.CommonMenus.HELP, 'z_toggle'];
+    ElectronMenus.HELP_TOGGLE = [...browser_1.CommonMenus.HELP, 'z_toggle'];
 })(ElectronMenus = exports.ElectronMenus || (exports.ElectronMenus = {}));
 (function (ElectronMenus) {
-    ElectronMenus.FILE_CLOSE = [...browser_2.CommonMenus.FILE_CLOSE, 'window-close'];
+    ElectronMenus.FILE_CLOSE = [...browser_1.CommonMenus.FILE_CLOSE, 'window-close'];
 })(ElectronMenus = exports.ElectronMenus || (exports.ElectronMenus = {}));
-let ElectronMenuContribution = class ElectronMenuContribution {
+let ElectronMenuContribution = class ElectronMenuContribution extends browser_menu_plugin_1.BrowserMenuBarContribution {
     constructor(factory, shell) {
+        super(factory);
         this.factory = factory;
         this.shell = shell;
+        this.titleBarStyleChangeFlag = false;
     }
     onStart(app) {
-        this.hideTopPanel(app);
-        this.preferenceService.ready.then(() => {
-            this.setMenu();
-            electron.remote.getCurrentWindow().setMenuBarVisibility(true);
-        });
+        this.handleTitleBarStyling(app);
         if (common_1.isOSX) {
             // 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 switches windows.
-            electron.remote.getCurrentWindow().on('focus', () => this.setMenu());
+            electron.remote.getCurrentWindow().on('focus', () => this.setMenu(app));
         }
         // Make sure the application menu is complete, once the frontend application is ready.
         // https://github.com/theia-ide/theia/issues/5100
         let onStateChange = undefined;
         const stateServiceListener = (state) => {
-            if (state === 'ready') {
-                this.setMenu();
-            }
             if (state === 'closing_window') {
                 if (!!onStateChange) {
                     onStateChange.dispose();
@@ -117,6 +115,29 @@ let ElectronMenuContribution = class ElectronMenuContribution {
             this.handleToggleMaximized();
         });
     }
+    handleTitleBarStyling(app) {
+        this.hideTopPanel(app);
+        electron.ipcRenderer.on(electron_messages_1.TitleBarStyleAtStartup, (_event, style) => {
+            this.titleBarStyle = style;
+            this.preferenceService.ready.then(() => {
+                this.preferenceService.set('window.titleBarStyle', this.titleBarStyle, browser_1.PreferenceScope.User);
+            });
+        });
+        electron.ipcRenderer.send(electron_messages_1.RequestTitleBarStyle);
+        this.preferenceService.ready.then(() => {
+            this.setMenu(app);
+            electron.remote.getCurrentWindow().setMenuBarVisibility(['classic', 'visible'].includes(this.preferenceService.get('window.menuBarVisibility', 'classic')));
+        });
+        this.preferenceService.onPreferenceChanged(change => {
+            if (change.preferenceName === 'window.titleBarStyle') {
+                if (this.titleBarStyleChangeFlag && this.titleBarStyle !== change.newValue && electron.remote.getCurrentWindow().isFocused()) {
+                    electron.ipcRenderer.send(electron_messages_1.TitleBarStyleChanged, change.newValue);
+                    this.handleRequiredRestart();
+                }
+                this.titleBarStyleChangeFlag = true;
+            }
+        });
+    }
     handleToggleMaximized() {
         const preference = this.preferenceService.get('window.menuBarVisibility');
         if (preference === 'classic') {
@@ -124,32 +145,85 @@ let ElectronMenuContribution = class ElectronMenuContribution {
         }
     }
     /**
-     * Makes the `theia-top-panel` hidden as it is unused for the electron-based application.
+     * Hides the `theia-top-panel` depending on the selected `titleBarStyle`.
      * The `theia-top-panel` is used as the container of the main, application menu-bar for the
-     * browser. Electron has it's own.
+     * browser. Native Electron has it's own.
      * By default, this method is called on application `onStart`.
      */
     hideTopPanel(app) {
         const itr = app.shell.children();
         let child = itr.next();
         while (child) {
-            // Top panel for the menu contribution is not required for Electron.
+            // Top panel for the menu contribution is not required for native Electron title bar.
             if (child.id === 'theia-top-panel') {
-                child.setHidden(true);
-                child = undefined;
+                child.setHidden(this.titleBarStyle !== 'custom');
+                break;
             }
             else {
                 child = itr.next();
             }
         }
     }
-    setMenu(menu = this.factory.createMenuBar(), electronWindow = electron.remote.getCurrentWindow()) {
+    setMenu(app, electronMenu = this.factory.createElectronMenuBar(), electronWindow = electron.remote.getCurrentWindow()) {
         if (common_1.isOSX) {
-            electron.remote.Menu.setApplicationMenu(menu);
+            electron.remote.Menu.setApplicationMenu(electronMenu);
         }
         else {
+            this.hideTopPanel(app);
+            if (this.titleBarStyle === 'custom' && !this.menuBar) {
+                this.createCustomTitleBar(app, electronWindow);
+            }
             // Unix/Windows: Set the per-window menus
-            electronWindow.setMenu(menu);
+            electronWindow.setMenu(electronMenu);
+        }
+    }
+    createCustomTitleBar(app, electronWindow) {
+        const dragPanel = new browser_1.Widget();
+        dragPanel.id = 'theia-drag-panel';
+        app.shell.addWidget(dragPanel, { area: 'top' });
+        this.appendMenu(app.shell);
+        const controls = document.createElement('div');
+        controls.id = 'window-controls';
+        controls.append(this.createControlButton('minimize', () => electronWindow.minimize()), this.createControlButton('maximize', () => electronWindow.maximize()), this.createControlButton('restore', () => electronWindow.unmaximize()), this.createControlButton('close', () => electronWindow.close()));
+        app.shell.topPanel.node.append(controls);
+        this.handleWindowControls(electronWindow);
+    }
+    handleWindowControls(electronWindow) {
+        toggleControlButtons();
+        electronWindow.on('maximize', toggleControlButtons);
+        electronWindow.on('unmaximize', toggleControlButtons);
+        function toggleControlButtons() {
+            if (electronWindow.isMaximized()) {
+                document.body.classList.add('maximized');
+            }
+            else {
+                document.body.classList.remove('maximized');
+            }
+        }
+    }
+    createControlButton(id, handler) {
+        const button = document.createElement('div');
+        button.id = `${id}-button`;
+        button.className = `control-button ${browser_1.codicon(`chrome-${id}`)}`;
+        button.addEventListener('click', handler);
+        return button;
+    }
+    async handleRequiredRestart() {
+        const msgNode = document.createElement('div');
+        const message = document.createElement('p');
+        message.textContent = common_1.nls.localize('vscode/relauncher.contribution/relaunchSettingMessage', 'A setting has changed that requires a restart to take effect');
+        const detail = document.createElement('p');
+        detail.textContent = common_1.nls.localize('vscode/relauncher.contribution/relaunchSettingDetail', 'Press the restart button to restart {0} and enable the setting.', frontend_application_config_provider_1.FrontendApplicationConfigProvider.get().applicationName);
+        msgNode.append(message, detail);
+        const restart = common_1.nls.localize('vscode/relauncher.contribution/restart', 'Restart');
+        const dialog = new browser_1.ConfirmDialog({
+            title: restart,
+            msg: msgNode,
+            ok: restart,
+            cancel: browser_1.Dialog.CANCEL
+        });
+        if (await dialog.open()) {
+            electron.ipcRenderer.send(electron_messages_1.Restart);
         }
     }
     registerCommands(registry) {
@@ -259,10 +333,6 @@ __decorate([
     inversify_1.inject(frontend_application_state_1.FrontendApplicationStateService),
     __metadata("design:type", frontend_application_state_1.FrontendApplicationStateService)
 ], ElectronMenuContribution.prototype, "stateService", void 0);
-__decorate([
-    inversify_1.inject(browser_1.PreferenceService),
-    __metadata("design:type", Object)
-], ElectronMenuContribution.prototype, "preferenceService", void 0);
 ElectronMenuContribution = __decorate([
     inversify_1.injectable(),
     __param(0, inversify_1.inject(electron_main_menu_factory_1.ElectronMainMenuFactory)),