From 64f962e29a713c8befc3c5d40cbd87ac3d4042f8 Mon Sep 17 00:00:00 2001
From: Aparajita Fishman <aparajita@aparajita.com>
Date: Wed, 17 Jul 2013 13:08:01 -0400
Subject: [PATCH] Fixed: viewDidHide and viewDidUnhide were not called when
 being added to/removed from hidden ancestor.

Cocoa specifies that viewDidHide will be called when an unhidden view is added to a view hierarchy with a hidden ancestor view, and viewDidUnhide is called when an unhidden view is removed from a view hierarchy with a hidden ancestor view. This was not the case in Cappuccino.

This commit adds that functionality, and also removes a spurious viewDidHide/viewDidUnhide call that was generated as a side effect in initWithCoder.
---
 AppKit/CPView.j | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/AppKit/CPView.j b/AppKit/CPView.j
index 0a71203fe..9c549bf14 100644
--- a/AppKit/CPView.j
+++ b/AppKit/CPView.j
@@ -561,6 +561,12 @@ var CPViewFlags                     = { },
     }
 
     [aSubview setNextResponder:self];
+
+    // If the subview is not hidden and one of its ancestors is hidden,
+    // notify the subview that it is now hidden.
+    if (![aSubview isHidden] && [self isHiddenOrHasHiddenAncestor])
+        [aSubview _notifyViewDidHide];
+
     [aSubview viewDidMoveToSuperview];
 
     [self didAddSubview:aSubview];
@@ -593,6 +599,12 @@ var CPViewFlags                     = { },
 #if PLATFORM(DOM)
     CPDOMDisplayServerRemoveChild(_superview._DOMElement, _DOMElement);
 #endif
+
+    // If the view is not hidden and one of its ancestors is hidden,
+    // notify the view that it is now unhidden.
+    if (!_isHidden && [_superview isHiddenOrHasHiddenAncestor])
+        [self _notifyViewDidUnhide];
+
     _superview = nil;
 
     [self _setWindow:nil];
@@ -1371,6 +1383,7 @@ var CPViewFlags                     = { },
 //  FIXME: Should we return to visibility?  This breaks in FireFox, Opera, and IE.
 //    _DOMElement.style.visibility = (_isHidden = aFlag) ? "hidden" : "visible";
     _isHidden = aFlag;
+
 #if PLATFORM(DOM)
     _DOMElement.style.display = _isHidden ? "none" : "block";
 #endif
@@ -1406,6 +1419,7 @@ var CPViewFlags                     = { },
     [self viewDidHide];
 
     var count = [_subviews count];
+
     while (count--)
         [_subviews[count] _notifyViewDidHide];
 }
@@ -1415,6 +1429,7 @@ var CPViewFlags                     = { },
     [self viewDidUnhide];
 
     var count = [_subviews count];
+
     while (count--)
         [_subviews[count] _notifyViewDidUnhide];
 }
@@ -3139,7 +3154,7 @@ var CPViewAutoresizingMaskKey       = @"CPViewAutoresizingMask",
         }
 #endif
 
-        [self setHidden:[aCoder decodeBoolForKey:CPViewIsHiddenKey]];
+        _isHidden = [aCoder decodeBoolForKey:CPViewIsHiddenKey];
 
         if ([aCoder containsValueForKey:CPViewOpacityKey])
             [self setAlphaValue:[aCoder decodeIntForKey:CPViewOpacityKey]];