streamlining swingjs.allow.overflow client property option

hansonr · hansonr · commit 8d4c7c1ab7f7 · 2019-01-10T22:42:37.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSDesktopIconUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSDesktopIconUI.java
@@ -26,7 +26,6 @@ public JSDesktopIconUI() {
 	public DOMNode updateDOMNode() {
 		if (domNode == null) {
 			JRootPane root = jc.getRootPane();
-			isContentPane = (root != null && jc == root.getContentPane());
 			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/JSFrameUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSFrameUI.java
@@ -89,7 +89,6 @@ public DOMNode updateDOMNode() {
 			if (h == 0)
 				h = defaultHeight;
 			DOMNode.setSize(frameNode, w, h);
-			DOMNode.setAttr(frameNode, "ui", this);
 			DOMNode.setTopLeftAbsolute(frameNode, 0, 0);
 			setJ2sMouseHandler();
 			titleBarNode = newDOMObject("div", id + "_titlebar");
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
@@ -19,13 +19,15 @@ public JSPanelUI() {
 	
 	@Override
 	public DOMNode updateDOMNode() {
+		JRootPane root = jc.getRootPane();
 		if (domNode == null) {
-			JRootPane root = jc.getRootPane();
-			isContentPane = (root != null && jc == root.getContentPane());
 			domNode = newDOMObject("div", id);
 			if (root != null && root.getGlassPane() == c)
 				DOMNode.setVisible(domNode,  false);
 		}
+		isContentPane = (root != null && jc == root.getContentPane());
+		if (isContentPane) 
+			checkAllowDivOverflow();
 		return updateDOMNodeCUI();
 	}
 
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSRootPaneUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSRootPaneUI.java
@@ -24,7 +24,7 @@ public DOMNode updateDOMNode() {
 		if (domNode == null) {
 			domNode = newDOMObject("div", id);
 		}
-		// add code here for adjustments when changes in bounds or other properties occur.
+		checkAllowDivOverflow();
 		return domNode;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public DOMNode updateDOMNode() {`
`24`	`24`	`if (domNode == null) {`
`25`	`25`	`domNode = newDOMObject("div", id);`
`26`	`26`	`}`
`27`		`- // add code here for adjustments when changes in bounds or other properties occur.`
	`27`	`+ checkAllowDivOverflow();`
`28`	`28`	`return domNode;`
`29`	`29`	`}`
`30`	`30`