forcing use of getInsets(), not getInsets(insets) for AWT components

hansonr · hansonr · commit 636e51baf7e3 · 2019-02-06T14:39:25.000-06:00
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
@@ -135,7 +135,7 @@ public static Component[] getChildArray(Container c) {
 	 */
 	public boolean _isBackgroundPainted;
 
-	
+	private Insets tempInsets;
 
 	public JSComponent() {
 		super();
@@ -153,12 +153,23 @@ public JSComponent() {
 	public Graphics getGraphics() {
 		if (width == 0 || height == 0 || !isVisible())
 			return null;
-		if (frameViewer != null)
-			return frameViewer.getGraphics().create();
+		Graphics g;
+		if (frameViewer != null) {
+			g = frameViewer.getGraphics().create();
+			if (isContentPane) {
+				if (tempInsets == null)
+					tempInsets = new Insets(0,0,0,0);
+				((JComponent) this).getRootPane().getInsets(tempInsets);
+				if (tempInsets.left != 0 || tempInsets.top != 0)
+					g.translate(tempInsets.left, tempInsets.top);
+				// when user has inset the applet -- should clip? 
+			}
+			return g;
+		}
 		if (parent == null) {
 			return null;
 		}
-		Graphics g = parent.getGraphics();
+		g = parent.getGraphics();
 		if (g == null)
 			return null;
 		// if (g instanceof ConstrainableGraphics) {
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JComponent.java b/sources/net.sf.j2s.java.core/src/javax/swing/JComponent.java
@@ -72,6 +72,7 @@
 import sun.font.FontDesignMetrics;
 import swingjs.JSFocusPeer;
 import swingjs.JSGraphics2D;
+import swingjs.JSToolkit;
 import swingjs.JSUtil;
 import swingjs.plaf.JSComponentUI;
 
@@ -1636,35 +1637,46 @@ public Insets getInsets() {
 
 	/**
 	 * Returns an <code>Insets</code> object containing this component's inset
-	 * values. The passed-in <code>Insets</code> object will be reused if
-	 * possible. Calling methods cannot assume that the same object will be
-	 * returned, however. All existing values within this object are overwritten.
-	 * If <code>insets</code> is null, this will allocate a new one.
+	 * values. The passed-in <code>Insets</code> object will be reused if possible.
+	 * Calling methods cannot assume that the same object will be returned, however.
+	 * All existing values within this object are overwritten. If
+	 * <code>insets</code> is null, this will allocate a new one.
 	 * 
-	 * @param insets
-	 *          the <code>Insets</code> object, which can be reused
+	 * @param insets the <code>Insets</code> object, which can be reused
 	 * @return the <code>Insets</code> object
 	 * @see #getInsets
 	 * @beaninfo expert: true
 	 */
+	@SuppressWarnings("unused")
 	public Insets getInsets(Insets insets) {
+		Insets in = null;
 		if (insets == null) {
 			insets = new Insets(0, 0, 0, 0);
 		}
-		if (border != null) {
-			if (border instanceof AbstractBorder) {
-				return ((AbstractBorder) border).getBorderInsets(this, insets);
+		if (/** @j2sNative this.isAWT || this.isAWTApplet || */false) {
+			// because AWT components do not have this method
+			in = getInsets();
+		} else {
+			if (border == null) {
+				// super.getInsets() always returns an Insets object with
+				// all of its value zeroed. No need for a new object here.
+				insets.left = insets.top = insets.right = insets.bottom = 0;
 			} else {
+				if (border instanceof AbstractBorder) {
+					in = ((AbstractBorder) border).getBorderInsets(this, insets);
+				}
 				// Can't reuse border insets because the Border interface
 				// can't be enhanced.
-				return border.getBorderInsets(this);
+				in = border.getBorderInsets(this);
 			}
-		} else {
-			// super.getInsets() always returns an Insets object with
-			// all of its value zeroed. No need for a new object here.
-			insets.left = insets.top = insets.right = insets.bottom = 0;
-			return insets;
 		}
+		if (in != null) {
+			insets.left = in.left;
+			insets.right = in.right;
+			insets.top = in.top;
+			insets.bottom = in.bottom;
+		}
+		return insets;
 	}
 
 	/**
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JRootPane.java b/sources/net.sf.j2s.java.core/src/javax/swing/JRootPane.java
@@ -1034,11 +1034,12 @@ protected String paramString() {
 		return super.paramString();
 	}
 
+	public boolean isAWTApplet = false;
+	
 	@Override
 	public Insets getInsets() {
-		Container top = getTopLevelAncestor();
-		if (top instanceof java.applet.Applet) {
-			return top.getInsets();
+		if (isAWTApplet) {
+			return getTopLevelAncestor().getInsets();
 		}
 		return super.getInsets();
 	}
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
@@ -16,6 +16,10 @@ public class Applet extends JApplet implements A2SContainer {
 
     public Applet() throws HeadlessException {
     	super();
+    	getRootPane().isAWTApplet = true;
+    	/**@j2sNative 
+    	 * this.getContentPane$().isAWTApplet = true;
+    	 */
 		// Note: applet.paint(g) needs to include super.paint(g), or buttons will not
 		// show. So we do that in fixAppletPaint().
 		fixAppletPaint();

Original file line number	Diff line number	Diff line change
`@@ -1034,11 +1034,12 @@ protected String paramString() {`
`1034`	`1034`	`return super.paramString();`
`1035`	`1035`	`}`
`1036`	`1036`
	`1037`	`+ public boolean isAWTApplet = false;`
	`1038`	`+`
`1037`	`1039`	`@Override`
`1038`	`1040`	`public Insets getInsets() {`
`1039`		`- Container top = getTopLevelAncestor();`
`1040`		`- if (top instanceof java.applet.Applet) {`
`1041`		`- return top.getInsets();`
	`1041`	`+ if (isAWTApplet) {`
	`1042`	`+ return getTopLevelAncestor().getInsets();`
`1042`	`1043`	`}`
`1043`	`1044`	`return super.getInsets();`
`1044`	`1045`	`}`