better Frame embedding

hansonr · hansonr · commit 1d8e790255f5 · 2019-07-27T16:55:55.000+01:00
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JFrame.java b/sources/net.sf.j2s.java.core/src/javax/swing/JFrame.java
@@ -170,7 +170,7 @@ public void add(Component comp, Object constraints) {
 	 */
 	protected boolean rootPaneCheckingEnabled = false;
 
-	private boolean _boundsFrozen;
+	private boolean 秘boundsFrozen;
 
 	/**
 	 * Constructs a new frame that is initially invisible.
@@ -915,15 +915,15 @@ protected String paramString() {
 				+ ",rootPaneCheckingEnabled=" + rootPaneCheckingEnabledString;
 	}
 
-	public void _freezeBounds(int w, int h) {
+	public void 秘freezeBounds(int w, int h) {
 		setSize(w, h);
-		_boundsFrozen = true;
+		秘boundsFrozen = true;
 		resizable = false;
 	}
 	
 	@Override
 	public void reshape(int x, int y, int width, int height) {
-		if (!_boundsFrozen)
+		if (!秘boundsFrozen)
 			super.reshape(x, y, width, height);
 	}
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/api/js/HTML5CanvasContext2D.java b/sources/net.sf.j2s.java.core/src/swingjs/api/js/HTML5CanvasContext2D.java
@@ -16,6 +16,8 @@ public class ImageData {
 
 	public String font, fillStyle, strokeStyle;
 
+	public float globalAlpha;
+
 	public abstract void drawImage(DOMNode img, int sx,
 			int sy, int swidth, int sheight, int dx, int dy, int dwidth, int dheight);
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComponentUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComponentUI.java
@@ -147,6 +147,10 @@
 public class JSComponentUI extends ComponentUI
 		implements JSEventHandler, PropertyChangeListener, ChangeListener, DropTargetPeer {
 
+	public interface Embeddable {
+		Object getEmbedded(String type);
+	}
+
 	private static final int MENUITEM_OFFSET = 11;
 
 	final J2SInterface J2S = JSUtil.J2S;
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSFrameUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSFrameUI.java
@@ -44,7 +44,7 @@
  * @author hansonr
  *
  */
-public class JSFrameUI extends JSWindowUI implements FramePeer {
+public class JSFrameUI extends JSWindowUI implements FramePeer, JSComponentUI.Embeddable {
 
 	private static final Insets ZERO_INSETS = new Insets(0, 0, 0, 0);
 
@@ -111,24 +111,11 @@ public DOMNode updateDOMNode() {
 				h = defaultHeight;
 			DOMNode.setSize(frameNode, w, h);
 			DOMNode.setTopLeftAbsolute(frameNode, 0, 0);
-			String fname = frame.getName();
-			DOMNode node = DOMNode.getElement(fname + "-div");
+			DOMNode node = (DOMNode) getEmbedded("init");
 			if (node != null) {
 				embeddingNode = node;
-				doEmbed = (DOMNode.getWidth(embeddingNode) > 0);
+				doEmbed = (DOMNode.getWidth(node) > 0);
 				isHidden = !doEmbed;
-				if (doEmbed) {
-					frame.setUndecorated(true);
-					frame.setLocation(0, 0);
-				} else {
-					DOMNode.setStyles(embeddingNode,  "position", "relative", "overflow", "hidden");
-				}
-
-				int ew = DOMNode.getWidth(node);
-				int eh = DOMNode.getHeight(node);
-				if (ew > 0 && eh > 0) {
-					frame._freezeBounds(ew, eh);
-				}
 			}
 			setWindowClass();
 			if (!frame.isUndecorated()) {
@@ -182,6 +169,46 @@ public DOMNode updateDOMNode() {
 		return domNode;
 	}
 
+	/**
+	 * Note: DO NOT CHANGE THE NAME OF THIS METHOD
+	 * 
+	 * @param frame
+	 * @param type
+	 *  one of: "name", "node", "init", "dim"
+	 * @return
+	 */
+	@Override
+	@SuppressWarnings("unused")
+	public Object getEmbedded(String type) {
+		String name = frame.getName();
+		DOMNode node = DOMNode.getElement(name + "-div");
+		if (node == null)
+			return null;
+		switch (type) {
+		case "name":
+			return name;
+		case "node":
+			return node;
+		case "dim":
+			return new Dimension(DOMNode.getWidth(node), DOMNode.getHeight(node));
+		case "init":
+			if (node == null)
+				return null;
+			Dimension dim = (Dimension) getEmbedded("dim");
+			if (dim.width > 0) {
+				frame.setUndecorated(true);
+				frame.setLocation(0, 0);
+				String resize = DOMNode.getStyle(node, "resize");
+				if (resize == "none")
+					frame.秘freezeBounds(dim.width, dim.height);
+			} else {
+				DOMNode.setStyles(node, "position", "relative", "overflow", "hidden");
+			}
+			return node;
+		}
+		return null;
+	}
+
 	@Override
 	protected boolean isFrameIndependent() {
 		return !doEmbed;
