1. Some changes to Tree to make it compatible with IE7 and Safari.

soheil_h_y · soheil_h_y · commit adc0092f1bc5 · 2007-10-09T20:48:53.000Z
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/xhtml/CSSStyle.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/xhtml/CSSStyle.java
@@ -77,4 +77,5 @@ public class CSSStyle {
 
 	public String direction;
 	public String cssText;
+	public boolean hasLayout;
 }
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/xhtml/Element.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/xhtml/Element.java
@@ -100,6 +100,8 @@ public class Element {
 
 	public int nodeType;
 
+	public boolean hasLayout;
+
 	//private String
 	
 	public native void appendChild(Element child);
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Display.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Display.java
@@ -32,7 +32,6 @@
 import org.eclipse.swt.internal.xhtml.Element;
 import org.eclipse.swt.internal.xhtml.document;
 import org.eclipse.swt.internal.xhtml.window;
-
 /**
  * Instances of this class are responsible for managing the
  * connection between SWT and the underlying operating
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Tree.css b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Tree.css
@@ -63,8 +63,9 @@ thead .tree-head-text {
 .tree-grid-line .tree-row-first td {
 }
 .tree-full-selection tr.tree-item-selected td {
+	background-color:ActiveCaption;
 	color:highlighttext;
-	background-color:highlight;
+	min-height:1px;
 }
 .tree-blur .tree-full-selection tr.tree-item-selected td {
 	background-color:gray;
@@ -125,19 +126,27 @@ thead .tree-head-text {
 	min-height:16px;
 	height:1.39em;
 	line-height:1.39em;
-	position:relative;
 	margin-left:2px;
 	left:-1px;
 	_left:-3px;
 	white-space:nowrap;
 	float:left;
 	padding-bottom:1px;
 }
+/*
+	
+	position:relative;
 
+	*/
 .tree-text-rtl {
 	float:right;
+	margin-left:auto;
+	margin-right:2px;
 }
+/*
+	right:0px !important;
 
+*/
 tree-image-icon {
 	_padding-bottom:2px;
 	_height:16px;
@@ -188,8 +197,10 @@ tree-image tree-image-icon {
 }
 
 .tree-item-selected .tree-column-first .tree-text-inner {
-	color:highlighttext;
-	background-color:highlight;
+	background:ActiveCaption;
+	color:highlighttext;	
+	min-height:1px;
+	
 }
 .tree-blur .tree-item-selected .tree-column-first .tree-text-inner {
 	background-color:gray;
@@ -228,6 +239,7 @@ tree-image tree-image-icon {
 	float:left;
 	top:0;
 	left:0;
+	right:0;
 	margin-left:3px;
 	width:16px;
 	min-height:16px;
@@ -242,6 +254,8 @@ tree-image tree-image-icon {
 
 .tree-anchor-rtl {
 	float:right;
+	left:auto;
+	right:0px;
 }
 
 
@@ -260,10 +274,17 @@ tree-image tree-image-icon {
 	/*border-left:0 none transparent;*/
 	width:16px;
 	left:0;
+	right:0;
 	background-repeat:repeat-y;
 	background-position:center center;
 	background-image:url('images/tree-packed.gif');
 }
+
+.tree-anchor-rtl .tree-anchor-v{
+	right:5px;
+	left:auto;
+}
+
 .tree-anchor-single .tree-anchor-v {
 	background-image:none;
 }
@@ -277,6 +298,7 @@ tree-image tree-image-icon {
 .tree-anchor-h {
 	position:absolute;
 	left:0;
+	right:0;
 	top:50%;
 	margin-top:-8px;
 	width:15px;
@@ -285,6 +307,10 @@ tree-image tree-image-icon {
 	height:16px;
 	background-repeat:no-repeat;
 }
+.tree-anchor-rtl .tree-anchor-h{
+	left:auto;
+	right:0;
+}
 .tree-image .tree-anchor-h {
 	width:16px;
 	margin-right:0;
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Tree.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Tree.java
@@ -905,6 +905,9 @@ void createItem (TreeItem item, Object hParent, int index) {
 			cssClass += " tree-anchor-single";
 		}
 		Element anchor = createCSSElement(lineWrapper, cssClass);
+		if(OS.isIE && (style & SWT.RIGHT_TO_LEFT) != 0){
+			anchor.style.position = "static";
+		}
 		createCSSElement(anchor, "tree-anchor-v");
 		cssClass = "tree-anchor-h";
 		if (i == 0) {
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/TreeItem.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/TreeItem.java
@@ -1666,9 +1666,19 @@ void showSelection(boolean selected) {
 	if (OS.isIE) { // IE won't update selected background! 
 		Element tmpDiv = document.createElement("DIV");
 		tmpDiv.style.width = "1px"; // hasLayout
-		Element innerEl = handle.childNodes[0].childNodes[0].childNodes[0];
+		tmpDiv.style.height = "1px";
+		Element tempElem = handle.childNodes[0].childNodes[0].childNodes[0];
+		Element innerEl = tempElem.childNodes[tempElem.childNodes.length-1].childNodes[0];
+		System.out.println(innerEl);
+		innerEl.style.hasLayout = true;
 		innerEl.appendChild(tmpDiv);
 		innerEl.removeChild(tmpDiv);
+		innerEl.style.display = "inline-block";
+//		handle.style.hasLayout = true;
+		if((style & SWT.RIGHT_TO_LEFT) != 0){
+			innerEl.style.left = "0px";
+			tempElem.childNodes[tempElem.childNodes.length-1].style.left = "0px";
+		}
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -77,4 +77,5 @@ public class CSSStyle {`
`77`	`77`
`78`	`78`	`public String direction;`
`79`	`79`	`public String cssText;`
	`80`	`+ public boolean hasLayout;`
`80`	`81`	`}`