missing display:none in Frame and Dialog UI

hansonr · hansonr · commit f9d27c820948 · 2019-03-11T21:28:38.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
@@ -1541,15 +1541,19 @@ protected Dimension setHTMLSize1(DOMNode node, boolean addCSS, boolean usePrefer
 		boolean hasFocus = false;
 		if (scrollPaneUI != null) {
 			w = scrollPaneUI.c.getWidth();
-			h = scrollPaneUI.c.getHeight();
+			h = scrollPaneUI.c.getHeight(); 
 		} else if (usePreferred && preferredSize != null) {
 			// preferred size has been set by JComponent layout
+			// and delivered via a property change "preferredSize"
 			w = preferredSize.width;
 			h = preferredSize.height;
+			// frame resizeing will be here
+			position = /** @j2sNative node.style.position || */null;
 		} else if (usePreferred && preferredDim != null) {
 			// has been set by setAlignments
 			w = preferredDim.width;
 			h = preferredDim.height;
+			position = /** @j2sNative node.style.position || */null;
 		} else {
 			// determine the natural size of this object
 			// save the parent node -- we will need to reset that.
@@ -1622,7 +1626,10 @@ protected Dimension setHTMLSize1(DOMNode node, boolean addCSS, boolean usePrefer
 		dim.height += h;
 		DOMNode.setStyles(node, "position", null);
 		if (w0 != null) {
-			DOMNode.setStyles(node, "width", w0, "height", h0, "position", position);
+			DOMNode.setStyles(node, "width", w0, "height", h0);
+		}
+		if (position != null) {
+			DOMNode.setStyles(node, "position", position);
 		}
 		if (w0i != null) {
 			DOMNode.setStyles(domNode, "width", w0i, "height", h0i);
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
@@ -76,7 +76,7 @@ public DOMNode updateDOMNode() {
 			// a Windows applet has a sort of fuzzy shadowy border
 			containerNode = frameNode = domNode = newDOMObject("div", id + "_frame");
 			if (isDummyFrame) {
-				DOMNode.setStyles(domNode, "display", "hidden");
+				DOMNode.setVisible(domNode,  false);
 				return domNode;
 			}
 			DOMNode.setStyles(frameNode, "box-shadow", "0px 0px 10px gray", "box-sizing", "content-box");
@@ -166,6 +166,10 @@ public DOMNode updateDOMNode() {
 		DOMNode.setStyles(closerNode, "background-color", strColor);
 		setInnerComponentBounds(width, height);
 		setTitle(frame.getTitle());
+		if (!isDummyFrame) {
+			DOMNode.setVisible(domNode,  jc.isVisible());
+
+		}
 		return domNode;
 	}
 
@@ -336,7 +340,7 @@ public void setVisible(boolean b) {
 			  addClass(modalNode, "swingjs-window"); // so as to slip into z-index ranking
 			  String sz = DOMNode.getStyle(domNode, "z-index");
 			  int z = (( /** @j2sNative +sz || */getZIndex(null))) - 1;
-			  DOMNode.setStyles(modalNode, "z-index", "" + z);
+			  DOMNode.setZ(modalNode, z);
 		  }
 		  DOMNode.setVisible(modalNode, b);
 	  }
