Bug 527677 - [NatCombo] inconsistent behavior on pressing arrow down

with no selection

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

1 files changed, 21 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 81525700..8766dcb7 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
@@ -485,9 +485,13 @@ public class NatCombo extends Composite {
                     showDropdownControl();
 
                     int selectionIndex = getDropdownTable().getSelectionIndex();
-                    if (selectionIndex < 0)
-                        selectionIndex = 0;
-                    getDropdownTable().select(selectionIndex);
+                    if (selectionIndex < 0) {
+                        select(0);
+                    } else {
+                        // only visualize the selection in the dropdown, do not
+                        // perform a selection
+                        getDropdownTable().select(selectionIndex);
+                    }
 
                     // ensure the arrow key events do not have any further
                     // effect
@@ -669,6 +673,20 @@ public class NatCombo extends Composite {
             }
         });
 
+        this.dropdownTable.addKeyListener(new KeyAdapter() {
+            @Override
+            public void keyPressed(KeyEvent event) {
+                if (event.keyCode == SWT.ARROW_DOWN) {
+                    int selected = NatCombo.this.dropdownTable.getSelectionIndex();
+                    if (selected < 0) {
+                        // no selection before, select the first entry
+                        select(0);
+                        event.doit = false;
+                    }
+                }
+            }
+        });
+
         this.dropdownTable.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent e) {