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 webview focus steal that occurs when the application is re-focused #98847

Merged
merged 7 commits into from Jul 13, 2020
Merged

Fix webview focus steal that occurs when the application is re-focused #98847

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7dfe656
Merge pull request #1 from microsoft/master
Linskeyd May 17, 2019
bce6bb2
Merge pull request #2 from microsoft/master
Linskeyd Jul 25, 2019
df2f886
Merge pull request #3 from microsoft/master
Linskeyd Sep 3, 2019
8e70e96
Merge pull request #4 from microsoft/master
Linskeyd Oct 1, 2019
b6dae03
Merge pull request #5 from microsoft/master
Linskeyd May 29, 2020
cb97052
Fix webviews stealing focus when not last focused
Linskeyd May 29, 2020
681e2bc
Merge branch 'master' into fix-webview-focus-steal
mjbvz Jul 13, 2020
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
5 changes: 4 additions & 1 deletion src/vs/workbench/contrib/webview/browser/webviewEditor.ts
View file
Open in desktop
Expand Up @@ -19,6 +19,7 @@ import { WebviewInput } from 'vs/workbench/contrib/webview/browser/webviewEditor
import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { IHostService } from 'vs/workbench/services/host/browser/host';
import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService';

export class WebviewEditor extends BaseEditor {

Expand All @@ -39,6 +40,8 @@ export class WebviewEditor extends BaseEditor {
@IThemeService themeService: IThemeService,
@IStorageService storageService: IStorageService,
@IEditorService private readonly _editorService: IEditorService,
@IWorkbenchLayoutService private readonly _workbenchLayoutService: IWorkbenchLayoutService,
@IEditorGroupsService private readonly _editorGroupsService: IEditorGroupsService,
@IEditorDropService private readonly _editorDropService: IEditorDropService,
@IHostService private readonly _hostService: IHostService,
) {
Expand Down Expand Up @@ -76,7 +79,7 @@ export class WebviewEditor extends BaseEditor {
if (!this._onFocusWindowHandler.value && !isWeb) {
// Make sure we restore focus when switching back to a VS Code window
this._onFocusWindowHandler.value = this._hostService.onDidChangeFocus(focused => {
if (focused && this._editorService.activeEditorPane === this) {
if (focused && this._editorService.activeEditorPane === this && this._workbenchLayoutService.hasFocus(Parts.EDITOR_PART)) {
this.focus();
}
});
Expand Down