aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Elder2013-08-01 15:42:35 (EDT)
committerGerrit Code Review @ Eclipse.org2013-08-01 16:02:23 (EDT)
commitb0908ade03aa6908c51c5866523bccd7b69c4533 (patch)
tree0a7951be1e67a5573aa73b247100152176d2f5cf
parentb7174048950019b2b5f1401333016be1281fb17a (diff)
downloadeclipse.platform.ui-b0908ade03aa6908c51c5866523bccd7b69c4533.zip
eclipse.platform.ui-b0908ade03aa6908c51c5866523bccd7b69c4533.tar.gz
eclipse.platform.ui-b0908ade03aa6908c51c5866523bccd7b69c4533.tar.bz2
Bug 414243: Keybinding assist popup eats keys (for two-chord shortcuts)refs/changes/58/15058/2
Provide a hint to ShellActivationListener that KeyAssistDialog should not get its own context. Bug: 369860 Change-Id: I7abbbd0a479cc4601b081a19577ca9525e87e22f
-rw-r--r--bundles/org.eclipse.e4.ui.bindings/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/KeyAssistDialog.java5
2 files changed, 4 insertions, 3 deletions
diff --git a/bundles/org.eclipse.e4.ui.bindings/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.bindings/META-INF/MANIFEST.MF
index 39e31b8..75f25d9 100644
--- a/bundles/org.eclipse.e4.ui.bindings/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.ui.bindings/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.e4.ui.bindings;singleton:=true
-Bundle-Version: 0.10.100.qualifier
+Bundle-Version: 0.10.101.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/KeyAssistDialog.java b/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/KeyAssistDialog.java
index 0de6dac..5ee688a 100644
--- a/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/KeyAssistDialog.java
+++ b/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/KeyAssistDialog.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2012 IBM Corporation and others.
+ * Copyright (c) 2011, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -497,7 +497,8 @@ public class KeyAssistDialog extends PopupDialog {
return Window.OK;
}
create();
-
+ // Bug 369860. Stop ShellActivationListener from creating a context for this.
+ getShell().setData("org.eclipse.e4.ui.ignoreDialog", Boolean.TRUE); //$NON-NLS-1$
// Configure the size and location.
Point size = configureSize();
configureLocation(size);