Skip to content

Restore focus that is lost during Control.setParent() #1916

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
merged 1 commit into from
Mar 18, 2025
Merged

Restore focus that is lost during Control.setParent() #1916

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
6 changes: 6 additions & 0 deletions bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5840,6 +5840,8 @@ public boolean setParent (Composite parent) {
if (parent.isDisposed()) error (SWT.ERROR_INVALID_ARGUMENT);
if (this.parent == parent) return true;
if (!isReparentable ()) return false;
// preserve focus when re-parenting
Control focusControlBeforeReparent = display.getFocusControl();
GTK.gtk_widget_realize (parent.handle);
long topHandle = topHandle ();
GtkAllocation allocation = new GtkAllocation ();
Expand Down Expand Up @@ -5888,6 +5890,10 @@ public boolean setParent (Composite parent) {
this.parent = parent;
setZOrder (null, false, true);
reskin (SWT.ALL);
// restore focus to the last Control that had it, if focus is now gone
if (focusControlBeforeReparent != null && !focusControlBeforeReparent.isDisposed() && display.getFocusControl() == null) {
focusControlBeforeReparent.setFocus();
}
return true;
}

Expand Down
Loading