src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java

*** 27,36 ****
--- 27,37 ----
  
  import java.awt.BufferCapabilities.FlipContents;
  import java.awt.*;
  import java.awt.Dialog.ModalityType;
  import java.awt.event.*;
+ import java.awt.peer.WindowPeer;
  import java.beans.*;
  import java.util.List;
  
  import javax.swing.*;
  
*** 201,210 ****
--- 202,212 ----
  
      private Window target;
      private LWWindowPeer peer;
      private CPlatformView contentView;
      private CPlatformWindow owner;
+     private boolean visible = false; // visibility status from native perspective
  
      public CPlatformWindow(final PeerType peerType) {
          super(0, true);
          assert (peerType == PeerType.SIMPLEWINDOW || peerType == PeerType.DIALOG || peerType == PeerType.FRAME);
      }
*** 466,488 ****
      public void setBounds(int x, int y, int w, int h) {
  //        assert CThreading.assertEventQueue();
          nativeSetNSWindowBounds(getNSWindowPtr(), x, y, w, h);
      }
  
      @Override // PlatformWindow
      public void setVisible(boolean visible) {
          final long nsWindowPtr = getNSWindowPtr();
  
!         if (owner != null) {
              if (!visible) {
                  CWrapper.NSWindow.removeChildWindow(owner.getNSWindowPtr(), nsWindowPtr);
              }
          }
  
          updateIconImages();
          updateFocusabilityForAutoRequestFocus(false);
  
          if (!visible) {
              // Cancel out the current native state of the window
              switch (peer.getState()) {
                  case Frame.ICONIFIED:
                      CWrapper.NSWindow.deminiaturize(nsWindowPtr);
--- 468,509 ----
      public void setBounds(int x, int y, int w, int h) {
  //        assert CThreading.assertEventQueue();
          nativeSetNSWindowBounds(getNSWindowPtr(), x, y, w, h);
      }
  
+     private boolean isVisible() {
+         return this.visible;
+     }
+ 
      @Override // PlatformWindow
      public void setVisible(boolean visible) {
          final long nsWindowPtr = getNSWindowPtr();
  
!         // 1. Process parent-child relationship when hiding
          if (!visible) {
+             // 1a. Unparent my children
+             for (Window w : target.getOwnedWindows()) {
+                 WindowPeer p = (WindowPeer)w.getPeer();
+                 if (p instanceof LWWindowPeer) {
+                     CPlatformWindow pw = (CPlatformWindow)((LWWindowPeer)p).getPlatformWindow();
+                     if (pw != null && pw.isVisible()) {
+                         CWrapper.NSWindow.removeChildWindow(nsWindowPtr, pw.getNSWindowPtr());
+                     }
+                 }
+             }
+ 
+             // 1b. Unparent myself
+             if (owner != null && owner.isVisible()) {
                  CWrapper.NSWindow.removeChildWindow(owner.getNSWindowPtr(), nsWindowPtr);
              }
          }
  
+         // 2. Configure stuff
          updateIconImages();
          updateFocusabilityForAutoRequestFocus(false);
  
+         // 3. Manage the extended state when hiding
          if (!visible) {
              // Cancel out the current native state of the window
              switch (peer.getState()) {
                  case Frame.ICONIFIED:
                      CWrapper.NSWindow.deminiaturize(nsWindowPtr);
*** 491,500 ****
--- 512,522 ----
                      CWrapper.NSWindow.zoom(nsWindowPtr);
                      break;
              }
          }
  
+         // 4. Actually show or hide the window
          LWWindowPeer blocker = peer.getBlocker();
          if (blocker == null || !visible) {
              // If it ain't blocked, or is being hidden, go regular way
              if (visible) {
                  CWrapper.NSWindow.makeFirstResponder(nsWindowPtr, contentView.getAWTView());
*** 510,520 ****
--- 532,544 ----
          } else {
              // otherwise, put it in a proper z-order
              CWrapper.NSWindow.orderWindow(nsWindowPtr, CWrapper.NSWindow.NSWindowBelow,
                      ((CPlatformWindow)blocker.getPlatformWindow()).getNSWindowPtr());
          }
+         this.visible = visible;
  
+         // 5. Manage the extended state when showing
          if (visible) {
              // Re-apply the extended state as expected in shared code
              if (target instanceof Frame) {
                  switch (((Frame)target).getExtendedState()) {
                      case Frame.ICONIFIED:
*** 525,545 ****
                          break;
                  }
              }
          }
  
          updateFocusabilityForAutoRequestFocus(true);
  
!         if (owner != null) {
              if (visible) {
                  CWrapper.NSWindow.addChildWindow(owner.getNSWindowPtr(), nsWindowPtr, CWrapper.NSWindow.NSWindowAbove);
                  if (target.isAlwaysOnTop()) {
                      CWrapper.NSWindow.setLevel(nsWindowPtr, CWrapper.NSWindow.NSFloatingWindowLevel);
                  }
              }
          }
  
          if (blocker != null && visible) {
              // Make sure the blocker is above its siblings
              ((CPlatformWindow)blocker.getPlatformWindow()).orderAboveSiblings();
          }
      }
--- 549,587 ----
                          break;
                  }
              }
          }
  
+         // 6. Configure stuff #2
          updateFocusabilityForAutoRequestFocus(true);
  
!         // 7. Manage parent-child relationship when showing
          if (visible) {
+             // 7a. Add myself as a child
+             if (owner != null && owner.isVisible()) {
                  CWrapper.NSWindow.addChildWindow(owner.getNSWindowPtr(), nsWindowPtr, CWrapper.NSWindow.NSWindowAbove);
                  if (target.isAlwaysOnTop()) {
                      CWrapper.NSWindow.setLevel(nsWindowPtr, CWrapper.NSWindow.NSFloatingWindowLevel);
                  }
              }
+ 
+             // 7b. Add my own children to myself
+             for (Window w : target.getOwnedWindows()) {
+                 WindowPeer p = (WindowPeer)w.getPeer();
+                 if (p instanceof LWWindowPeer) {
+                     CPlatformWindow pw = (CPlatformWindow)((LWWindowPeer)p).getPlatformWindow();
+                     if (pw != null && pw.isVisible()) {
+                         CWrapper.NSWindow.addChildWindow(nsWindowPtr, pw.getNSWindowPtr(), CWrapper.NSWindow.NSWindowAbove);
+                         if (w.isAlwaysOnTop()) {
+                             CWrapper.NSWindow.setLevel(pw.getNSWindowPtr(), CWrapper.NSWindow.NSFloatingWindowLevel);
+                         }
+                     }
+                 }
+             }
          }
  
+         // 8. Deal with the blocker of the window being shown
          if (blocker != null && visible) {
              // Make sure the blocker is above its siblings
              ((CPlatformWindow)blocker.getPlatformWindow()).orderAboveSiblings();
          }
      }
*** 840,858 ****
--- 882,908 ----
      private void orderAboveSiblings() {
          if (owner == null) {
              return;
          }
  
+         // NOTE: the logic will fail if we have a hierarchy like:
+         //       visible root owner
+         //          invisible owner
+         //              visible dialog
+         // However, this is an unlikely scenario for real life apps
+         if (owner.isVisible()) {
              // Recursively pop up the windows from the very bottom so that only
              // the very top-most one becomes the main window
              owner.orderAboveSiblings();
  
              // Order the window to front of the stack of child windows
              final long nsWindowSelfPtr = getNSWindowPtr();
              final long nsWindowOwnerPtr = owner.getNSWindowPtr();
              CWrapper.NSWindow.removeChildWindow(nsWindowOwnerPtr, nsWindowSelfPtr);
              CWrapper.NSWindow.addChildWindow(nsWindowOwnerPtr, nsWindowSelfPtr, CWrapper.NSWindow.NSWindowAbove);
+         }
+ 
          if (target.isAlwaysOnTop()) {
              CWrapper.NSWindow.setLevel(getNSWindowPtr(), CWrapper.NSWindow.NSFloatingWindowLevel);
          }
      }