commit a2e5322e6a95ab3c1cfb6564a863f095e3c9b1c4
author Silenio Quarti <silenio> Wed Apr 12 21:41:16 2006 +0000
committer Silenio Quarti <silenio> Wed Apr 12 21:41:16 2006 +0000
tree de3b14e8d910b89c1c5601e5ea1ff9edb9d0b9aa
parent 2b36b013c4ca69bc3b07468b2b23470ff9f4a1bb

135946 - Virtual Tree eats shell activations

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

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 5762183..4da412f 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
@@ -445,7 +445,8 @@
 	boolean xFocus = false;
 	if (activeShell != null) {
 		if (OS.GTK_VERSION < OS.VERSION (2, 6, 8)) {
-			xFocus = (activeShell.style & SWT.ON_TOP) != 0;
+			xFocus = (activeShell.style & (SWT.SHELL_TRIM | SWT.BORDER)) == SWT.NONE ||
+				(activeShell.style & (SWT.NO_TRIM | SWT.ON_TOP)) != 0;
 		}
 		display.activeShell = null;
 		display.activePending = true;