From 9d9aa98cc91e44c912dd18936f69c4fdcceed19a Mon Sep 17 00:00:00 2001 From: Gian Franco Zabarino Date: Thu, 26 Jan 2017 20:39:23 -0300 Subject: [PATCH] Rolling back changes made that break displaying the shy nav bar in modal presented view controllers. --- TLYShyNavBar/ShyControllers/TLYShyStatusBarController.m | 5 ----- TLYShyNavBar/TLYShyNavBarManager.m | 4 +--- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/TLYShyNavBar/ShyControllers/TLYShyStatusBarController.m b/TLYShyNavBar/ShyControllers/TLYShyStatusBarController.m index 7729fc6..4e9252c 100644 --- a/TLYShyNavBar/ShyControllers/TLYShyStatusBarController.m +++ b/TLYShyNavBar/ShyControllers/TLYShyStatusBarController.m @@ -20,11 +20,6 @@ static inline CGFloat AACStatusBarHeight(UIViewController *viewController) } // Modal views do not overlap the status bar, so no allowance need be made for it - if (viewController.presentingViewController != nil) - { - return 0.f; - } - CGSize statusBarSize = [UIApplication sharedApplication].statusBarFrame.size; CGFloat statusBarHeight = MIN(statusBarSize.width, statusBarSize.height); diff --git a/TLYShyNavBar/TLYShyNavBarManager.m b/TLYShyNavBar/TLYShyNavBarManager.m index 63f3267..023b478 100644 --- a/TLYShyNavBar/TLYShyNavBarManager.m +++ b/TLYShyNavBar/TLYShyNavBarManager.m @@ -27,7 +27,7 @@ @interface TLYShyNavBarManager () -@property (nonatomic, strong) TLYShyStatusBarController *statusBarController; +@property (nonatomic, strong) id statusBarController; @property (nonatomic, strong) TLYShyViewController *navBarController; @property (nonatomic, strong) TLYShyViewController *extensionController; @property (nonatomic, strong) TLYShyScrollViewController *scrollViewController; @@ -137,8 +137,6 @@ - (void)setViewController:(UIViewController *)viewController self.navBarController.view = navbar; - self.statusBarController.viewController = viewController; - [self layoutViews]; }