Reset line-height CSS

zhourenjian · zhourenjian · commit 44845c54074d · 2009-10-11T16:00:18.000Z
Fixed bug that Label with SWT.SEPERATOR
Fixed bug that Image is not yet loaded is not correctly computed in CTabFolder
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/graphics/GC.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/graphics/GC.java
@@ -3797,9 +3797,9 @@ public void setBackgroundPattern (Pattern pattern) {
 }
 
 void setClipping(int clipRgn) {
+	/*
 	int hRgn = clipRgn;
 	int gdipGraphics = data.gdipGraphics;
-	/*
 	if (gdipGraphics != 0) {
 		if (hRgn != 0) {
 			int region = Gdip.Region_new(hRgn);
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/graphics/Image.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/graphics/Image.java
@@ -1204,6 +1204,9 @@ public Rectangle getBounds() {
 			return null;
 	}
 	*/
+	if (width == 0 || height == 0) {
+		return new Rectangle(0, 0, 16, 16); 
+	}
 	return new Rectangle(0, 0, width, height);
 }
 
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/browser/OS.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/browser/OS.java
@@ -185,6 +185,7 @@ private static void init() {
 			s.width = "3000px";
 			s.height = "100px";
 			s.overflow = "scroll";
+			s.lineHeight = "16px"; // or "1", reset CSS
 			invisibleContainer = el;
 			setTextSelection(el, false);
 			
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
@@ -675,6 +675,7 @@ public void run() {
 	}
 	handle = document.createElement("DIV");
 	handle.className = "shell-default shell-trim";
+	handle.style.lineHeight = "16px"; // or "1", reset CSS
 	handle.style.visibility = "hidden";
 	
 	//nextWindowLocation();
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Label.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Label.java
@@ -675,20 +675,20 @@ void createHandle() {
 		*/
 		if ((style & SWT.SHADOW_IN) != 0) {
 			handle.className += " shadow-in";
-		} else if ((style & SWT.SHADOW_OUT) != 0) {
-			handle.className += " shadow-out";
-		} else {
+		} else if ((style & SWT.SHADOW_NONE) != 0) {
 			handle.className += " shadow-none";
+		} else {
+			handle.className += " shadow-out";
 		}
 		handle.style.fontSize = "0";
 		Element seperator1 = document.createElement("DIV"); 
 		Element seperator2 = document.createElement("DIV"); 
-		if ((style & SWT.VERTICAL) != 0) {
-			seperator1.className = "label-seperator-vertical-left";
-			seperator2.className = "label-seperator-vertical-right";
-		} else {
+		if ((style & SWT.HORIZONTAL) != 0) {
 			seperator1.className = "label-seperator-horizontal-top";
 			seperator2.className = "label-seperator-horizontal-bottom";
+		} else {
+			seperator1.className = "label-seperator-vertical-left";
+			seperator2.className = "label-seperator-vertical-right";
 		}
 		handle.appendChild(seperator1);
 		handle.appendChild(seperator2);
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/MaximizedTitle.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/MaximizedTitle.java
@@ -88,6 +88,7 @@ public void initialize() {
 		Element tbc = document.createElement("DIV");
 		tbc.className = "shell-manager-topbar-container";
 		document.body.appendChild(tbc);
+		tbc.style.lineHeight = "16px"; // or "1", reset CSS
 		tbc.style.display = "none";
 		this.handle = tbc;
 		
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/QuickLaunch.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/QuickLaunch.java
@@ -187,6 +187,8 @@ public void run() {
 		}
 		if (existed) {
 			defaultQuickLaunch = this;
+		} else {
+			handle.style.display = "none";
 		}
 	}
 
diff --git a/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/TaskBar.java b/sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/TaskBar.java
@@ -462,6 +462,7 @@ public void initialize() {
 			return;
 		Element sb = document.createElement("DIV");
 		sb.className = "shell-manager-sidebar";
+		sb.style.lineHeight = "16px"; // or "1", reset CSS
 		sb.style.display = "none";
 		document.body.appendChild(sb);
 		this.handle = sb;

Original file line number	Diff line number	Diff line change
`@@ -1204,6 +1204,9 @@ public Rectangle getBounds() {`
`1204`	`1204`	`return null;`
`1205`	`1205`	`}`
`1206`	`1206`	`*/`
	`1207`	`+ if (width == 0 \|\| height == 0) {`
	`1208`	`+ return new Rectangle(0, 0, 16, 16);`
	`1209`	`+ }`
`1207`	`1210`	`return new Rectangle(0, 0, width, height);`
`1208`	`1211`	`}`
`1209`	`1212`
Original file line number	Diff line number	Diff line change
`@@ -675,6 +675,7 @@ public void run() {`
`675`	`675`	`}`
`676`	`676`	`handle = document.createElement("DIV");`
`677`	`677`	`handle.className = "shell-default shell-trim";`
	`678`	`+ handle.style.lineHeight = "16px"; // or "1", reset CSS`
`678`	`679`	`handle.style.visibility = "hidden";`
`679`	`680`
`680`	`681`	`//nextWindowLocation();`
Original file line number	Diff line number	Diff line change
`@@ -187,6 +187,8 @@ public void run() {`
`187`	`187`	`}`
`188`	`188`	`if (existed) {`
`189`	`189`	`defaultQuickLaunch = this;`
	`190`	`+ } else {`
	`191`	`+ handle.style.display = "none";`
`190`	`192`	`}`
`191`	`193`	`}`
`192`	`194`