Bug 500618 - [Quick Access] Avoid duplicate hint message
Change-Id: I294b38739d6b5a506d1f2d0a9b57a2ba1430ce9f
Signed-off-by: Mickael Istria <mistria@redhat.com>
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessContents.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessContents.java
index 501c49a..5a0bccd 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessContents.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessContents.java
@@ -702,7 +702,7 @@
});
}
- private Label hintText;
+ Label hintText;
private boolean displayHintText;
/** Create HintText as child of the given parent composite */
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessDialog.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessDialog.java
index eef4b65..cb86715 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessDialog.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/quickaccess/QuickAccessDialog.java
@@ -31,6 +31,7 @@
import org.eclipse.jface.bindings.keys.KeySequence;
import org.eclipse.jface.bindings.keys.SWTKeySupport;
import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.dialogs.PopupDialog;
import org.eclipse.jface.layout.GridDataFactory;
@@ -136,16 +137,12 @@
providers.toArray(new QuickAccessProvider[providers.size()])) {
@Override
protected void updateFeedback(boolean filterTextEmpty, boolean showAllMatches) {
- if (filterTextEmpty) {
- setInfoText(QuickAccessMessages.QuickAccess_StartTypingToFindMatches);
+ TriggerSequence[] sequences = getInvokingCommandKeySequences();
+ if (showAllMatches || sequences == null || sequences.length == 0) {
+ setInfoText(""); //$NON-NLS-1$
} else {
- TriggerSequence[] sequences = getInvokingCommandKeySequences();
- if (showAllMatches || sequences == null || sequences.length == 0) {
- setInfoText(""); //$NON-NLS-1$
- } else {
- setInfoText(NLS.bind(QuickAccessMessages.QuickAccess_PressKeyToShowAllMatches,
- sequences[0].format()));
- }
+ setInfoText(NLS.bind(QuickAccessMessages.QuickAccess_PressKeyToShowAllMatches,
+ sequences[0].format()));
}
}
@@ -278,8 +275,10 @@
boolean isWin32 = Util.isWindows();
GridLayoutFactory.fillDefaults().extendedMargins(isWin32 ? 0 : 3, 3, 2, 2).applyTo(composite);
Label hintText = contents.createHintText(composite, SWT.DEFAULT);
- hintText.setLayoutData(
- new GridData(SWT.FILL, SWT.DEFAULT, true, false, ((GridLayout) composite.getLayout()).numColumns, 1));
+ GridData gridData = new GridData(SWT.FILL, SWT.DEFAULT, true, false,
+ ((GridLayout) composite.getLayout()).numColumns, 1);
+ gridData.horizontalIndent = IDialogConstants.HORIZONTAL_MARGIN;
+ hintText.setLayoutData(gridData);
Table table = contents.createTable(composite, getDefaultOrientation());
table.addKeyListener(getKeyAdapter());
