FRAME Z-ORDER

hansonr · hansonr · commit 48e1fcd36077 · 2018-07-06T15:40:36.000+01:00
diff --git a/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip b/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.java.core/src/javax/swing/JInternalFrame.java b/sources/net.sf.j2s.java.core/src/javax/swing/JInternalFrame.java
@@ -1515,6 +1515,7 @@ public void dispose() {
      */
     public void toFront() {
         moveToFront();
+        super.toFront(); // Window
     }
 
     /**
@@ -1528,6 +1529,7 @@ public void toFront() {
      */
     public void toBack() {
         moveToBack();
+        super.toBack();
     }
 
     /**
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/api/js/JQueryObject.java b/sources/net.sf.j2s.java.core/src/swingjs/api/js/JQueryObject.java
@@ -49,5 +49,7 @@ public interface JQueryObject {
 
 	public abstract void detach(); // like remove(), but does not change event settings
 
+	public abstract DOMNode parent();
+
 	
 }
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
@@ -117,14 +117,21 @@ public DOMNode updateDOMNode() {
 			@SuppressWarnings("unused")
 			DOMNode fnode = frameNode;
 			
-			JSFunction fGetFrameParent = null;
+			JSFunction fGetFrameParent = null; 
 			/**
 			 * @j2sNative var me = this; fGetFrameParent =
-			 *            function(){me.notifyFrameMoved();return
-			 *            $(fnode).parent()}
+			 *            
+			 *            function(x, y) {
+			 *            if (arguments.length == 0) {  
+			 *              return $(fnode).parent();
+			 *            }
+			 *            var xy = me.getMoveCoords$I$I(x, y);
+			 *            $($(fnode).parent()).css({ top: xy[1] + 'px', left: xy[0] + 'px' });
+			 *            me.notifyFrameMoved();
+			 *            return null;
+			 *            };
 			 */
-			{
-			}
+			
 			JSUtil.J2S._setDraggable(titleBarNode, fGetFrameParent);
 			titleBarNode.appendChild(titleNode);
 			titleBarNode.appendChild(closerWrap);
@@ -145,6 +152,10 @@ public DOMNode updateDOMNode() {
 		return domNode;
 	}
 
+	public int[] getMoveCoords(int x, int y) {
+		return new int[] {x, y};
+	}
+
 	public void notifyFrameMoved() {
 		// from JavaScript
 		this.toFront();
diff --git a/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSInternalFrameUI.java b/sources/net.sf.j2s.java.core/src/swingjs/plaf/JSInternalFrameUI.java
@@ -17,6 +17,23 @@ protected void frameCloserAction() {
          if(jif.isClosable())
             jif.doDefaultCloseAction();
 	}
+	
+	public int[] getMoveCoords(int x, int y) {
+//		JInternalFrame jif = (JInternalFrame) frame;    	
+//        if (jif.getDesktopPane() == null) {
+//        	// in another object 
+//        } else if (jif.getDesktopPane().getDesktopManager() == null) {
+//        	int pw = jif.getWidth();
+//        	int ph = jif.getHeight();
+//        	if (pw > 0 && ph > 0) {
+//        		x = Math.min(Math.max(0, x), pw - 20);
+//        		y = Math.min(Math.max(0, y), ph - 20);
+//        	}
+//        }
+	
+	return new int[] {x, y};
+}
+
 
 
 }

Original file line number	Diff line number	Diff line change
`@@ -1515,6 +1515,7 @@ public void dispose() {`
`1515`	`1515`	`*/`
`1516`	`1516`	`public void toFront() {`
`1517`	`1517`	`moveToFront();`
	`1518`	`+ super.toFront(); // Window`
`1518`	`1519`	`}`
`1519`	`1520`
`1520`	`1521`	`/**`
`@@ -1528,6 +1529,7 @@ public void toFront() {`
`1528`	`1529`	`*/`
`1529`	`1530`	`public void toBack() {`
`1530`	`1531`	`moveToBack();`
	`1532`	`+ super.toBack();`
`1531`	`1533`	`}`
`1532`	`1534`
`1533`	`1535`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -49,5 +49,7 @@ public interface JQueryObject {`
`49`	`49`
`50`	`50`	`public abstract void detach(); // like remove(), but does not change event settings`
`51`	`51`
	`52`	`+ public abstract DOMNode parent();`
	`53`	`+`
`52`	`54`
`53`	`55`	`}`