Top-Level AWT components return a default font even after setFont(null)

hansonr · hansonr · commit 484ae93ebf53 · 2019-07-17T08:28:12.000+01:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/Applet.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/Applet.java
@@ -2,6 +2,7 @@
 
 import java.awt.Color;
 import java.awt.FlowLayout;
+import java.awt.Font;
 import java.awt.HeadlessException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -30,6 +31,13 @@ public Applet() throws HeadlessException {
 		((JComponent) getContentPane()).setOpaque(false);
     }
 
+	@Override
+	public Font getFont() {
+		if (font == null && parent == null)
+	    	font = new Font(Font.DIALOG, Font.PLAIN, 12);
+		return super.getFont();
+	}
+	
 	@Override
 	public void setBackground(Color c) {
 		super.setBackground(c);
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/Dialog.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/Dialog.java
@@ -1,5 +1,6 @@
 package swingjs.a2s;
 
+import java.awt.Font;
 import java.awt.GraphicsConfiguration;
 import java.awt.Window;
 
@@ -19,9 +20,15 @@ private void setListener() {
 		Util.setAWTWindowDefaults(this);
 	}
 
+	@Override
+	public Font getFont() {
+		if (font == null && parent == null)
+	    	font = new Font(Font.DIALOG, Font.PLAIN, 12);
+		return super.getFont();
+	}
+	
 	public Dialog(Frame owner) {
-		super(owner);
-		setListener();
+		this(owner, false);
 	}
 
 	public Dialog(java.awt.Frame owner, boolean modal) {
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/Frame.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/Frame.java
@@ -1,6 +1,7 @@
 package swingjs.a2s;
 
 import java.awt.Component;
+import java.awt.Font;
 import java.awt.GraphicsConfiguration;
 import java.awt.MenuBar;
 import java.awt.MenuComponent;
@@ -48,10 +49,14 @@ public void windowOpened(WindowEvent e) {
 
 		});
 	}
-	
-	
-
 
+	@Override
+	public Font getFont() {
+		if (font == null && parent == null)
+	    	font = new Font(Font.DIALOG, Font.PLAIN, 12);
+		return super.getFont();
+	}
+	
 	@Override
 	public void remove(int i) {
 		super.remove(i);
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/a2s/PopupMenu.java b/sources/net.sf.j2s.java.core/src/swingjs/a2s/PopupMenu.java
@@ -20,13 +20,22 @@
 public class PopupMenu extends JPopupMenu implements AWTPopupMenu {
 
 	public PopupMenu() {
-		super();
+		this(null);
 	}
 
 	public PopupMenu(String string) {
 		super(string);
 	}
 
+	@Override
+	public Font getFont() {
+		// AWT default fonts are set by the peer (native OS)
+		Font f = super.getFont();
+		if (f == null) {
+	    	setFont(f = new Font(Font.DIALOG, Font.PLAIN, 12));	    	
+		}
+		return f;
+	}
 	@Override
 	public int countItems() {
 		return getComponentCount();
