Applet resizing

BobHanson · BobHanson · commit 3e3ccc5e8538 · 2018-03-08T14:24:57.000-06:00
Applet resizing is possible, but apparently not in Java when the applet
is embedded. So we copy that idea in JavaScript as well. But we still
allow an applet resizer handle. 

TODO: make applet resizer handle able to be removed by developer. Default none?
diff --git a/sources/net.sf.j2s.java.core/SwingJS-site.zip b/sources/net.sf.j2s.java.core/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.java.core/src/java/applet/Applet.java b/sources/net.sf.j2s.java.core/src/java/applet/Applet.java
@@ -219,14 +219,16 @@ public void setVisible(boolean b) {
      */
 	@Override
 	public void resize(int width, int height) {
-		if (appletViewer == null) {
+		// no resizing if we have a stub -- embedded in a page
+		if (stub == null)
 	    	resizeOriginal(width, height);
-		} else {
-			// use J2S.Applet._resizeApplet.
+    }
+
+	public void resizeHTML(int width, int height) {
+		if (appletViewer != null)
 			appletViewer.html5Applet._resizeApplet(new int[] {width, height});
-		}
     }
-	
+
     @SuppressWarnings("deprecation")
     public void resizeOriginal(int width, int height) {
         Dimension d = size();
diff --git a/sources/net.sf.j2s.java.core/src/java/awt/JSComponent.java b/sources/net.sf.j2s.java.core/src/java/awt/JSComponent.java
@@ -54,14 +54,16 @@ public abstract class JSComponent extends Component {
 	 * 
 	 * SwingJS Applet repurposes resize(width, height) to call
 	 * J2S.Applet.prototype._resizeApplet in order to take care
-	 * of all the HTML5 business associated with this applet. 
+	 * of all the HTML5 business associated with this applet, and
+	 * it overrides resizeOriginal as well 
 	 * 
 	 * 
 	 * @param width
 	 * @param height
 	 */
 	@SuppressWarnings("deprecation")
 	public void resizeOriginal(int width, int height) {
+		// o
 		resize(width, height);
 	}
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/JSAppletViewer.java b/sources/net.sf.j2s.java.core/src/swingjs/JSAppletViewer.java
@@ -410,7 +410,7 @@ public int run1(int mode) {
 				}
 				System.out.println("JSAppletViewer init");
 				japplet.setFont(new Font(Font.DIALOG, Font.PLAIN, 12));
-				japplet.resizeOriginal(defaultAppletSize.width, defaultAppletSize.height);
+				japplet.resizeHTML(defaultAppletSize.width, defaultAppletSize.height);
 				japplet.init();
 				// Need the default(fallback) font to be created in this
 				// AppContext
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/Resizer.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/Resizer.java
@@ -148,7 +148,7 @@ protected void fHandleDOMResize(Object event, int dw, int dh) {
 		if (jframe == null) {
 			rootPane.getGraphics().setColor(Color.WHITE);
 			rootPane.getGraphics().fillRect(0, 0, r.width, r.height);
-			((JApplet) rootPane.getParent()).resize(r.width, r.height);
+			((JApplet) rootPane.getParent()).resizeHTML(r.width, r.height);
 		} else {
 			jframe.setPreferredSize(new Dimension(r.width, r.height));
 			jframe.invalidate();

Original file line number	Diff line number	Diff line change
`@@ -54,14 +54,16 @@ public abstract class JSComponent extends Component {`
`54`	`54`	`*`
`55`	`55`	`* SwingJS Applet repurposes resize(width, height) to call`
`56`	`56`	`* J2S.Applet.prototype._resizeApplet in order to take care`
`57`		`- * of all the HTML5 business associated with this applet.`
	`57`	`+ * of all the HTML5 business associated with this applet, and`
	`58`	`+ * it overrides resizeOriginal as well`
`58`	`59`	`*`
`59`	`60`	`*`
`60`	`61`	`* @param width`
`61`	`62`	`* @param height`
`62`	`63`	`*/`
`63`	`64`	`@SuppressWarnings("deprecation")`
`64`	`65`	`public void resizeOriginal(int width, int height) {`
	`66`	`+ // o`
`65`	`67`	`resize(width, height);`
`66`	`68`	`}`
`67`	`69`
Original file line number	Diff line number	Diff line change
`@@ -410,7 +410,7 @@ public int run1(int mode) {`
`410`	`410`	`}`
`411`	`411`	`System.out.println("JSAppletViewer init");`
`412`	`412`	`japplet.setFont(new Font(Font.DIALOG, Font.PLAIN, 12));`
`413`		`- japplet.resizeOriginal(defaultAppletSize.width, defaultAppletSize.height);`
	`413`	`+ japplet.resizeHTML(defaultAppletSize.width, defaultAppletSize.height);`
`414`	`414`	`japplet.init();`
`415`	`415`	`// Need the default(fallback) font to be created in this`
`416`	`416`	`// AppContext`