fixing modal block z-index

hansonr · hansonr · commit 289d9a68ac7d · 2018-11-15T18:15:35.000-06:00
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
@@ -315,7 +315,9 @@ public void setVisible(boolean b) {
 	  if (isModal) {
 		  if (b) {
 			  $(body).after(modalNode);
-			  int z = getZIndex(null) - 1;
+			  $(modalNode).addClass("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.setVisible(modalNode, b);
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
@@ -45,6 +45,8 @@ public class JSWindowUI extends JSComponentUI implements WindowPeer {
 
 	private Graphics2D graphics;
 
+	private Object dialogBlocker;
+
 	/*
 	 * Not Lightweight; an independent space with RootPane, LayeredPane,
 	 * ContentPane, (optional) MenuBar, and GlassPane
@@ -103,13 +105,16 @@ public void toFront() {
 		if (debugging)
 			System.out.println("window to front for " + id);
 		z = J2S.setWindowZIndex(domNode, Integer.MAX_VALUE);
+		if (modalNode != null)
+			DOMNode.setZ(modalNode, z - 1);
 	}
 
 	@Override
 	public void toBack() {
 		System.out.println("window to back for " + id);
 		z = J2S.setWindowZIndex(domNode, Integer.MIN_VALUE);
-		
+		if (modalNode != null)
+			DOMNode.setZ(modalNode, z - 1);		
 	}
 
 	@Override
@@ -133,6 +138,12 @@ public boolean requestWindowFocus() {
 	@Override
 	public void setModalBlocked(Dialog blocker, boolean blocked) {
 		JSDialog b = ((JSDialog) (Object) blocker);
+		dialogBlocker = (blocked ? b : null);
+	}
+
+	@Override
+	public void setModalBlocked(JSDialog blocker, boolean blocked) {
+		dialogBlocker = (blocked ? blocker : null);
 	}
 
 	@Override
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sApplet.js
@@ -2843,7 +2843,7 @@ console.log("J2S._getRawDataFromServer " + J2S._serverUrl + " for " + query);
 		}
 		z = (node.style.zIndex = (z > 0 ? zbase : z0));
 		node.style.position = "absolute";
-		if (J2S._checkLoading)
+		if (J2S._checkLoading) 
 			System.out.println("setting z-index to " + z + " for " + node.id);
 		return z;
 	}

Original file line number	Diff line number	Diff line change
`@@ -2843,7 +2843,7 @@ console.log("J2S._getRawDataFromServer " + J2S._serverUrl + " for " + query);`
`2843`	`2843`	`}`
`2844`	`2844`	`z = (node.style.zIndex = (z > 0 ? zbase : z0));`
`2845`	`2845`	`node.style.position = "absolute";`
`2846`		`- if (J2S._checkLoading)`
	`2846`	`+ if (J2S._checkLoading)`
`2847`	`2847`	`System.out.println("setting z-index to " + z + " for " + node.id);`
`2848`	`2848`	`return z;`
`2849`	`2849`	`}`