@theia/core 1.55.0-next.25 → 1.55.0-next.37
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +7 -7
- package/lib/browser/catalog.json +41 -1
- package/lib/browser/widgets/react-widget.d.ts.map +1 -1
- package/lib/browser/widgets/react-widget.js +3 -1
- package/lib/browser/widgets/react-widget.js.map +1 -1
- package/lib/electron-browser/menu/electron-main-menu-factory.d.ts +5 -3
- package/lib/electron-browser/menu/electron-main-menu-factory.d.ts.map +1 -1
- package/lib/electron-browser/menu/electron-main-menu-factory.js +28 -28
- package/lib/electron-browser/menu/electron-main-menu-factory.js.map +1 -1
- package/lib/electron-browser/menu/electron-menu-contribution.d.ts +1 -2
- package/lib/electron-browser/menu/electron-menu-contribution.d.ts.map +1 -1
- package/lib/electron-browser/menu/electron-menu-contribution.js +2 -2
- package/lib/electron-browser/menu/electron-menu-contribution.js.map +1 -1
- package/package.json +6 -6
- package/src/browser/widgets/react-widget.tsx +3 -1
- package/src/electron-browser/menu/electron-main-menu-factory.ts +32 -31
- package/src/electron-browser/menu/electron-menu-contribution.ts +2 -3
package/README.md
CHANGED
|
@@ -84,12 +84,12 @@ export class SomeClass {
|
|
|
84
84
|
- `@phosphor/signaling` (from [`@phosphor/signaling@1`](https://www.npmjs.com/package/@phosphor/signaling))
|
|
85
85
|
- `@phosphor/virtualdom` (from [`@phosphor/virtualdom@1`](https://www.npmjs.com/package/@phosphor/virtualdom))
|
|
86
86
|
- `@phosphor/widgets` (from [`@phosphor/widgets@1`](https://www.npmjs.com/package/@phosphor/widgets))
|
|
87
|
-
- `@theia/application-package` (from [`@theia/application-package@1.55.0-next.
|
|
88
|
-
- `@theia/application-package/lib/api` (from [`@theia/application-package@1.55.0-next.
|
|
89
|
-
- `@theia/application-package/lib/environment` (from [`@theia/application-package@1.55.0-next.
|
|
90
|
-
- `@theia/request` (from [`@theia/request@1.55.0-next.
|
|
91
|
-
- `@theia/request/lib/proxy` (from [`@theia/request@1.55.0-next.
|
|
92
|
-
- `@theia/request/lib/node-request-service` (from [`@theia/request@1.55.0-next.
|
|
87
|
+
- `@theia/application-package` (from [`@theia/application-package@1.55.0-next.37+4e7843ca5`](https://www.npmjs.com/package/@theia/application-package/v/1.55.0-next.37))
|
|
88
|
+
- `@theia/application-package/lib/api` (from [`@theia/application-package@1.55.0-next.37+4e7843ca5`](https://www.npmjs.com/package/@theia/application-package/v/1.55.0-next.37))
|
|
89
|
+
- `@theia/application-package/lib/environment` (from [`@theia/application-package@1.55.0-next.37+4e7843ca5`](https://www.npmjs.com/package/@theia/application-package/v/1.55.0-next.37))
|
|
90
|
+
- `@theia/request` (from [`@theia/request@1.55.0-next.37+4e7843ca5`](https://www.npmjs.com/package/@theia/request/v/1.55.0-next.37))
|
|
91
|
+
- `@theia/request/lib/proxy` (from [`@theia/request@1.55.0-next.37+4e7843ca5`](https://www.npmjs.com/package/@theia/request/v/1.55.0-next.37))
|
|
92
|
+
- `@theia/request/lib/node-request-service` (from [`@theia/request@1.55.0-next.37+4e7843ca5`](https://www.npmjs.com/package/@theia/request/v/1.55.0-next.37))
|
|
93
93
|
- `fs-extra` (from [`fs-extra@^4.0.2`](https://www.npmjs.com/package/fs-extra))
|
|
94
94
|
- `fuzzy` (from [`fuzzy@^0.1.3`](https://www.npmjs.com/package/fuzzy))
|
|
95
95
|
- `inversify` (from [`inversify@^6.0.1`](https://www.npmjs.com/package/inversify))
|
|
@@ -100,7 +100,7 @@ export class SomeClass {
|
|
|
100
100
|
- `vscode-uri` (from [`vscode-uri@^2.1.1`](https://www.npmjs.com/package/vscode-uri))
|
|
101
101
|
- `@parcel/watcher` (from [`@parcel/watcher@^2.4.1`](https://www.npmjs.com/package/@parcel/watcher))
|
|
102
102
|
- `dompurify` (from [`dompurify@^2.2.9`](https://www.npmjs.com/package/dompurify))
|
|
103
|
-
- `express` (from [`express@^4.
|
|
103
|
+
- `express` (from [`express@^4.21.0`](https://www.npmjs.com/package/express))
|
|
104
104
|
- `lodash.debounce` (from [`lodash.debounce@^4.0.8`](https://www.npmjs.com/package/lodash.debounce))
|
|
105
105
|
- `lodash.throttle` (from [`lodash.throttle@^4.1.1`](https://www.npmjs.com/package/lodash.throttle))
|
|
106
106
|
- `markdown-it` (from [`markdown-it@^12.3.2`](https://www.npmjs.com/package/markdown-it))
|
package/lib/browser/catalog.json
CHANGED
|
@@ -730,6 +730,11 @@
|
|
|
730
730
|
"fileMatch": [".bowerrc"],
|
|
731
731
|
"url": "https://json.schemastore.org/bowerrc.json"
|
|
732
732
|
},
|
|
733
|
+
{
|
|
734
|
+
"name": "BOSH Deploy Config",
|
|
735
|
+
"description": "Deploy config for BOSH CLI",
|
|
736
|
+
"url": "https://json.schemastore.org/bosh-deploy-config.json"
|
|
737
|
+
},
|
|
733
738
|
{
|
|
734
739
|
"name": "Boyka Framework",
|
|
735
740
|
"description": "Boyka Framework config file",
|
|
@@ -4639,7 +4644,12 @@
|
|
|
4639
4644
|
"v1.83.0": "https://raw.githubusercontent.com/returntocorp/semgrep-interfaces/v1.83.0/rule_schema_v1.yaml",
|
|
4640
4645
|
"v1.84.0": "https://raw.githubusercontent.com/returntocorp/semgrep-interfaces/v1.84.0/rule_schema_v1.yaml",
|
|
4641
4646
|
"v1.85.0": "https://raw.githubusercontent.com/returntocorp/semgrep-interfaces/v1.85.0/rule_schema_v1.yaml",
|
|
4642
|
-
"v1.86.0": "https://raw.githubusercontent.com/returntocorp/semgrep-interfaces/v1.86.0/rule_schema_v1.yaml"
|
|
4647
|
+
"v1.86.0": "https://raw.githubusercontent.com/returntocorp/semgrep-interfaces/v1.86.0/rule_schema_v1.yaml",
|
|
4648
|
+
"v1.87.0": "https://raw.githubusercontent.com/returntocorp/semgrep-interfaces/v1.87.0/rule_schema_v1.yaml",
|
|
4649
|
+
"v1.88.0": "https://raw.githubusercontent.com/returntocorp/semgrep-interfaces/v1.88.0/rule_schema_v1.yaml",
|
|
4650
|
+
"v1.89.0": "https://raw.githubusercontent.com/returntocorp/semgrep-interfaces/v1.89.0/rule_schema_v1.yaml",
|
|
4651
|
+
"v1.90.0": "https://raw.githubusercontent.com/returntocorp/semgrep-interfaces/v1.90.0/rule_schema_v1.yaml",
|
|
4652
|
+
"v1.91.0": "https://raw.githubusercontent.com/returntocorp/semgrep-interfaces/v1.91.0/rule_schema_v1.yaml"
|
|
4643
4653
|
}
|
|
4644
4654
|
},
|
|
4645
4655
|
{
|
|
@@ -7053,6 +7063,36 @@
|
|
|
7053
7063
|
"description": "Tab data for a LinUtil",
|
|
7054
7064
|
"fileMatch": ["**/*linutil*/**/tab_data.toml"],
|
|
7055
7065
|
"url": "https://json.schemastore.org/linutil-tab-data.json"
|
|
7066
|
+
},
|
|
7067
|
+
{
|
|
7068
|
+
"name": "ArchitectFX",
|
|
7069
|
+
"description": "Grammar for ArchitectFX's trees",
|
|
7070
|
+
"fileMatch": ["*.jdsl"],
|
|
7071
|
+
"url": "https://json.schemastore.org/architectfx.json"
|
|
7072
|
+
},
|
|
7073
|
+
{
|
|
7074
|
+
"name": "Eidolon Resource",
|
|
7075
|
+
"description": "Resource definitions for Eidolon",
|
|
7076
|
+
"fileMatch": [
|
|
7077
|
+
"*.eidolon.yaml",
|
|
7078
|
+
"*.eidolon.yml",
|
|
7079
|
+
"**/eidolon_resources/**/*.yaml",
|
|
7080
|
+
"**/eidolon_resources/**/*.yml"
|
|
7081
|
+
],
|
|
7082
|
+
"url": "https://www.eidolonai.com/json_schema/v1/resources/overview.json"
|
|
7083
|
+
},
|
|
7084
|
+
{
|
|
7085
|
+
"name": "Waku Config",
|
|
7086
|
+
"description": "Configuration file for the Waku CLI",
|
|
7087
|
+
"fileMatch": [
|
|
7088
|
+
"**/waku.yml",
|
|
7089
|
+
"**/waku.yaml",
|
|
7090
|
+
"**/waku.json",
|
|
7091
|
+
"**/.waku.yml",
|
|
7092
|
+
"**/.waku.yaml",
|
|
7093
|
+
"**/.waku.json"
|
|
7094
|
+
],
|
|
7095
|
+
"url": "https://waku.ngjx.org/static/schema.json"
|
|
7056
7096
|
}
|
|
7057
7097
|
]
|
|
7058
7098
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/widgets/react-widget.tsx"],"names":[],"mappings":"AAgBA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAc,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAEpD,8BACsB,WAAY,SAAQ,UAAU;IAEhD,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC;gBAEA,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ;cAU/B,eAAe,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"react-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/widgets/react-widget.tsx"],"names":[],"mappings":"AAgBA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAc,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAEpD,8BACsB,WAAY,SAAQ,UAAU;IAEhD,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC;gBAEA,OAAO,CAAC,EAAE,MAAM,CAAC,QAAQ;cAU/B,eAAe,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAOtD;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,CAAC,MAAM,IAAI,KAAK,CAAC,SAAS;CAC/C"}
|
|
@@ -35,7 +35,9 @@ let ReactWidget = class ReactWidget extends widget_1.BaseWidget {
|
|
|
35
35
|
}
|
|
36
36
|
onUpdateRequest(msg) {
|
|
37
37
|
super.onUpdateRequest(msg);
|
|
38
|
-
|
|
38
|
+
if (!this.isDisposed) {
|
|
39
|
+
this.nodeRoot.render(React.createElement(React.Fragment, null, this.render()));
|
|
40
|
+
}
|
|
39
41
|
}
|
|
40
42
|
};
|
|
41
43
|
exports.ReactWidget = ReactWidget;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react-widget.js","sourceRoot":"","sources":["../../../src/browser/widgets/react-widget.tsx"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,+BAA+B;AAC/B,yCAAkD;AAClD,yCAA0C;AAC1C,qCAA+C;AAC/C,+CAA2C;AAC3C,6CAAoD;AAG7C,IAAe,WAAW,GAA1B,MAAe,WAAY,SAAQ,mBAAU;IAIhD,YAAyB,OAAyB;QAC9C,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,aAAa,GAAG;YACjB,eAAe,EAAE,IAAI;YACrB,kBAAkB,EAAE,EAAE;SACzB,CAAC;QACF,IAAI,CAAC,QAAQ,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,mBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC1E,CAAC;IAEkB,eAAe,CAAC,GAAY;QAC3C,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QAC3B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,oBAAC,KAAK,CAAC,QAAQ,QAAE,IAAI,CAAC,MAAM,EAAE,CAAkB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"react-widget.js","sourceRoot":"","sources":["../../../src/browser/widgets/react-widget.tsx"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,+BAA+B;AAC/B,yCAAkD;AAClD,yCAA0C;AAC1C,qCAA+C;AAC/C,+CAA2C;AAC3C,6CAAoD;AAG7C,IAAe,WAAW,GAA1B,MAAe,WAAY,SAAQ,mBAAU;IAIhD,YAAyB,OAAyB;QAC9C,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,aAAa,GAAG;YACjB,eAAe,EAAE,IAAI;YACrB,kBAAkB,EAAE,EAAE;SACzB,CAAC;QACF,IAAI,CAAC,QAAQ,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,mBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;IAC1E,CAAC;IAEkB,eAAe,CAAC,GAAY;QAC3C,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QAC3B,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACnB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,oBAAC,KAAK,CAAC,QAAQ,QAAE,IAAI,CAAC,MAAM,EAAE,CAAkB,CAAC,CAAC;QAC3E,CAAC;IACL,CAAC;CASJ,CAAA;AA5BqB,kCAAW;sBAAX,WAAW;IADhC,IAAA,sBAAU,GAAE;IAKI,mBAAA,IAAA,qBAAS,GAAE,CAAA;;GAJN,WAAW,CA4BhC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
/// <reference types="lodash" />
|
|
1
2
|
import { MenuPath, MenuNode } from '../../common';
|
|
2
3
|
import { Keybinding } from '../../common/keybinding';
|
|
3
4
|
import { PreferenceService } from '../../browser';
|
|
@@ -39,11 +40,12 @@ export interface ElectronMenuOptions {
|
|
|
39
40
|
*/
|
|
40
41
|
export 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');
|
|
41
42
|
export declare class ElectronMainMenuFactory extends BrowserMainMenuFactory {
|
|
42
|
-
protected
|
|
43
|
-
protected
|
|
43
|
+
protected menu?: MenuDto[];
|
|
44
|
+
protected toggledCommands: Set<string>;
|
|
44
45
|
protected preferencesService: PreferenceService;
|
|
46
|
+
setMenuBar: import("lodash").DebouncedFunc<() => void>;
|
|
45
47
|
postConstruct(): void;
|
|
46
|
-
|
|
48
|
+
doSetMenuBar(): void;
|
|
47
49
|
createElectronMenuBar(): MenuDto[] | undefined;
|
|
48
50
|
createElectronContextMenu(menuPath: MenuPath, args?: any[], context?: HTMLElement, contextKeyService?: ContextMatcher, skipSingleRootNode?: boolean): MenuDto[];
|
|
49
51
|
protected fillMenuTemplate(parentItems: MenuDto[], menu: MenuNode, args: unknown[] | undefined, options: ElectronMenuOptions, skipRoot: boolean): MenuDto[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-main-menu-factory.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-main-menu-factory.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAwB,QAAQ,EAAE,QAAQ,EAA2D,MAAM,cAAc,CAAC;AACjI,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAkB,MAAM,eAAe,CAAC;AAGlE,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAEvE;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAChC;;;OAGG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAEhC;;;OAGG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IACjC;;;OAGG;IACH,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,cAAc,CAAC;IACnC;;OAEG;IACH,YAAY,EAAE,QAAQ,CAAA;CACzB;AAED;;;GAGG;AACH,MAAM,MAAM,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;IAE/D,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"electron-main-menu-factory.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-main-menu-factory.ts"],"names":[],"mappings":";AAmBA,OAAO,EAAwB,QAAQ,EAAE,QAAQ,EAA2D,MAAM,cAAc,CAAC;AACjI,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAkB,MAAM,eAAe,CAAC;AAGlE,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAEvE;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAChC;;;OAGG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAEhC;;;OAGG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IACjC;;;OAGG;IACH,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,cAAc,CAAC;IACnC;;OAEG;IACH,YAAY,EAAE,QAAQ,CAAA;CACzB;AAED;;;GAGG;AACH,MAAM,MAAM,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;IAE/D,SAAS,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC;IAC3B,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;IAGnD,SAAS,CAAC,kBAAkB,EAAE,iBAAiB,CAAC;IAEhD,UAAU,6CAA4C;IAGtD,aAAa,IAAI,IAAI;IA2BrB,YAAY,IAAI,IAAI;IAKpB,qBAAqB,IAAI,OAAO,EAAE,GAAG,SAAS;IAc9C,yBAAyB,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,OAAO,CAAC,EAAE,WAAW,EAAE,iBAAiB,CAAC,EAAE,cAAc,EAAE,kBAAkB,CAAC,EAAE,OAAO,GAAG,OAAO,EAAE;IAK/J,SAAS,CAAC,gBAAgB,CAAC,WAAW,EAAE,OAAO,EAAE,EAC7C,IAAI,EAAE,QAAQ,EACd,IAAI,uBAAgB,EACpB,OAAO,EAAE,mBAAmB,EAC5B,QAAQ,EAAE,OAAO,GAClB,OAAO,EAAE;IA4EZ,SAAS,CAAC,gBAAgB,CAAC,iBAAiB,EAAE,cAAc,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO;IAOlH;;OAEG;IACH,SAAS,CAAC,cAAc,CAAC,UAAU,EAAE,UAAU,GAAG,MAAM;IAexD,SAAS,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS;cA2BnC,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBpF,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS;IAe/D,SAAS,CAAC,aAAa,IAAI,OAAO;CAoCrC"}
|
|
@@ -27,48 +27,48 @@ const browser_menu_plugin_1 = require("../../browser/menu/browser-menu-plugin");
|
|
|
27
27
|
let ElectronMainMenuFactory = class ElectronMainMenuFactory extends browser_menu_plugin_1.BrowserMainMenuFactory {
|
|
28
28
|
constructor() {
|
|
29
29
|
super(...arguments);
|
|
30
|
-
this.
|
|
30
|
+
this.toggledCommands = new Set();
|
|
31
|
+
this.setMenuBar = debounce(() => this.doSetMenuBar(), 100);
|
|
31
32
|
}
|
|
32
33
|
postConstruct() {
|
|
33
|
-
this.preferencesService.onPreferenceChanged(debounce(e => {
|
|
34
|
-
if (e.preferenceName === 'window.menuBarVisibility') {
|
|
35
|
-
this.setMenuBar();
|
|
36
|
-
}
|
|
37
|
-
if (this._menu) {
|
|
38
|
-
for (const cmd of this._toggledCommands) {
|
|
39
|
-
const menuItem = this.findMenuById(this._menu, cmd);
|
|
40
|
-
if (menuItem) {
|
|
41
|
-
menuItem.checked = this.commandRegistry.isToggled(cmd);
|
|
42
|
-
}
|
|
43
|
-
}
|
|
44
|
-
window.electronTheiaCore.setMenu(this._menu);
|
|
45
|
-
}
|
|
46
|
-
}, 10));
|
|
47
34
|
this.keybindingRegistry.onKeybindingsChanged(() => {
|
|
48
35
|
this.setMenuBar();
|
|
49
36
|
});
|
|
50
37
|
this.menuProvider.onDidChange(() => {
|
|
51
38
|
this.setMenuBar();
|
|
52
39
|
});
|
|
40
|
+
this.preferencesService.ready.then(() => {
|
|
41
|
+
this.preferencesService.onPreferenceChanged(debounce(e => {
|
|
42
|
+
if (e.preferenceName === 'window.menuBarVisibility') {
|
|
43
|
+
this.doSetMenuBar();
|
|
44
|
+
}
|
|
45
|
+
if (this.menu) {
|
|
46
|
+
for (const cmd of this.toggledCommands) {
|
|
47
|
+
const menuItem = this.findMenuById(this.menu, cmd);
|
|
48
|
+
if (menuItem && (!!menuItem.checked !== this.commandRegistry.isToggled(cmd))) {
|
|
49
|
+
menuItem.checked = !menuItem.checked;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
window.electronTheiaCore.setMenu(this.menu);
|
|
53
|
+
}
|
|
54
|
+
}, 10));
|
|
55
|
+
});
|
|
53
56
|
}
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
window.electronTheiaCore.setMenu(createdMenuBar);
|
|
57
|
+
doSetMenuBar() {
|
|
58
|
+
this.menu = this.createElectronMenuBar();
|
|
59
|
+
window.electronTheiaCore.setMenu(this.menu);
|
|
58
60
|
}
|
|
59
61
|
createElectronMenuBar() {
|
|
60
62
|
const preference = this.preferencesService.get('window.menuBarVisibility') || 'classic';
|
|
61
63
|
const maxWidget = document.getElementsByClassName(theia_dock_panel_1.MAXIMIZED_CLASS);
|
|
62
64
|
if (preference === 'visible' || (preference === 'classic' && maxWidget.length === 0)) {
|
|
63
65
|
const menuModel = this.menuProvider.getMenu(common_1.MAIN_MENU_BAR);
|
|
64
|
-
|
|
66
|
+
const menu = this.fillMenuTemplate([], menuModel, [], { honorDisabled: false, rootMenuPath: common_1.MAIN_MENU_BAR }, false);
|
|
65
67
|
if (common_1.isOSX) {
|
|
66
|
-
|
|
68
|
+
menu.unshift(this.createOSXMenu());
|
|
67
69
|
}
|
|
68
|
-
return
|
|
70
|
+
return menu;
|
|
69
71
|
}
|
|
70
|
-
this._menu = undefined;
|
|
71
|
-
// eslint-disable-next-line no-null/no-null
|
|
72
72
|
return undefined;
|
|
73
73
|
}
|
|
74
74
|
createElectronContextMenu(menuPath, args, context, contextKeyService, skipSingleRootNode) {
|
|
@@ -138,7 +138,7 @@ let ElectronMainMenuFactory = class ElectronMainMenuFactory extends browser_menu
|
|
|
138
138
|
}
|
|
139
139
|
parentItems.push(menuItem);
|
|
140
140
|
if (this.commandRegistry.getToggledHandler(commandId, ...args)) {
|
|
141
|
-
this.
|
|
141
|
+
this.toggledCommands.add(commandId);
|
|
142
142
|
}
|
|
143
143
|
}
|
|
144
144
|
return parentItems;
|
|
@@ -198,11 +198,11 @@ let ElectronMainMenuFactory = class ElectronMainMenuFactory extends browser_menu
|
|
|
198
198
|
// We need to check if we can execute it.
|
|
199
199
|
if (this.menuCommandExecutor.isEnabled(menuPath, cmd, ...args)) {
|
|
200
200
|
await this.menuCommandExecutor.executeCommand(menuPath, cmd, ...args);
|
|
201
|
-
if (this.
|
|
202
|
-
const item = this.findMenuById(this.
|
|
201
|
+
if (this.menu && this.menuCommandExecutor.isVisible(menuPath, cmd, ...args)) {
|
|
202
|
+
const item = this.findMenuById(this.menu, cmd);
|
|
203
203
|
if (item) {
|
|
204
204
|
item.checked = this.menuCommandExecutor.isToggled(menuPath, cmd, ...args);
|
|
205
|
-
window.electronTheiaCore.setMenu(this.
|
|
205
|
+
window.electronTheiaCore.setMenu(this.menu);
|
|
206
206
|
}
|
|
207
207
|
}
|
|
208
208
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-main-menu-factory.js","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-main-menu-factory.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,uDAAuD;AAEvD,yCAA8D;AAC9D,yCAAiI;AAEjI,2CAAkE;AAClE,4CAA6C;AAC7C,2EAAuE;AACvE,gFAAgF;AAkDzE,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,4CAAsB;IAA5D;;QAGO,
|
|
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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"}
|
|
@@ -6,7 +6,6 @@ import { BrowserMenuBarContribution } from '../../browser/menu/browser-menu-plug
|
|
|
6
6
|
import { WindowService } from '../../browser/window/window-service';
|
|
7
7
|
import { WindowTitleService } from '../../browser/window/window-title-service';
|
|
8
8
|
import '../../../src/electron-browser/menu/electron-menu-style.css';
|
|
9
|
-
import { MenuDto } from '../../electron-common/electron-api';
|
|
10
9
|
import { ThemeService } from '../../browser/theming';
|
|
11
10
|
import { ThemeChangeEvent } from '../../common/theme';
|
|
12
11
|
export declare namespace ElectronCommands {
|
|
@@ -51,7 +50,7 @@ export declare class ElectronMenuContribution extends BrowserMenuBarContribution
|
|
|
51
50
|
* By default, this method is called on application `onStart`.
|
|
52
51
|
*/
|
|
53
52
|
protected hideTopPanel(app: FrontendApplication): void;
|
|
54
|
-
protected setMenu(app: FrontendApplication
|
|
53
|
+
protected setMenu(app: FrontendApplication): void;
|
|
55
54
|
protected createCustomTitleBar(app: FrontendApplication): void;
|
|
56
55
|
protected createCustomTitleWidget(app: FrontendApplication): void;
|
|
57
56
|
protected handleWindowControls(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-menu-contribution.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-menu-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAoB,iBAAiB,EAAE,gBAAgB,EAAmB,MAAM,cAAc,CAAC;AACrJ,OAAO,EACqB,sBAAsB,EAAE,kBAAkB,EAAmB,MAAM,EAC3F,mBAAmB,EAAE,+BAA+B,EAAuC,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAC1I,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,+BAA+B,EAA4B,MAAM,0CAA0C,CAAC;AAGrH,OAAO,EAAE,0BAA0B,EAAE,MAAM,wCAAwC,CAAC;AACpF,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAE/E,OAAO,4DAA4D,CAAC;AACpE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"electron-menu-contribution.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-menu-contribution.ts"],"names":[],"mappings":"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"}
|
|
@@ -170,7 +170,7 @@ let ElectronMenuContribution = class ElectronMenuContribution extends browser_me
|
|
|
170
170
|
}
|
|
171
171
|
}
|
|
172
172
|
}
|
|
173
|
-
setMenu(app
|
|
173
|
+
setMenu(app) {
|
|
174
174
|
if (!common_1.isOSX) {
|
|
175
175
|
this.hideTopPanel(app);
|
|
176
176
|
if (this.titleBarStyle === 'custom' && !this.menuBar) {
|
|
@@ -178,7 +178,7 @@ let ElectronMenuContribution = class ElectronMenuContribution extends browser_me
|
|
|
178
178
|
return;
|
|
179
179
|
}
|
|
180
180
|
}
|
|
181
|
-
|
|
181
|
+
this.factory.setMenuBar();
|
|
182
182
|
}
|
|
183
183
|
createCustomTitleBar(app) {
|
|
184
184
|
const dragPanel = new browser_1.Widget();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-menu-contribution.js","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-menu-contribution.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"electron-menu-contribution.js","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-menu-contribution.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/core",
|
|
3
|
-
"version": "1.55.0-next.
|
|
3
|
+
"version": "1.55.0-next.37+4e7843ca5",
|
|
4
4
|
"description": "Theia is a cloud & desktop IDE framework implemented in TypeScript.",
|
|
5
5
|
"main": "lib/common/index.js",
|
|
6
6
|
"typings": "lib/common/index.d.ts",
|
|
@@ -17,12 +17,12 @@
|
|
|
17
17
|
"@phosphor/signaling": "1",
|
|
18
18
|
"@phosphor/virtualdom": "1",
|
|
19
19
|
"@phosphor/widgets": "1",
|
|
20
|
-
"@theia/application-package": "1.55.0-next.
|
|
21
|
-
"@theia/request": "1.55.0-next.
|
|
20
|
+
"@theia/application-package": "1.55.0-next.37+4e7843ca5",
|
|
21
|
+
"@theia/request": "1.55.0-next.37+4e7843ca5",
|
|
22
22
|
"@types/body-parser": "^1.16.4",
|
|
23
23
|
"@types/cookie": "^0.3.3",
|
|
24
24
|
"@types/dompurify": "^2.2.2",
|
|
25
|
-
"@types/express": "^4.
|
|
25
|
+
"@types/express": "^4.17.21",
|
|
26
26
|
"@types/fs-extra": "^4.0.2",
|
|
27
27
|
"@types/lodash.debounce": "4.0.3",
|
|
28
28
|
"@types/lodash.throttle": "^4.1.3",
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
"dompurify": "^2.2.9",
|
|
43
43
|
"drivelist": "^9.0.2",
|
|
44
44
|
"es6-promise": "^4.2.4",
|
|
45
|
-
"express": "^4.
|
|
45
|
+
"express": "^4.21.0",
|
|
46
46
|
"fast-json-stable-stringify": "^2.1.0",
|
|
47
47
|
"file-icons-js": "~1.0.3",
|
|
48
48
|
"font-awesome": "^4.7.0",
|
|
@@ -218,5 +218,5 @@
|
|
|
218
218
|
"nyc": {
|
|
219
219
|
"extends": "../../configs/nyc.json"
|
|
220
220
|
},
|
|
221
|
-
"gitHead": "
|
|
221
|
+
"gitHead": "4e7843ca5ce4625e3b4823b9a87debd805906fba"
|
|
222
222
|
}
|
|
@@ -38,7 +38,9 @@ export abstract class ReactWidget extends BaseWidget {
|
|
|
38
38
|
|
|
39
39
|
protected override onUpdateRequest(msg: Message): void {
|
|
40
40
|
super.onUpdateRequest(msg);
|
|
41
|
-
|
|
41
|
+
if (!this.isDisposed) {
|
|
42
|
+
this.nodeRoot.render(<React.Fragment>{this.render()}</React.Fragment>);
|
|
43
|
+
}
|
|
42
44
|
}
|
|
43
45
|
|
|
44
46
|
/**
|
|
@@ -74,42 +74,45 @@ export type ElectronMenuItemRole = ('undo' | 'redo' | 'cut' | 'copy' | 'paste' |
|
|
|
74
74
|
@injectable()
|
|
75
75
|
export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
|
|
76
76
|
|
|
77
|
-
protected
|
|
78
|
-
protected
|
|
77
|
+
protected menu?: MenuDto[];
|
|
78
|
+
protected toggledCommands: Set<string> = new Set();
|
|
79
79
|
|
|
80
80
|
@inject(PreferenceService)
|
|
81
81
|
protected preferencesService: PreferenceService;
|
|
82
82
|
|
|
83
|
+
setMenuBar = debounce(() => this.doSetMenuBar(), 100);
|
|
84
|
+
|
|
83
85
|
@postConstruct()
|
|
84
86
|
postConstruct(): void {
|
|
85
|
-
this.preferencesService.onPreferenceChanged(
|
|
86
|
-
debounce(e => {
|
|
87
|
-
if (e.preferenceName === 'window.menuBarVisibility') {
|
|
88
|
-
this.setMenuBar();
|
|
89
|
-
}
|
|
90
|
-
if (this._menu) {
|
|
91
|
-
for (const cmd of this._toggledCommands) {
|
|
92
|
-
const menuItem = this.findMenuById(this._menu, cmd);
|
|
93
|
-
if (menuItem) {
|
|
94
|
-
menuItem.checked = this.commandRegistry.isToggled(cmd);
|
|
95
|
-
}
|
|
96
|
-
}
|
|
97
|
-
window.electronTheiaCore.setMenu(this._menu);
|
|
98
|
-
}
|
|
99
|
-
}, 10)
|
|
100
|
-
);
|
|
101
87
|
this.keybindingRegistry.onKeybindingsChanged(() => {
|
|
102
88
|
this.setMenuBar();
|
|
103
89
|
});
|
|
104
90
|
this.menuProvider.onDidChange(() => {
|
|
105
91
|
this.setMenuBar();
|
|
106
92
|
});
|
|
93
|
+
this.preferencesService.ready.then(() => {
|
|
94
|
+
this.preferencesService.onPreferenceChanged(
|
|
95
|
+
debounce(e => {
|
|
96
|
+
if (e.preferenceName === 'window.menuBarVisibility') {
|
|
97
|
+
this.doSetMenuBar();
|
|
98
|
+
}
|
|
99
|
+
if (this.menu) {
|
|
100
|
+
for (const cmd of this.toggledCommands) {
|
|
101
|
+
const menuItem = this.findMenuById(this.menu, cmd);
|
|
102
|
+
if (menuItem && (!!menuItem.checked !== this.commandRegistry.isToggled(cmd))) {
|
|
103
|
+
menuItem.checked = !menuItem.checked;
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
window.electronTheiaCore.setMenu(this.menu);
|
|
107
|
+
}
|
|
108
|
+
}, 10)
|
|
109
|
+
);
|
|
110
|
+
});
|
|
107
111
|
}
|
|
108
112
|
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
window.electronTheiaCore.setMenu(createdMenuBar);
|
|
113
|
+
doSetMenuBar(): void {
|
|
114
|
+
this.menu = this.createElectronMenuBar();
|
|
115
|
+
window.electronTheiaCore.setMenu(this.menu);
|
|
113
116
|
}
|
|
114
117
|
|
|
115
118
|
createElectronMenuBar(): MenuDto[] | undefined {
|
|
@@ -117,14 +120,12 @@ export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
|
|
|
117
120
|
const maxWidget = document.getElementsByClassName(MAXIMIZED_CLASS);
|
|
118
121
|
if (preference === 'visible' || (preference === 'classic' && maxWidget.length === 0)) {
|
|
119
122
|
const menuModel = this.menuProvider.getMenu(MAIN_MENU_BAR);
|
|
120
|
-
|
|
123
|
+
const menu = this.fillMenuTemplate([], menuModel, [], { honorDisabled: false, rootMenuPath: MAIN_MENU_BAR }, false);
|
|
121
124
|
if (isOSX) {
|
|
122
|
-
|
|
125
|
+
menu.unshift(this.createOSXMenu());
|
|
123
126
|
}
|
|
124
|
-
return
|
|
127
|
+
return menu;
|
|
125
128
|
}
|
|
126
|
-
this._menu = undefined;
|
|
127
|
-
// eslint-disable-next-line no-null/no-null
|
|
128
129
|
return undefined;
|
|
129
130
|
}
|
|
130
131
|
|
|
@@ -208,7 +209,7 @@ export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
|
|
|
208
209
|
parentItems.push(menuItem);
|
|
209
210
|
|
|
210
211
|
if (this.commandRegistry.getToggledHandler(commandId, ...args)) {
|
|
211
|
-
this.
|
|
212
|
+
this.toggledCommands.add(commandId);
|
|
212
213
|
}
|
|
213
214
|
}
|
|
214
215
|
return parentItems;
|
|
@@ -273,11 +274,11 @@ export class ElectronMainMenuFactory extends BrowserMainMenuFactory {
|
|
|
273
274
|
// We need to check if we can execute it.
|
|
274
275
|
if (this.menuCommandExecutor.isEnabled(menuPath, cmd, ...args)) {
|
|
275
276
|
await this.menuCommandExecutor.executeCommand(menuPath, cmd, ...args);
|
|
276
|
-
if (this.
|
|
277
|
-
const item = this.findMenuById(this.
|
|
277
|
+
if (this.menu && this.menuCommandExecutor.isVisible(menuPath, cmd, ...args)) {
|
|
278
|
+
const item = this.findMenuById(this.menu, cmd);
|
|
278
279
|
if (item) {
|
|
279
280
|
item.checked = this.menuCommandExecutor.isToggled(menuPath, cmd, ...args);
|
|
280
|
-
window.electronTheiaCore.setMenu(this.
|
|
281
|
+
window.electronTheiaCore.setMenu(this.menu);
|
|
281
282
|
}
|
|
282
283
|
}
|
|
283
284
|
}
|
|
@@ -29,7 +29,6 @@ import { WindowService } from '../../browser/window/window-service';
|
|
|
29
29
|
import { WindowTitleService } from '../../browser/window/window-title-service';
|
|
30
30
|
|
|
31
31
|
import '../../../src/electron-browser/menu/electron-menu-style.css';
|
|
32
|
-
import { MenuDto } from '../../electron-common/electron-api';
|
|
33
32
|
import { ThemeService } from '../../browser/theming';
|
|
34
33
|
import { ThemeChangeEvent } from '../../common/theme';
|
|
35
34
|
|
|
@@ -203,7 +202,7 @@ export class ElectronMenuContribution extends BrowserMenuBarContribution impleme
|
|
|
203
202
|
}
|
|
204
203
|
}
|
|
205
204
|
|
|
206
|
-
protected setMenu(app: FrontendApplication
|
|
205
|
+
protected setMenu(app: FrontendApplication): void {
|
|
207
206
|
if (!isOSX) {
|
|
208
207
|
this.hideTopPanel(app);
|
|
209
208
|
if (this.titleBarStyle === 'custom' && !this.menuBar) {
|
|
@@ -211,7 +210,7 @@ export class ElectronMenuContribution extends BrowserMenuBarContribution impleme
|
|
|
211
210
|
return;
|
|
212
211
|
}
|
|
213
212
|
}
|
|
214
|
-
|
|
213
|
+
this.factory.setMenuBar();
|
|
215
214
|
}
|
|
216
215
|
|
|
217
216
|
protected createCustomTitleBar(app: FrontendApplication): void {
|