Skip to content

fix(linux): restore a page's focus without scrolling to it #11625

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
triniwiz merged 1 commit into from
Nov 8, 2026
Merged

fix(linux): restore a page's focus without scrolling to it #11625

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 24 additions & 1 deletion packages/core/ui/frame/index.linux.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,37 @@ export class Frame extends FrameBase {
// scrolls there
const focus = this._pageFocus.get(page)?.deref()?.nativeViewProtected;
if (focus && gtk_widget_is_ancestor(focus, native)) {
gtk_widget_grab_focus(focus);
this._restoreFocus(focus, native);
}
}
this._attachedPage = page;
this._updateActionBar(page);
this.requestLayout();
}

/** Refocuses without letting a GtkViewport scroll to it. */
private _restoreFocus(focus: any, page: any): void {
const viewports: any[] = [];
const viewportType = gtk_viewport_get_type();
const pageAddress = addressOf(page);
for (let widget: any = gtk_widget_get_parent(focus); widget; widget = gtk_widget_get_parent(widget)) {
if (g_type_check_instance_is_a(widget, viewportType) && gtk_viewport_get_scroll_to_focus(widget)) {
gtk_viewport_set_scroll_to_focus(widget, 0);
viewports.push(widget);
}
if (addressOf(widget) === pageAddress) {
break;
}
}
try {
gtk_widget_grab_focus(focus);
} finally {
for (const viewport of viewports) {
gtk_viewport_set_scroll_to_focus(viewport, 1);
}
}
}

/** Remembers the view holding keyboard focus in a page that's leaving. */
private _saveFocus(page: Page): void {
const native = page.nativeViewProtected;
Expand Down
Loading