diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts index 6e7c479e58dd5ead5590edb04545bce315f79ead..02b3d4115ea2897a38930e933dcc73edf46fa29a 100644 --- a/src/vs/base/browser/dom.ts +++ b/src/vs/base/browser/dom.ts @@ -819,6 +819,7 @@ export const EventType = { MOUSE_OVER: 'mouseover', MOUSE_MOVE: 'mousemove', MOUSE_OUT: 'mouseout', + MOUSE_ENTER: 'mouseenter', MOUSE_LEAVE: 'mouseleave', CONTEXT_MENU: 'contextmenu', WHEEL: 'wheel', diff --git a/src/vs/workbench/browser/parts/menubar/menubarPart.ts b/src/vs/workbench/browser/parts/menubar/menubarPart.ts index af50fa982b4df3c156e9d16ac924dfb3c2972d28..e5cd5b529af56fe468df62d9b8ef072afc2fe3ca 100644 --- a/src/vs/workbench/browser/parts/menubar/menubarPart.ts +++ b/src/vs/workbench/browser/parts/menubar/menubarPart.ts @@ -489,7 +489,7 @@ export class MenubarPart extends Part { menu.onDidChange(() => updateActions(menu, this.customMenus[menuIndex].actions)); updateActions(menu, this.customMenus[menuIndex].actions); - this.customMenus[menuIndex].titleElement.on(EventType.CLICK, (event) => { + this.customMenus[menuIndex].titleElement.on(EventType.CLICK, () => { if (this._modifierKeyStatus && (this._modifierKeyStatus.shiftKey || this._modifierKeyStatus.ctrlKey)) { return; // supress keyboard shortcuts that shouldn't conflict } @@ -498,21 +498,21 @@ export class MenubarPart extends Part { this.isFocused = !this.isFocused; }); - this.customMenus[menuIndex].titleElement.getHTMLElement().onmouseenter = () => { + this.customMenus[menuIndex].titleElement.on(EventType.MOUSE_ENTER, () => { if (this.isFocused && !this.isCurrentMenu(menuIndex)) { this.toggleCustomMenu(menuIndex); } - }; + }); - this.customMenus[menuIndex].titleElement.getHTMLElement().onmouseleave = () => { + this.customMenus[menuIndex].titleElement.on(EventType.MOUSE_LEAVE, () => { if (!this.isFocused) { this.cleanupCustomMenu(); } - }; + }); - this.customMenus[menuIndex].titleElement.getHTMLElement().onblur = () => { + this.customMenus[menuIndex].titleElement.on(EventType.BLUR, () => { this.cleanupCustomMenu(); - }; + }); } this.container.off(EventType.KEY_DOWN);