aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Elder2013-11-08 10:46:57 (EST)
committerGerrit Code Review @ Eclipse.org2013-11-15 13:32:46 (EST)
commit5db9936fcbc271f94ecb22aababc118153503e72 (patch)
tree353cb73cfc1b74c9a1cb0b4242c8b1b76e756fef
parent20686b962f6149dce208a4afc2fc74f0c2ab7fc4 (diff)
downloadeclipse.platform.ui-5db9936fcbc271f94ecb22aababc118153503e72.zip
eclipse.platform.ui-5db9936fcbc271f94ecb22aababc118153503e72.tar.gz
eclipse.platform.ui-5db9936fcbc271f94ecb22aababc118153503e72.tar.bz2
bug 412001: [KeyBindings] Ctrl+F in Browser widget in a dialog isrefs/changes/28/18228/3
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();
}
}