aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Barkovic2014-07-16 20:51:33 (EDT)
committerAlexander Kurtakov2014-07-22 08:59:29 (EDT)
commitc02fab6ccbca448ca5a30ce60652073b28a5f5f1 (patch)
treede5d8bcf66e9cbe1f14afc6e84cfc026b38b5015
parentfc7748072f04afd1248c18d63a292142bb9a39c3 (diff)
downloadeclipse.platform.swt-c02fab6ccbca448ca5a30ce60652073b28a5f5f1.zip
eclipse.platform.swt-c02fab6ccbca448ca5a30ce60652073b28a5f5f1.tar.gz
eclipse.platform.swt-c02fab6ccbca448ca5a30ce60652073b28a5f5f1.tar.bz2
Bug 439578 - [Wayland] Calling bringToTop causes X11 based crashrefs/changes/07/30007/2
Guarded the X11 code in bringToTop in Shell.java Change-Id: I28c5163dc290473075aabf46b2898faf0e2d90a2 Signed-off-by: Joshua Barkovic <joshbarkovic@gmail.com>
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
index b64d2f9..3124ca6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
@@ -554,7 +554,7 @@ void bringToTop (boolean force) {
* the focus.
*/
long /*int*/ window = gtk_widget_get_window (shellHandle);
- if ((xFocus || (style & SWT.ON_TOP) != 0) && OS.GDK_WINDOWING_X11 ()) {
+ if ((xFocus || (style & SWT.ON_TOP) != 0) && OS.GDK_WINDOWING_X11 () && !OS.GDK_WINDOWING_WAYLAND()) {
long /*int*/ xDisplay;
if (OS.GTK_VERSION >= OS.VERSION(2, 24, 0)) {
xDisplay = OS.gdk_x11_display_get_xdisplay(OS.gdk_window_get_display(window));