java2script
diff --git a/‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/graphics/FontData.java‎
Lines changed: 5 additions & 4 deletions b/‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/graphics/FontData.java‎
Lines changed: 5 additions & 4 deletions
diff --git a/‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/ResizeHandler.java‎
Lines changed: 5 additions & 3 deletions b/‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/ResizeHandler.java‎
Lines changed: 5 additions & 3 deletions
diff --git a/‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/package.js‎
Lines changed: 3 additions & 1 deletion b/‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/package.js‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Control.java‎
Lines changed: 24 additions & 3 deletions b/‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/widgets/Control.java‎
Lines changed: 24 additions & 3 deletions
@@ -52,6 +52,10 @@ public final class FontData {
 	 */
 	//public LOGFONT data;
 
+	public boolean isUnderline;
+	
+	public boolean isStrikeout;
+	
 	/**
 	 * The height of the font data in points
 	 * (Warning: This field is platform dependent)
@@ -235,11 +239,8 @@ public FontData(String string) {
 	*/
 	//if (string == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
 	name = string;
-	if (name == null) {
-		name = "Arial";
-	}
 	style = SWT.NORMAL;
-	height = 12;
+	height = 10;
 }
 
 /**	 
 
@@ -13,10 +13,9 @@
 
 package org.eclipse.swt.internal;
 
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.internal.xhtml.document;
-import org.eclipse.swt.internal.xhtml.window;
 import org.eclipse.swt.widgets.Decorations;
 import org.eclipse.swt.widgets.Monitor;
 
@@ -52,8 +51,11 @@ public void updateMaximized() {
 		if (width > bounds.width) {
 			width = bounds.width;
 		}
+		int titleHeight = ((shell.getStyle() & SWT.TITLE) != 0) ? 20 : 0;
+		// FIXME: maximized size is not accurate
+		shell.setBounds(shell.computeTrim(0, 0, width + 4, height - titleHeight + 6));
 //		shell.setBounds(0 - 4, 0 - 4, width - 2, height + 4);
-		shell.setBounds(shell.computeTrim(0, 0, width + 2, height - 18));
+		//shell.setBounds(shell.computeTrim(0, 0, width + 2, height - 18));
 	}
 	public void updateCentered() {
 		// Not used now
 
@@ -13,7 +13,9 @@ $wt = org.eclipse.swt;
 	    	"internal.dnd", 
 	    	"internal.browser", 
 	    	"internal.struct", 
-			"layout", 
+			"layout",
+			"printing",
+			"program",
 	    	"widgets"]);
 
 	var path = ClazzLoader.getClasspathFor ("org.eclipse.swt.*");
 
@@ -890,7 +890,7 @@ public Font getFont () {
 	*/
 	String ff = handle.style.fontFamily;
 	if (ff == null || ff.toString().length() == 0) {
-		ff = "Tahoma, Arial, sans-serif";
+		ff = null;//"Tahoma, Arial, sans-serif";
 	}
 	String fs = handle.style.fontSize;
 	if (fs == null || fs.toString().length() == 0) {
@@ -2320,7 +2320,6 @@ public boolean setFocus () {
  */
 public void setFont (Font font) {
 	checkWidget ();
-	if (font == null || font.data == null) return ;
 	/*
 	int hFont = 0;
 	if (font != null) { 
@@ -2330,7 +2329,17 @@ public void setFont (Font font) {
 	if (hFont == 0) hFont = defaultFont ();
 	OS.SendMessage (handle, OS.WM_SETFONT, hFont, 1);
 	*/
-	handle.style.fontFamily = font.data.name;
+	if (font == null || font.data == null) {
+		handle.style.fontFamily = "";
+		handle.style.fontSize = "";
+		handle.style.fontWeight = "";
+		handle.style.fontStyle = "";
+		handle.style.textDecoration = "";
+		return;
+	}
+	if (font.data.name != null) {
+		handle.style.fontFamily = font.data.name;
+	}
 	handle.style.fontSize = font.data.height + "pt";
 	if ((font.data.style & SWT.BOLD) != 0) {
 		handle.style.fontWeight = "bold";
@@ -2342,6 +2351,18 @@ public void setFont (Font font) {
 	} else {
 		handle.style.fontStyle = "normal";
 	}
+	String td = "";
+	if (font.data.isStrikeout) {
+		td = "line-through";
+	}
+	if (font.data.isUnderline) {
+		if (td.length() > 0) {
+			td += " underline";
+		} else {
+			td = "underline";
+		}
+	}
+	handle.style.textDecoration = td;
 	//handle.style.fontVariant = font.data.style;
 	//TODO:
 }