internal frame fix for no closing action and painting to desktop

BobHanson · BobHanson · commit 529d6d88045f · 2018-06-28T06:00:48.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
@@ -1695,13 +1695,25 @@ protected Container getContainer() {
      * internal frame is being dragged.
      */
     protected void paintComponent(Graphics g) {
-      
-     // we need to bypass JComponent
+
+     // this is not called, I think.
     	
       paintContainer(g);
       
       //super.paint(g); 
    }
+    
+	@Override
+	public void paint(Graphics g) {
+		
+		// The problem is that painting is from a dirty region request on the desktop
+		// we need to swith to the correct graphics. 
+		// Could this be a problem with printing? 
+		
+		super.paint(getRootPane().getGraphics());
+	}
+
+		//boolean isJComponent;
 
     // ======= end optimized frame dragging defence code ==============
 
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
@@ -175,7 +175,7 @@ public boolean handleJSEvent(Object target, int eventType, Object jQueryEvent) {
 
 		  		 */
 		  		{}
-					frame.dispatchEvent(new WindowEvent(frame, WindowEvent.WINDOW_CLOSING));
+		  		frameCloserAction();
 					return true;		  		
 		  	} else if (type.equals("mouseout")) {
 			  	DOMNode.setStyles(closerNode, "background-color", toCSSString(c.getBackground()));
@@ -189,6 +189,11 @@ public boolean handleJSEvent(Object target, int eventType, Object jQueryEvent) {
 		return false;
 	}
 
+	
+	protected void frameCloserAction() {
+  		frame.dispatchEvent(new WindowEvent(frame, WindowEvent.WINDOW_CLOSING));
+	}
+
 	protected void closeFrame() {
 		JSUtil.J2S._jsUnsetMouse(frameNode);
 		$(frameNode).remove();
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
@@ -1,10 +1,22 @@
 package swingjs.plaf;
 
+import java.awt.event.WindowEvent;
+
+import javax.swing.JInternalFrame;
+
 public class JSInternalFrameUI extends JSFrameUI {
 
 	public JSInternalFrameUI() {
 		super();
 		isInternalFrame = true;
 	}
 
+	
+	protected void frameCloserAction() {
+		JInternalFrame jif = (JInternalFrame) frame;
+         if(jif.isClosable())
+            jif.doDefaultCloseAction();
+	}
+
+
 }
