Update bug fixing of Text widget cursor

jossonsmith · jossonsmith · commit e9a94a782260 · 2006-11-09T17:21:54.000Z
Update bug fixing of Table widget on IE.
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
@@ -596,11 +596,11 @@ public boolean updateShellBounds(int x, int y, int w, int h) {
 		});
 		dnd.bind(handle);
 	}
-	contentHandle.onclick = new RunnableCompatibility(){
-		public void run(){
-			contentHandle.focus();
-		}
-	};
+//	contentHandle.onclick = new RunnableCompatibility(){
+//		public void run(){
+//			contentHandle.focus();
+//		}
+//	};
 	contentHandle.onkeydown = new RunnableCompatibility() {
 		public void run() {
 			HTMLEvent e = (HTMLEvent) getEvent();
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
@@ -849,6 +849,14 @@ public void run() {
 //	}
 //}
 
+private Element createCSSElement(Object parent, String css) {
+	Element div = document.createElement("DIV");
+	div.className = css;
+	if (parent != null) {
+		((Element) parent).appendChild(div);
+	}
+	return div;
+}
 
 void createItem (TableColumn column, int index) {
 	/*
@@ -1017,7 +1025,11 @@ void createItem (TableColumn column, int index) {
 	if (theadTR == null) {
 		theadTR = document.createElement ("TR");
 		theadHandle.appendChild(theadTR);
-		theadTR.innerHTML = "<td class=\"table-column-last\"><div class=\"table-head-text\">&#160;</div></td>";
+		//theadTR.innerHTML = "<td class=\"table-column-last\"><div class=\"table-head-text\">&#160;</div></td>";
+		Element theadTD = document.createElement("TD");
+		theadTD.className = "table-column-last";
+		theadTR.appendChild(theadTD);
+		createCSSElement(theadTD, "table-head-text").appendChild(document.createTextNode("" + (char) 160));
 	}
 //		if (index < theadTR.childNodes.length) {
 //			if (theadTR.childNodes[index] != null
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Text.css b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Text.css
@@ -7,7 +7,8 @@
 	padding:0;
 	font-family:Tahoma, Arial, sans-serif;
 	font-size:8pt;
-	/*white-space:nowrap;*/
+	/*white-space:nowrap;*/
+	overflow:hidden;
 }
 .text-default textarea {
 	border-style:none;
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Text.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Text.java
@@ -231,7 +231,11 @@ public void run() {
 			textHandle.focus();
 		}
 	};
-	handle.appendChild(textHandle);
+	Element wrapper = document.createElement("DIV");
+	wrapper.style.overflow = "auto";
+	handle.appendChild(wrapper);
+	wrapper.appendChild(textHandle);
+	//handle.appendChild(textHandle);
 
 	//setTabStops (tabs = 8);
 	//fixAlignment ();
@@ -337,7 +341,7 @@ public void run() {
 			e.item = Text.this;
 			e.widget = Text.this;
 			sendEvent(e);
-			toReturn(e.doit);			
+			toReturn(e.doit);
 		}
 	};
 	textHandle.onfocus = new RunnableCompatibility() {
@@ -2340,8 +2344,8 @@ boolean SetWindowPos(Object hWnd, Object hWndInsertAfter, int X, int Y, int cx,
 //		textHandle.style.height = ((cy - 4) > 0 ? (cy - 4) : 0) + "px";
 //		return super.SetWindowPos(hWnd, hWndInsertAfter, X, Y, cx - 4, cy - 4, uFlags);
 	}
-	textHandle.style.width = (cx > 0 ? cx : 0) + "px";
-	textHandle.style.height = (cy > 0 ? cy : 0) + "px";
+	textHandle.style.width = (cx - 2 > 0 ? cx - 2 : 0) + "px";
+	textHandle.style.height = (cy - 2 > 0 ? cy - 2 : 0) + "px";
 	Element el = (Element) hWnd;
 	// TODO: What about hWndInsertAfter and uFlags
 	el.style.left = X + "px";
