Commit 0f8a29a

Akos Kittakittaakos

Akos Kitta

authored and

committed

Disabled MenuItem roles on macOS.

Closes #969 Upstream-ref: eclipse-theia/theia#11217 Signed-off-by: Akos Kitta <a.kitta@arduino.cc>

1 parent a54d7c8 commit 0f8a29aCopy full SHA for 0f8a29a

File tree

+10

-0

lines changed

arduino-ide-extension/src/electron-browser/theia/core
- electron-main-menu-factory.ts

+10

-0

lines changed

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import {`
`8`	`8`	`} from '@theia/core/lib/common/menu';`
`9`	`9`	`import {`
`10`	`10`	`ElectronMainMenuFactory as TheiaElectronMainMenuFactory,`
	`11`	`+ ElectronMenuItemRole,`
`11`	`12`	`ElectronMenuOptions,`
`12`	`13`	`} from '@theia/core/lib/electron-browser/menu/electron-main-menu-factory';`
`13`	`14`	`import {`
`@@ -123,6 +124,15 @@ export class ElectronMainMenuFactory extends TheiaElectronMainMenuFactory {`
`123`	`124`	`return { label, submenu };`
`124`	`125`	`}`
`125`	`126`
	`127`	`+ // eslint-disable-next-line @typescript-eslint/no-unused-vars`
	`128`	`+ protected override roleFor(id: string): ElectronMenuItemRole \| undefined {`
	`129`	+ // MenuItem `roles` are completely broken on macOS:
	`130`	`+ // - https://github.com/eclipse-theia/theia/issues/11217,`
	`131`	`+ // - https://github.com/arduino/arduino-ide/issues/969`
	`132`	`+ // IDE2 uses commands instead.`
	`133`	`+ return undefined;`
	`134`	`+ }`
	`135`	`+`
`126`	`136`	`protected override handleElectronDefault(`
`127`	`137`	`menuNode: CompositeMenuNode,`
`128`	`138`	`args: any[] = [],`

Comments

(0)