1. Keyboard navigation enhancements

soheil_h_y · soheil_h_y · commit 2c09b17edd0d · 2006-08-12T11:42:48.000Z
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Button.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Button.java
@@ -1348,6 +1348,15 @@ public void run() {
 	if ((style & (SWT.RADIO | SWT.CHECK)) != 0) {
 		btnText.onclick = eventHandler;
 	}
+	handle.onkeydown = new RunnableCompatibility() {
+		public void run() {
+			HTMLEvent e = (HTMLEvent) getEvent();
+			if(e.keyCode == 32 || e.keyCode == 13){
+				toReturn(false);
+			}
+			toReturn(true);
+		}
+	};
 }
 
 /*
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
@@ -20,6 +20,7 @@
 import org.eclipse.swt.internal.RunnableCompatibility;
 import org.eclipse.swt.internal.browser.OS;
 import org.eclipse.swt.internal.xhtml.Element;
+import org.eclipse.swt.internal.xhtml.HTMLEvent;
 import org.eclipse.swt.internal.xhtml.Option;
 import org.eclipse.swt.internal.xhtml.document;
 
@@ -580,11 +581,36 @@ protected void createHandle () {
 	textInput.ondblclick = new RunnableCompatibility() {
 		public void run() {
 //			System.out.println("button clicked!");
-			if(!isSimple) 
+			if(!isSimple)
+			{
 				show();
+				
+			}
 		}
 	};
 	
+	textInput.onkeydown = new RunnableCompatibility(){
+		public void run(){
+			HTMLEvent e = (HTMLEvent) getEvent();
+			switch(e.keyCode){
+			case 13:
+				/*
+				 * TODO: default selection;
+				 */
+				break;
+			case 40:
+				if(!isSimple){
+//					show();
+					toReturn(false);					
+					textInput.focus();
+				}
+				break;
+			default:
+				toReturn(true);
+			}
+
+		}
+	};
 	
 	dropDownButton.onclick = new RunnableCompatibility() {
 		public void run() {
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Decorations.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Decorations.java
@@ -27,6 +27,7 @@
 import org.eclipse.swt.internal.dnd.ShellFrameDND;
 import org.eclipse.swt.internal.xhtml.CSSStyle;
 import org.eclipse.swt.internal.xhtml.Element;
+import org.eclipse.swt.internal.xhtml.HTMLEvent;
 import org.eclipse.swt.internal.xhtml.document;
 import org.eclipse.swt.internal.xhtml.window;
 import org.eclipse.swt.layout.GridData;
@@ -569,6 +570,46 @@ public boolean updateShellBounds(int x, int y, final int width,
 		});
 		dnd.bind(handle);
 	}
+	contentHandle.onclick = new RunnableCompatibility(){
+		public void run(){
+			contentHandle.focus();
+		}
+	};
+	contentHandle.onkeydown = new RunnableCompatibility() {
+		public void run() {
+			HTMLEvent e = (HTMLEvent) getEvent();
+			if(defaultButton == null){
+				return;
+			}
+			if(e.keyCode == 13){
+				if (!defaultButton.isEnabled()) {
+					toReturn(true);
+					return ;
+				}
+				if ((defaultButton.style & (SWT.CHECK | SWT.TOGGLE)) != 0) {
+					
+					if ((defaultButton.style & SWT.CHECK) != 0) {
+						if (e.srcElement != defaultButton.btnHandle) {
+							defaultButton.setSelection (!defaultButton.getSelection ());
+						}
+					} else {
+						defaultButton.setSelection (!defaultButton.getSelection ());
+					}
+				} else {
+					if ((defaultButton.style & SWT.RADIO) != 0) {
+						if ((defaultButton.parent.getStyle () & SWT.NO_RADIO_GROUP) != 0) {
+							defaultButton.setSelection (!defaultButton.getSelection ());
+						} else {
+							defaultButton.selectRadio ();
+						}
+					}
+				}
+				defaultButton.postEvent (SWT.Selection);
+				toReturn(true);
+			}
+		}
+	}; 
+
 }
 
 private void nextWindowLocation() {
@@ -1898,8 +1939,12 @@ public void run() {
 				fHandleStyle.zIndex = window.currentTopZIndex = ""
 						+ (Integer.parseInt(window.currentTopZIndex) + 2);
 			}
+			if(contentHandle != null){
+				contentHandle.focus();
+			}
 		}
 	};
+	
 	if (window.currentTopZIndex == null) {
 		handle.style.zIndex = window.currentTopZIndex = "1000";
 	} else {
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Spinner.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Spinner.java
@@ -22,6 +22,7 @@
 import org.eclipse.swt.internal.RunnableCompatibility;
 import org.eclipse.swt.internal.browser.OS;
 import org.eclipse.swt.internal.xhtml.Element;
+import org.eclipse.swt.internal.xhtml.HTMLEvent;
 import org.eclipse.swt.internal.xhtml.document;
 
 /**
@@ -245,6 +246,23 @@ public void run() {
 			}
 			
 		};
+		
+		textInputHandle.onkeydown = new RunnableCompatibility(){
+			public void run(){
+				HTMLEvent e = (HTMLEvent) getEvent();
+				switch(e.keyCode){
+				case 38:
+					setSelection(getSelection() + increment);
+					break;
+				case 40:
+					setSelection(getSelection() - increment);
+					break;
+				default:
+					toReturn(true);
+				}
+				
+			}
+		};
 //		System.out.println("spinner handle" + handle);
 	}
 	
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Table.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Table.java
@@ -655,18 +655,51 @@ public void run() {
 				}
 				System.out.println("on key down !" + evt.keyCode + " index "
 						+ index);
-				if (evt.keyCode == 38) {
+				switch(evt.keyCode){
+				case 13:
+					TableItem item = getItem(index);
+					toggleSelection(item, evt.ctrlKey, evt.shiftKey);
+					if(item.isSelected()){
+						Event e = new Event();
+						e.display = display;
+						e.type = SWT.DefaultSelection;
+						e.detail = SWT.NONE;
+						e.item = item;
+						e.widget = item;
+						sendEvent(e);
+						toReturn(false);
+					}
+					break;
+				case 32:
+					TableItem item2 = getItem(index);
+					toggleSelection(item2, evt.ctrlKey, evt.shiftKey);
+					if(item2.isSelected()){						
+						Event eDefault = new Event();
+						eDefault.display = display;
+						eDefault.type = SWT.Selection;
+						eDefault.detail = SWT.NONE;
+						eDefault.item = item2;
+						eDefault.widget = item2;
+						sendEvent(eDefault);
+						toReturn(false);
+					}
+					break;
+				case 38:
 					if (index > 0) {
 						System.out.println("selecting the before!");
 						setCursorFocus(index - 1);
+						toReturn(false);
 					}
-				} else if (evt.keyCode == 40) {
+					break;
+				case 40:
 					if (index < getItemCount() - 1) {
 						System.out.println("selecting the after !");
 						setCursorFocus(index + 1);
+						toReturn(false);
 					}
-				} else if (evt.keyCode == 32){
-					toggleSelection(getItem(index), evt.ctrlKey, evt.shiftKey);
+					break;
+				default:
+					toReturn(true);
 				}
 			}
 		};
