Bug 581028 - Improve usability of NatCombo dropdown filter

Signed-off-by: Dirk Fauth <dirk.fauth@googlemail.com>

Change-Id: Ie5a778b6f2204823f6e853ab705eafd8054d4b58

1 files changed, 5 insertions, 3 deletions

diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/widget/NatCombo.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/widget/NatCombo.java
index a09f267a..d6881fc8 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/widget/NatCombo.java
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/widget/NatCombo.java
@@ -42,6 +42,8 @@ import org.eclipse.swt.events.FocusListener;
 import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.KeyListener;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.MouseAdapter;
 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.MouseListener;
@@ -732,15 +734,15 @@ public class NatCombo extends Composite {
         dropDownLayoutData.bottom = new FormAttachment(100);
 
         if (this.showDropdownFilter) {
-            this.filterBox = new Text(this.dropdownShell, SWT.BORDER);
+            this.filterBox = new Text(this.dropdownShell, SWT.BORDER | SWT.SEARCH | SWT.ICON_CANCEL);
             this.filterBox.setFont(this.cellStyle.getAttributeValue(CellStyleAttributes.FONT));
             this.filterBox.setEnabled(true);
             this.filterBox.setEditable(true);
             this.filterBox.addFocusListener(new FocusListenerWrapper());
-            this.filterBox.addKeyListener(new KeyAdapter() {
+            this.filterBox.addModifyListener(new ModifyListener() {
 
                 @Override
-                public void keyReleased(KeyEvent e) {
+                public void modifyText(ModifyEvent e) {
                     if (null != NatCombo.this.dropdownTableViewer && !NatCombo.this.dropdownTable.isDisposed()) {
                         NatCombo.this.dropdownTableViewer.refresh();
                         calculateBounds();