frame embedding

hansonr · hansonr · commit 6e83ae2e4e4b · 2019-04-04T16:47:16.000-05:00
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
@@ -844,6 +844,7 @@ public void enableJSKeys(boolean on) {
 	protected void addFocusHandler() {
 		if (focusNode == null && (focusNode = domNode) == null)
 			return;
+		System.out.println("JSCUI.addingFocusHandler " + id);
 		keysEnabled = true;
 		DOMNode.setAttrs(focusNode, "applet", applet, "_frameViewer", jc.getFrameViewer());
 		setDataKeyComponent(focusNode);
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
@@ -71,6 +71,7 @@ public class JSFrameUI extends JSWindowUI implements FramePeer {
 	private DOMNode closerWrap;
 	protected boolean isModal;
 	protected int zModal;
+	private boolean isDesktop;
 
 	protected boolean isInternalFrame;
 
@@ -101,7 +102,6 @@ public DOMNode updateDOMNode() {
 				DOMNode.setVisible(domNode, false);
 				return domNode;
 			}
-			setWindowClass();
 			int w = c.getWidth();
 			int h = c.getHeight();
 			if (w == 0)
@@ -110,19 +110,19 @@ public DOMNode updateDOMNode() {
 				h = defaultHeight;
 			DOMNode.setSize(frameNode, w, h);
 			DOMNode.setTopLeftAbsolute(frameNode, 0, 0);
-			if (frame.getName() != null) {
-				DOMNode node = DOMNode.getElement(frame.getName() + "-div");
-				if (node != null) {
-					frame.setUndecorated(true);
-					frame.setLocation(0, 0);
-					embeddingNode = node;
-					int ew = DOMNode.getWidth(node);
-					int eh = DOMNode.getHeight(node);
-					if (ew > 0 && eh > 0) {
-						frame._freezeBounds(ew, eh);
-					}
+			String fname = frame.getName();
+			DOMNode node = DOMNode.getElement(fname + "-div");
+			if (node != null) {
+				frame.setUndecorated(true);
+				frame.setLocation(0, 0);
+				embeddingNode = node;
+				int ew = DOMNode.getWidth(node);
+				int eh = DOMNode.getHeight(node);
+				if (ew > 0 && eh > 0) {
+					frame._freezeBounds(ew, eh);
 				}
 			}
+			setWindowClass();
 			if (!frame.isUndecorated()) {
 				DOMNode.setStyles(frameNode, "box-shadow", "0px 0px 10px gray", "box-sizing", "content-box");
 				titleBarNode = newDOMObject("div", id + "_titlebar");
@@ -177,6 +177,13 @@ public DOMNode updateDOMNode() {
 		return domNode;
 	}
 
+	@Override
+	public void setZOrder(int z) {
+		if (embeddingNode != null)
+			z = 999;
+		super.setZOrder(z);
+	}
+
 	@Override
 	protected void setDraggableEvents() {
 		if (embeddingNode != null || frame.isUndecorated())
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSLayeredPaneUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSLayeredPaneUI.java
@@ -14,7 +14,7 @@ public JSLayeredPaneUI() {
 	@Override
 	public DOMNode updateDOMNode() {
 		if (domNode == null) {
-			domNode = newDOMObject("div", id);
+			containerNode = domNode = newDOMObject("div", id);
 		}
 		// add code here for adjustments when changes in bounds or other properties occur.
     return domNode;
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSPanelUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSPanelUI.java
@@ -1,14 +1,12 @@
 package swingjs.plaf;
 
 
-import java.awt.Component;
 import java.awt.Dimension;
-import java.awt.Insets;
-import java.awt.LayoutManager;
 
 import javax.swing.JComponent;
 import javax.swing.JRootPane;
 import javax.swing.LookAndFeel;
+
 import swingjs.api.js.DOMNode;
 
 public class JSPanelUI extends JSLightweightUI {
@@ -23,7 +21,7 @@ public JSPanelUI() {
 	public DOMNode updateDOMNode() {
 		JRootPane root = jc.getRootPane();
 		if (domNode == null) {
-			domNode = newDOMObject("div", id);
+			containerNode = domNode = newDOMObject("div", id);
 			if (root != null && root.getGlassPane() == c)
 				DOMNode.setVisible(domNode,  false);
 		}
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSWindowUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSWindowUI.java
@@ -103,11 +103,8 @@ public DOMNode updateDOMNode() {
 	
 	
 	protected void setWindowClass() { 
-		setZOrder(z);
 		addClass(domNode, "swingjs-window");
-		// these next two lines are what allow the FocusManager to work....or not
-//		focusNode = domNode;
-//		addJQueryFocusCallbacks();
+		setZOrder(z);
 	}
 
 	@Override

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public JSLayeredPaneUI() {`
`14`	`14`	`@Override`
`15`	`15`	`public DOMNode updateDOMNode() {`
`16`	`16`	`if (domNode == null) {`
`17`		`- domNode = newDOMObject("div", id);`
	`17`	`+ containerNode = domNode = newDOMObject("div", id);`
`18`	`18`	`}`
`19`	`19`	`// add code here for adjustments when changes in bounds or other properties occur.`
`20`	`20`	`return domNode;`