Skip to content

[Gtk4] Fix stale/unresponsive fast-view restore buttons and toolbar #3440

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
akurtakov merged 1 commit into from
Jul 16, 2026
+44 −13
Merged

[Gtk4] Fix stale/unresponsive fast-view restore buttons and toolbar #3440

Show file tree
Hide file tree
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: 21 additions & 4 deletions bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Composite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1396,7 +1396,20 @@ void moveAbove (long child, long sibling) {
long parentHandle = parentingHandle ();
if (GTK.GTK4) {
if (sibling == 0) {
GTK4.gtk_widget_insert_after(child, parentHandle, 0L);
/*
* True raise-to-top-of-paint-order, scoped to Shell-direct
* children (e.g. an overlay pane raised via moveAbove(null)).
* GTK4 has no per-widget GdkWindow, so this same native sibling
* list also backs Composite._getChildren(); other code already
* relies on today's insert_after(..., NULL) behaviour to keep
* getChildren() stable for non-Shell parents, so this is not
* changed generally.
*/
if (this instanceof Shell) {
GTK4.gtk_widget_insert_before(child, parentHandle, 0L);
} else {
GTK4.gtk_widget_insert_after(child, parentHandle, 0L);
}
} else {
GTK4.gtk_widget_insert_before(child, parentHandle, sibling);
}
Expand All @@ -1416,16 +1429,20 @@ void moveBelow (long child, long sibling) {
* scrolled content instead.
*
* Not needed on GTK4: widgets have no per-widget GdkWindow, so paint order
* is simply the parent's child-list order (first = bottom, last = top), and
* the general branch below already appends the child to the end (top).
* is simply the parent's child-list order (first = bottom, last = top).
*/
if (!GTK.GTK4 && sibling == 0 && parentHandle == fixedHandle) {
moveAbove (child, scrolledHandle != 0 ? scrolledHandle : handle);
return;
}
if (GTK.GTK4) {
/* Mirror image of moveAbove - see the comment there. */
if (sibling == 0) {
GTK4.gtk_widget_insert_before(child, parentHandle, 0L);
if (this instanceof Shell) {
GTK4.gtk_widget_insert_after(child, parentHandle, 0L);
} else {
GTK4.gtk_widget_insert_before(child, parentHandle, 0L);
}
} else {
GTK4.gtk_widget_insert_after(child, parentHandle, sibling);
}
Expand Down
23 changes: 17 additions & 6 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 @@ -815,7 +815,13 @@ void createWidget(int index) {
checkBuffered();
showWidget();
setInitialBounds();
setZOrder(null, false, false);
if (GTK.GTK4 && !(this instanceof Shell)) {
/* moveBelow(null) now sinks Shell-direct children to the back
* (see Composite.moveAbove) - guard against undoing that. */
setZOrder(null, false, false, !(parent instanceof Shell));
} else {
setZOrder(null, false, false);
}
if (!GTK.GTK4) setRelations();
checkMirrored();
checkBorder();
Expand Down Expand Up @@ -4833,10 +4839,10 @@ void destroyWidget() {
// GTK windows don't have a parent, so destroy it now
GTK4.gtk_window_destroy(currHandle);
} else if (parent != null) {
if (fixedHandle != 0) {
// Remove widget from hierarchy by removing it from parent container
OS.swt_fixed_remove(parent.parentingHandle(), fixedHandle);
}
/* Use currHandle, not fixedHandle alone - widgets without a
* separate fixedHandle wrapper were otherwise never actually
* unparented here, leaving them alive and rendered natively. */
OS.swt_fixed_remove(parent.parentingHandle(), currHandle);
} else {
assert false : "widgets must have a parent or be a GtkWindow";
}
Expand Down Expand Up @@ -5925,7 +5931,12 @@ public boolean setParent (Composite parent) {
allocation.height = height;
gtk_widget_size_allocate(topHandle, allocation, -1);
this.parent = parent;
setZOrder (null, false, true);
if (GTK.GTK4 && !(this instanceof Shell)) {
/* See createWidget() re: guarding fixChildren on GTK4. */
setZOrder (null, false, true, !(parent instanceof Shell));
} else {
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) {
Expand Down
9 changes: 6 additions & 3 deletions bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolBar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,10 @@ public int getItemCount () {

int itemCount = 0;
if (GTK.GTK4) {
/* Must match _getItems(): a Menu's GtkPopover is also parented here
* as a native child and would otherwise count as a phantom item. */
for (long child = GTK4.gtk_widget_get_first_child(handle); child != 0; child = GTK4.gtk_widget_get_next_sibling(child)) {
itemCount++;
if (display.getWidget(child) instanceof ToolItem) itemCount++;
}
} else {
long list = GTK3.gtk_container_get_children (handle);
Expand Down Expand Up @@ -348,8 +350,9 @@ ToolItem[] _getItems () {
ArrayList<ToolItem> childrenList = new ArrayList<>();
for (long child = GTK4.gtk_widget_get_first_child(handle); child != 0; child = GTK4.gtk_widget_get_next_sibling(child)) {
Widget childWidget = display.getWidget(child);
if (childWidget != null) {
childrenList.add((ToolItem)childWidget);
/* A Menu's GtkPopover is also a native child here; skip non-ToolItems. */
if (childWidget instanceof ToolItem toolItem) {
childrenList.add(toolItem);
}
}

Expand Down
Loading