Skip to content

Browser: better focus transfering #298819

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

Merged
Kyle Cutler (kycutler) merged 2 commits into from
Mar 3, 2026
Merged

Browser: better focus transfering #298819

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
209d5f7
Browser: better focus transfering
kycutler Mar 2, 2026
9b650e3
fix
kycutler Mar 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/vs/platform/browserView/electron-main/browserViewMainService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@ export class BrowserViewMainService extends Disposable implements IBrowserViewMa

// Request the workbench to open the editor
this.windowsMainService.sendToFocused('vscode:runAction', {
id: 'vscode.open',
args: [BrowserViewUri.forUrl(url, targetId)]
id: '_workbench.open',
args: [BrowserViewUri.forUrl(url, targetId), [undefined, { preserveFocus: true }], undefined]
});
Comment thread
kycutler marked this conversation as resolved.

return view;
Expand Down
19 changes: 12 additions & 7 deletions src/vs/workbench/contrib/browserView/electron-browser/browserEditor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,8 @@ export class BrowserEditor extends EditorPane {
this._inputDisposables.clear();

// Resolve the browser view model from the input
this._model = await input.resolve();
const model = await input.resolve();
this._model = model;
if (token.isCancellationRequested || this.input !== input) {
return;
}
Expand Down Expand Up @@ -425,12 +426,16 @@ export class BrowserEditor extends EditorPane {
});
this.setBackgroundImage(this._model.screenshot);

if (context.newInGroup) {
if (this._model.url) {
this._browserContainer.focus();
} else {
this.focusUrlInput();
}
if (!options?.preserveFocus) {
setTimeout(() => {
if (this._model === model) {
if (this._model.url) {
this._browserContainer.focus();
} else {
this.focusUrlInput();
}
}
}, 0);
}

// Start / stop screenshots when the model visibility changes
Expand Down
1 change: 1 addition & 0 deletions src/vs/workbench/contrib/browserView/electron-browser/browserFindWidget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ export class BrowserFindWidget extends SimpleFindWidget {

// Stop find and clear highlights in the browser view
this._model?.stopFindInPage(true);
this._model?.focus();
this._lastFindResult = undefined;
this._hasFoundMatch = false;
}
Expand Down
Loading