fix for applet not adjusting canvas top for menubar

BobHanson · BobHanson · commit 4645230edfd5 · 2020-01-23T07:15:51.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/java/applet/JSApplet.java b/sources/net.sf.j2s.java.core/src/java/applet/JSApplet.java
@@ -43,6 +43,8 @@
 import javax.swing.JRootPane;
 import javax.swing.RepaintManager;
 
+import swingjs.plaf.JSAppletUI;
+
 /**
  * SwingJS note: This class is the original java.applet.Applet class. 
  * It is subclassed by JApplet. The replacement java.applet.Applet class
@@ -290,6 +292,7 @@ public void resizeHTML(int width, int height) {
 //				((JSComponentUI)root.getUI()).setPainted(null);
 //				root.秘isBackgroundPainted = false;
 				RepaintManager.currentManager(this).addInvalidComponent(root);
+				((JSAppletUI)getUI()).adjustCanvasForMenuBar();
 			}
 		}
     }
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSAppletUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSAppletUI.java
@@ -18,15 +18,10 @@ public DOMNode updateDOMNode() {
 			containerNode = domNode = newDOMObject("div", id);
 			addClass(domNode, "swingjs-window");
 		}
+		adjustCanvasForMenuBar();
 		return updateDOMNodeCUI();
 	}
 	
-	void checkMenuBar(int h) {
-		JMenuBar mb = ((JApplet) c).getJMenuBar();
-		HTML5Canvas canvas = c.getAppContext().getThreadGroup().秘html5Applet._getHtml5Canvas();
-		DOMNode.setStyles(canvas, "top", h + "px", "position", "absolute");
-	}
-
 	@Override
 	public void installUI(JComponent jc) {
     LookAndFeel.installColorsAndFont(jc,
@@ -51,6 +46,20 @@ public void propertyChange(PropertyChangeEvent e) {
 		System.out.println("JSAPpletUI prop val " + prop + " " + value);
 	}
 
+	/**
+	 * The JMenuBar on an applet pushes its canvas down typically about 20 pixels.
+	 */
+	public void adjustCanvasForMenuBar() {
+		JMenuBar mb = ((JApplet) c).getJMenuBar();
+		int h = (mb == null || !mb.isVisible() ? 0 : ((JSMenuBarUI) mb.getUI()).height);
+		DOMNode.setStyles(getCanvas(), "top", h + "px", "position", "absolute");
+	}
+
+	public HTML5Canvas getCanvas() {
+		return c.getAppContext().getThreadGroup().秘html5Applet._getHtml5Canvas();
+	}
+
+
 //	@Override
 //	public boolean isFocusable() {
 //		return true;
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSMenuBarUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSMenuBarUI.java
@@ -121,7 +121,7 @@ public void setVisible(boolean b) {
 		super.setVisible(b);
 		Component top = menuBar.getTopLevelAncestor();
 		if ( top instanceof JApplet)
-			((JSAppletUI)((JApplet) top).getUI()).checkMenuBar(b ? height : 0);		
+			((JSAppletUI)((JApplet) top).getUI()).adjustCanvasForMenuBar();		
 	}
 
 	@Override

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,8 @@`
`43`	`43`	`import javax.swing.JRootPane;`
`44`	`44`	`import javax.swing.RepaintManager;`
`45`	`45`
	`46`	`+import swingjs.plaf.JSAppletUI;`
	`47`	`+`
`46`	`48`	`/**`
`47`	`49`	`* SwingJS note: This class is the original java.applet.Applet class.`
`48`	`50`	`* It is subclassed by JApplet. The replacement java.applet.Applet class`
`@@ -290,6 +292,7 @@ public void resizeHTML(int width, int height) {`
`290`	`292`	`// ((JSComponentUI)root.getUI()).setPainted(null);`
`291`	`293`	`// root.秘isBackgroundPainted = false;`
`292`	`294`	`RepaintManager.currentManager(this).addInvalidComponent(root);`
	`295`	`+ ((JSAppletUI)getUI()).adjustCanvasForMenuBar();`
`293`	`296`	`}`
`294`	`297`	`}`
`295`	`298`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public void setVisible(boolean b) {`
`121`	`121`	`super.setVisible(b);`
`122`	`122`	`Component top = menuBar.getTopLevelAncestor();`
`123`	`123`	`if ( top instanceof JApplet)`
`124`		`- ((JSAppletUI)((JApplet) top).getUI()).checkMenuBar(b ? height : 0);`
	`124`	`+ ((JSAppletUI)((JApplet) top).getUI()).adjustCanvasForMenuBar();`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`@Override`