Skip to content

Commit 111fa09

Browse files
committed
[GTK4] Stop Shell.bringToTop from crashing on Gtk 4.x
Fetch GdkDisplay from GdkSurface as done on Wayland
1 parent cbf014c commit 111fa09

File tree

1 file changed

+6
-1
lines changed
  • bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets

1 file changed

+6
-1
lines changed

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,12 @@ void bringToTop (boolean force) {
609609
}
610610
if ((xFocus || (style & SWT.ON_TOP) != 0)) {
611611
if (OS.isX11()) {
612-
long gdkDisplay = GDK.gdk_window_get_display(gdkResource);
612+
long gdkDisplay;
613+
if (GTK.GTK4) {
614+
gdkDisplay = GDK.gdk_surface_get_display(gdkResource);
615+
} else {
616+
gdkDisplay = GDK.gdk_window_get_display(gdkResource);
617+
}
613618
long xDisplay = GDK.gdk_x11_display_get_xdisplay(gdkDisplay);
614619
long xWindow;
615620
if (GTK.GTK4) {

0 commit comments

Comments
 (0)