Merge branch 'TTPostControllerFix' of https://github.com/echamberlain…

…/three20 into development Closes #442.
facebookarchive · Mar 4, 2011 · 219417e · 219417e
2 parents 69d11d0 + 349b49e
commit 219417e
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/Three20UI/Sources/TTPostController.m b/src/Three20UI/Sources/TTPostController.m
@@ -204,6 +204,8 @@ - (void)layoutTextEditor {
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 - (void)showAnimationDidStop {
   _textView.hidden = NO;
+
+  [self.superController viewDidDisappear:YES];
 }
 
 
@@ -246,7 +248,10 @@ - (void)dismissWithCancel {
     [_delegate postControllerDidCancel:self];
   }
 
-  [self dismissPopupViewControllerAnimated:YES];
+  BOOL animated = YES;
+
+  [self.superController viewWillAppear:animated];
+  [self dismissPopupViewControllerAnimated:animated];
 }
 
 
@@ -368,6 +373,9 @@ - (void)restoreView:(NSDictionary*)state {
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 - (void)showInView:(UIView*)view animated:(BOOL)animated {
   [self retain];
+
+  [self.superController viewWillDisappear:animated];
+
   UIWindow* window = view.window ? view.window : [UIApplication sharedApplication].keyWindow;
 
   self.view.transform = [self transformForOrientation];
@@ -441,7 +449,6 @@ - (void)dismissPopupViewControllerAnimated:(BOOL)animated {
     [self.view removeFromSuperview];
     [self release];
     superController.popupViewController = nil;
-    [superController viewWillAppear:animated];
     [superController viewDidAppear:animated];
   }
 }
@@ -532,6 +539,8 @@ - (void)dismissWithResult:(id)result animated:(BOOL)animated {
   [_result release];
   _result = [result retain];
 
+  [self.superController viewWillAppear:animated];
+
   if (animated) {
     if ([_delegate respondsToSelector:@selector(postController:willAnimateTowards:)]) {
       CGRect rect = [_delegate postController:self willAnimateTowards:_originRect];