Merge pull request #68575 from mjbvz/fix-webview-focus-menu

Fix clicking on webviews does not dismiss custom title bar menu
This commit is contained in:
Matt Bierner
2019-02-13 11:01:36 -08:00
committed by GitHub

View File

@@ -150,12 +150,10 @@ export class MenuBar extends Disposable {
this._register(DOM.addDisposableListener(this.container, DOM.EventType.FOCUS_OUT, (e) => { this._register(DOM.addDisposableListener(this.container, DOM.EventType.FOCUS_OUT, (e) => {
let event = e as FocusEvent; let event = e as FocusEvent;
if (event.relatedTarget) { if (!event.relatedTarget || !this.container.contains(event.relatedTarget as HTMLElement)) {
if (!this.container.contains(event.relatedTarget as HTMLElement)) {
this.focusToReturn = undefined; this.focusToReturn = undefined;
this.setUnfocusedState(); this.setUnfocusedState();
} }
}
})); }));
this._register(DOM.addDisposableListener(window, DOM.EventType.KEY_DOWN, (e: KeyboardEvent) => { this._register(DOM.addDisposableListener(window, DOM.EventType.KEY_DOWN, (e: KeyboardEvent) => {