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

fix hover and outline behavior #55200

Merged
merged 2 commits into from
Jul 27, 2018
Merged

fix hover and outline behavior #55200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e63d824
fix hover and outline behavior
sbatten Jul 26, 2018
22542ca
Merge branch 'master' into sbatten/fixHoverAndOutline
sbatten Jul 27, 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
20 changes: 16 additions & 4 deletions src/vs/base/browser/ui/actionbar/actionbar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,15 @@ export class ActionBar implements IActionRunner {
if (this.options.isMenu) {
this.domNode.tabIndex = 0;

$(this.domNode).on(DOM.EventType.MOUSE_OUT, (e) => {
let relatedTarget = (e as MouseEvent).relatedTarget as HTMLElement;
if (!DOM.isAncestor(relatedTarget, this.domNode)) {
this.focusedItem = undefined;
this.updateFocus();
e.stopPropagation();
}
});

$(this.actionsList).on(DOM.EventType.MOUSE_OVER, (e) => {
let target = e.target as HTMLElement;
if (!target || !DOM.isAncestor(target, this.actionsList) || target === this.actionsList) {
Expand All @@ -509,7 +518,7 @@ export class ActionBar implements IActionRunner {
target = target.parentElement;
}

if (DOM.hasClass(target, 'action-item') && !DOM.hasClass(target, 'disabled')) {
if (DOM.hasClass(target, 'action-item')) {
const lastFocusedItem = this.focusedItem;
this.setFocusedItem(target);

Expand Down Expand Up @@ -730,7 +739,6 @@ export class ActionBar implements IActionRunner {
private updateFocus(fromRight?: boolean): void {
if (typeof this.focusedItem === 'undefined') {
this.domNode.focus();
return;
}

for (let i = 0; i < this.items.length; i++) {
Expand All @@ -739,8 +747,12 @@ export class ActionBar implements IActionRunner {
let actionItem = <any>item;

if (i === this.focusedItem) {
if (types.isFunction(actionItem.focus)) {
actionItem.focus(fromRight);
if (types.isFunction(actionItem.isEnabled)) {
if (actionItem.isEnabled() && types.isFunction(actionItem.focus)) {
actionItem.focus(fromRight);
} else {
this.domNode.focus();
}
}
} else {
if (types.isFunction(actionItem.blur)) {
Expand Down
31 changes: 9 additions & 22 deletions src/vs/base/browser/ui/menu/menu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { IActionRunner, IAction, Action } from 'vs/base/common/actions';
import { ActionBar, IActionItemProvider, ActionsOrientation, Separator, ActionItem, IActionItemOptions, BaseActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
import { ResolvedKeybinding, KeyCode } from 'vs/base/common/keyCodes';
import { Event } from 'vs/base/common/event';
import { addClass, EventType, EventHelper, EventLike, removeTabIndexAndUpdateFocus } from 'vs/base/browser/dom';
import { addClass, EventType, EventHelper, EventLike, removeTabIndexAndUpdateFocus, isAncestor } from 'vs/base/browser/dom';
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
import { $, Builder } from 'vs/base/browser/builder';
import { RunOnceScheduler } from 'vs/base/common/async';
Expand Down Expand Up @@ -241,8 +241,6 @@ class MenuActionItem extends BaseActionItem {
class SubmenuActionItem extends MenuActionItem {
private mysubmenu: Menu;
private submenuContainer: Builder;
private mouseOver: boolean;
private showScheduler: RunOnceScheduler;
private hideScheduler: RunOnceScheduler;

constructor(
Expand All @@ -253,16 +251,9 @@ class SubmenuActionItem extends MenuActionItem {
) {
super(action, action, { label: true, isMenu: true });

this.showScheduler = new RunOnceScheduler(() => {
if (this.mouseOver) {
this.cleanupExistingSubmenu(false);
this.createSubmenu(false);
}
}, 250);

this.hideScheduler = new RunOnceScheduler(() => {
if (!this.mouseOver && this.parentData.submenu === this.mysubmenu) {
this.parentData.parent.focus();
if ((!isAncestor(document.activeElement, this.builder.getHTMLElement()) && this.parentData.submenu === this.mysubmenu)) {
this.parentData.parent.focus(false);
this.cleanupExistingSubmenu(true);
}
}, 750);
Expand Down Expand Up @@ -292,17 +283,14 @@ class SubmenuActionItem extends MenuActionItem {
});

$(this.builder).on(EventType.MOUSE_OVER, (e) => {
if (!this.mouseOver) {
this.mouseOver = true;

this.showScheduler.schedule();
}
this.cleanupExistingSubmenu(false);
this.createSubmenu(false);
});

$(this.builder).on(EventType.MOUSE_LEAVE, (e) => {
this.mouseOver = false;

this.hideScheduler.schedule();
$(this.builder).on(EventType.FOCUS_OUT, (e) => {
if (!isAncestor(document.activeElement, this.builder.getHTMLElement())) {
this.hideScheduler.schedule();
}
});
}

Expand Down Expand Up @@ -368,7 +356,6 @@ class SubmenuActionItem extends MenuActionItem {
super.dispose();

this.hideScheduler.dispose();
this.showScheduler.dispose();

if (this.mysubmenu) {
this.mysubmenu.dispose();
Expand Down
10 changes: 7 additions & 3 deletions src/vs/workbench/browser/parts/menubar/media/menubarpart.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,23 @@
zoom: 1;
}

.menubar-menu-items-holder {
.monaco-workbench .part.menubar .menubar-menu-items-holder {
position: absolute;
left: 0px;
opacity: 1;
z-index: 2000;
}

.menubar-menu-items-holder.monaco-menu-container {
.monaco-workbench .part.menubar .menubar-menu-items-holder.monaco-menu-container {
font-family: "Segoe WPC", "Segoe UI", ".SFNSDisplay-Light", "SFUIText-Light", "HelveticaNeue-Light", sans-serif, "Droid Sans Fallback";
outline: 0;
border: none;
}

.menubar-menu-items-holder.monaco-menu-container :focus {
.monaco-workbench .part.menubar .menubar-menu-items-holder.monaco-menu-container :focus {
outline: 0;
}

.hc-black .monaco-workbench .part.menubar .menubar-menu-items-holder.monaco-menu-container {
border: 2px solid #6FC3DF;
}