Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add new cases to lose focus #54141

Merged
merged 2 commits into from
Jul 16, 2018
Merged

Add new cases to lose focus #54141

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe1b9c9
ref #54092
sbatten Jul 12, 2018
680011d
addressing feedback
sbatten Jul 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 21 additions & 6 deletions src/vs/workbench/browser/parts/menubar/menubarPart.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ export class MenubarPart extends Part {

this.actionRunner = this._register(new ActionRunner());
this._register(this.actionRunner.onDidBeforeRun(() => {
this.focusState = this.currentMenubarVisibility === 'toggle' ? MenubarState.HIDDEN : MenubarState.VISIBLE;
this.setUnfocusedState();
}));

this._onVisibilityChange = this._register(new Emitter<Dimension>());
Expand Down Expand Up @@ -330,6 +330,7 @@ export class MenubarPart extends Part {
this.container.removeClass('inactive');
} else {
this.container.addClass('inactive');
this.setUnfocusedState();
}
}
}
Expand All @@ -340,6 +341,10 @@ export class MenubarPart extends Part {
}
}

private setUnfocusedState(): void {
this.focusState = this.currentMenubarVisibility === 'toggle' ? MenubarState.HIDDEN : MenubarState.VISIBLE;
}

private hideMenubar(): void {
this._onVisibilityChange.fire(new Dimension(0, 0));
this.container.style('visibility', 'hidden');
Expand Down Expand Up @@ -370,7 +375,7 @@ export class MenubarPart extends Part {
this.focusedMenu = { index: 0 };
this.focusState = MenubarState.FOCUSED;
} else if (!this.isOpen) {
this.focusState = this.currentMenubarVisibility === 'toggle' ? MenubarState.HIDDEN : MenubarState.VISIBLE;
this.setUnfocusedState();
}
}

Expand Down Expand Up @@ -664,14 +669,14 @@ export class MenubarPart extends Part {
}
});

this.customMenus[menuIndex].buttonElement.on(EventType.CLICK, () => {
this.customMenus[menuIndex].buttonElement.on(EventType.CLICK, (e) => {
if (this._modifierKeyStatus && (this._modifierKeyStatus.shiftKey || this._modifierKeyStatus.ctrlKey)) {
return; // supress keyboard shortcuts that shouldn't conflict
}

if (this.isOpen) {
if (this.isCurrentMenu(menuIndex)) {
this.focusState = this.currentMenubarVisibility === 'toggle' ? MenubarState.HIDDEN : MenubarState.VISIBLE;
this.setUnfocusedState();
} else {
this.cleanupCustomMenu();
this.showCustomMenu(menuIndex);
Expand All @@ -680,6 +685,9 @@ export class MenubarPart extends Part {
this.focusedMenu = { index: menuIndex };
this.focusState = MenubarState.OPEN;
}

e.preventDefault();
e.stopPropagation();
});

this.customMenus[menuIndex].buttonElement.on(EventType.MOUSE_ENTER, () => {
Expand All @@ -706,7 +714,7 @@ export class MenubarPart extends Part {
} else if (event.equals(KeyCode.RightArrow) || event.equals(KeyCode.Tab)) {
this.focusNext();
} else if (event.equals(KeyCode.Escape) && this.isFocused && !this.isOpen) {
this.focusState = this.currentMenubarVisibility === 'toggle' ? MenubarState.HIDDEN : MenubarState.VISIBLE;
this.setUnfocusedState();
} else {
eventHandled = false;
}
Expand All @@ -716,6 +724,13 @@ export class MenubarPart extends Part {
event.stopPropagation();
}
});

this._register($(window).on(EventType.CLICK, () => {
// This click is outside the menubar so it counts as a focus out
if (this.isFocused) {
this.setUnfocusedState();
}
}));
}

this.container.on(EventType.FOCUS_IN, (e) => {
Expand All @@ -734,7 +749,7 @@ export class MenubarPart extends Part {
if (event.relatedTarget) {
if (!this.container.getHTMLElement().contains(event.relatedTarget as HTMLElement)) {
this.focusToReturn = null;
this.focusState = this.currentMenubarVisibility === 'toggle' ? MenubarState.HIDDEN : MenubarState.VISIBLE;
this.setUnfocusedState();
}
}
});
Expand Down