development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-13 14:57:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes #55539

Browse source
This commit is contained in:
SteVen Batten 2018-08-01 15:52:47 -07:00
parent 55ae86a53d
commit 3da7b066b2
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/vs/workbench/browser/parts/menubar/menubarPart.ts
View file

@ -106,6 +106,7 @@ export class MenubarPart extends Part {
private updatePending: boolean;
private _modifierKeyStatus: IModifierKeyStatus;
private _focusState: MenubarState;
private openedViaKeyboard: boolean;
private _onVisibilityChange: Emitter<boolean>;
@ -292,7 +293,7 @@ export class MenubarPart extends Part {
}
if (this.focusedMenu) {
this.showCustomMenu(this.focusedMenu.index, !!this._modifierKeyStatus && this._modifierKeyStatus.altKey);
this.showCustomMenu(this.focusedMenu.index, this.openedViaKeyboard);
}
break;
}
@ -644,6 +645,7 @@ export class MenubarPart extends Part {
if ((event.equals(KeyCode.DownArrow) || event.equals(KeyCode.Enter)) && !this.isOpen) {
this.focusedMenu = { index: menuIndex };
this.openedViaKeyboard = true;
this.focusState = MenubarState.OPEN;
} else {
eventHandled = false;
@ -670,10 +672,11 @@ export class MenubarPart extends Part {
this.setUnfocusedState();
} else {
this.cleanupCustomMenu();
this.showCustomMenu(menuIndex, !!this._modifierKeyStatus && this._modifierKeyStatus.altKey);
this.showCustomMenu(menuIndex, this.openedViaKeyboard);
}
} else {
this.focusedMenu = { index: menuIndex };
this.openedViaKeyboard = (e as MouseEvent).detail === 0; // Indicates mouse was not clicked
this.focusState = MenubarState.OPEN;
}