Fixed bug that Arrow key <Up> and <Down> in Combo do not get response correctly

zhourenjian · zhourenjian · commit 93237acf89de · 2009-12-01T16:44:41.000Z
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Combo.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Combo.java
@@ -609,31 +609,44 @@ public void run(){
 			if (items.length == 0) {
 				return;
 			}
+			if (e.keyCode == 38 || e.keyCode == 40) {
+				String text = getText();
+				currentIndex = -1;
+				for (int i = 0; i < items.length; i++) {
+					if (text.equals(items[i])) {
+						currentIndex = i;
+						break;
+					}
+				}
+				if (currentIndex < 0) {
+					currentIndex = selectInput.selectedIndex;
+				}
+			}
 			switch(e.keyCode){
 			case 38:
-				selectInput.selectedIndex = currentIndex;
-				noSelection = false;
-				updateSelection();
-				noSelection = true;
 				if (currentIndex > 0) {
 					currentIndex--;
 				}
 				if (currentIndex >= items.length) {
 					currentIndex = items.length - 1;
 				}
-				toReturn(false);
-				break;
-			case 40:
 				selectInput.selectedIndex = currentIndex;
 				noSelection = false;
 				updateSelection();
 				noSelection = true;
+				toReturn(false);
+				break;
+			case 40:
 				if (currentIndex < items.length) {
 					currentIndex++;
 				}
 				if (currentIndex >= items.length) {
 					currentIndex = items.length - 1;
 				}
+				selectInput.selectedIndex = currentIndex;
+				noSelection = false;
+				updateSelection();
+				noSelection = true;
 				toReturn(false);
 				break;
 			}
