aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Elder2013-11-08 10:46:57 (EST)
committerGerrit Code Review @ Eclipse.org2013-11-18 15:41:19 (EST)
commitc2c6d962e852f5161395a0712161bbafa4e9fd78 (patch)
treeebcd3700061bc09f53c75c3ef34ca250eb93d8fe
parent8fb26388c96b4ce32f643fac0a620498d1b7fad6 (diff)
downloadeclipse.platform.ui-c2c6d962e852f5161395a0712161bbafa4e9fd78.zip
eclipse.platform.ui-c2c6d962e852f5161395a0712161bbafa4e9fd78.tar.gz
eclipse.platform.ui-c2c6d962e852f5161395a0712161bbafa4e9fd78.tar.bz2
bug 412001: [KeyBindings] Ctrl+F in Browser widget in a dialog isrefs/changes/20/18520/2
wrongly forwarded to workbench window When a open dialog looses focus, ShellActivationListener's deactivate listener incorrectly assumes the previously active context is now active. Change-Id: I7a6cfc4ebd84e41b3da21edf8093a1ed7425e658
-rw-r--r--bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/ShellActivationListener.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/ShellActivationListener.java b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/ShellActivationListener.java
index cacc81b..01e1b73 100644
--- a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/ShellActivationListener.java
+++ b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/ShellActivationListener.java
@@ -145,12 +145,14 @@ public class ShellActivationListener implements Listener {
SafeRunner.run(new ISafeRunnable() {
public void run() throws Exception {
if (prevChild == null) {
- IEclipseContext activeChild = parentContext.getActiveChild();
+ IEclipseContext activeChild = parentContext
+ .getActiveChild();
if (activeChild != null) {
activeChild.deactivate();
}
} else {
- prevChild.activate();
+ // Bug 412001. Don't do this!
+ // prevChild.activate();
}
}