Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Keller2016-05-05 13:01:53 +0000
committerDani Megert2016-05-05 13:01:53 +0000
commita42daa50b482b9f5f93b024be42757c427433f1e (patch)
tree664e8585c0c2adb56ee9eb42c4c348418e91bb14
parent6b799159067d9d904353f767b5e118ae5a437427 (diff)
downloadeclipse.platform.text-Y20160505-1000.tar.gz
eclipse.platform.text-Y20160505-1000.tar.xz
eclipse.platform.text-Y20160505-1000.zip
Signed-off-by: Markus Keller <markus_keller@ch.ibm.com>
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationPopup.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationPopup.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationPopup.java
index 600741249..611b509ec 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationPopup.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationPopup.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 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
@@ -688,7 +688,7 @@ class ContextInformationPopup implements IContentAssistListener {
*/
public boolean hasFocus() {
if (Helper.okToUse(fContextSelectorShell))
- return (fContextSelectorShell.isFocusControl() || fContextSelectorTable.isFocusControl());
+ return fContextSelectorShell.getDisplay().getActiveShell() == fContextSelectorShell;
return false;
}

Back to the top