|
3 | 3 | * Licensed under the MIT License. See License.txt in the project root for license information. |
4 | 4 | *--------------------------------------------------------------------------------------------*/ |
5 | 5 |
|
6 | | -import { app, BrowserWindow, KeyboardEvent, Menu, MenuItem, MenuItemConstructorOptions, WebContents } from 'electron'; |
| 6 | +import { app, BrowserWindow, BaseWindow, KeyboardEvent, Menu, MenuItem, MenuItemConstructorOptions, WebContents } from 'electron'; |
7 | 7 | import { WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from '../../../base/common/actions.js'; |
8 | 8 | import { RunOnceScheduler } from '../../../base/common/async.js'; |
9 | 9 | import { CancellationToken } from '../../../base/common/cancellation.js'; |
@@ -63,7 +63,7 @@ export class Menubar extends Disposable { |
63 | 63 |
|
64 | 64 | private keybindings: { [commandId: string]: IMenubarKeybinding }; |
65 | 65 |
|
66 | | - private readonly fallbackMenuHandlers: { [id: string]: (menuItem: MenuItem, browserWindow: BrowserWindow | undefined, event: KeyboardEvent) => void } = Object.create(null); |
| 66 | + private readonly fallbackMenuHandlers: { [id: string]: (menuItem: MenuItem, browserWindow: BaseWindow | undefined, event: KeyboardEvent) => void } = Object.create(null); |
67 | 67 |
|
68 | 68 | constructor( |
69 | 69 | @IUpdateService private readonly updateService: IUpdateService, |
@@ -744,8 +744,8 @@ export class Menubar extends Disposable { |
744 | 744 | return new MenuItem(this.withKeybinding(commandId, options)); |
745 | 745 | } |
746 | 746 |
|
747 | | - private makeContextAwareClickHandler(click: (menuItem: MenuItem, win: BrowserWindow, event: KeyboardEvent) => void, contextSpecificHandlers: IMenuItemClickHandler): (menuItem: MenuItem, win: BrowserWindow | undefined, event: KeyboardEvent) => void { |
748 | | - return (menuItem: MenuItem, win: BrowserWindow | undefined, event: KeyboardEvent) => { |
| 747 | + private makeContextAwareClickHandler(click: (menuItem: MenuItem, win: BaseWindow, event: KeyboardEvent) => void, contextSpecificHandlers: IMenuItemClickHandler): (menuItem: MenuItem, win: BaseWindow | undefined, event: KeyboardEvent) => void { |
| 748 | + return (menuItem: MenuItem, win: BaseWindow | undefined, event: KeyboardEvent) => { |
749 | 749 |
|
750 | 750 | // No Active Window |
751 | 751 | const activeWindow = BrowserWindow.getFocusedWindow(); |
|
0 commit comments