Merge pull request #25 from koenbud/Issue-24_prepareForDisplay-never-called

Fix isViewControllerVisible property
This commit is contained in:
Mazyad Alabduljaleel 2014-09-16 12:51:32 +04:00
commit e6cb38db4a
1 changed files with 6 additions and 3 deletions

View File

@ -46,7 +46,7 @@ static inline CGFloat AACStatusBarHeight()
@property (nonatomic) CGFloat resistanceConsumed;
@property (nonatomic, getter = isContracting) BOOL contracting;
@property (nonatomic, getter = isViewControllerVisible) BOOL viewControllerVisible;
@property (nonatomic, readonly, getter = isViewControllerVisible) BOOL viewControllerVisible;
@property (nonatomic) BOOL previousContractionState;
@end
@ -159,6 +159,11 @@ static inline CGFloat AACStatusBarHeight()
return self.extensionViewContainer.bounds;
}
- (BOOL)isViewControllerVisible
{
return self.viewController.isViewLoaded && self.viewController.view.window;
}
#pragma mark - Private methods
- (BOOL)_shouldHandleScrolling
@ -277,7 +282,6 @@ static inline CGFloat AACStatusBarHeight()
- (void)prepareForDisplay
{
[self cleanup];
self.viewControllerVisible = YES;
}
- (void)layoutViews
@ -303,7 +307,6 @@ static inline CGFloat AACStatusBarHeight()
{
[self.navBarController expand];
self.viewControllerVisible = NO;
self.previousYOffset = NAN;
self.previousScrollInsets = UIEdgeInsetsZero;
}