Skip to content

Commit

Permalink
Fix iOS8 status bar height
Browse files Browse the repository at this point in the history
  • Loading branch information
konomae committed Oct 31, 2014
1 parent 5f0f164 commit 1f7f5c9
Showing 1 changed file with 11 additions and 6 deletions.
17 changes: 11 additions & 6 deletions NJKScrollFullScreen/UIViewController+NJKFullScreenSupport.m
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ @implementation UIViewController (NJKFullScreenSupport)

- (void)showNavigationBar:(BOOL)animated
{
CGSize statuBarFrameSize = [UIApplication sharedApplication].statusBarFrame.size;
CGFloat statusBarHeight = UIInterfaceOrientationIsPortrait(self.interfaceOrientation) ? statuBarFrameSize.height : statuBarFrameSize.width;
CGFloat statusBarHeight = [self statusBarHeight];

UIWindow *appKeyWindow = [UIApplication sharedApplication].keyWindow;
UIView *appBaseView = appKeyWindow.rootViewController.view;
Expand All @@ -38,8 +37,7 @@ - (void)showNavigationBar:(BOOL)animated

- (void)hideNavigationBar:(BOOL)animated
{
CGSize statuBarFrameSize = [UIApplication sharedApplication].statusBarFrame.size;
CGFloat statusBarHeight = UIInterfaceOrientationIsPortrait(self.interfaceOrientation) ? statuBarFrameSize.height : statuBarFrameSize.width;
CGFloat statusBarHeight = [self statusBarHeight];

UIWindow *appKeyWindow = [UIApplication sharedApplication].keyWindow;
UIView *appBaseView = appKeyWindow.rootViewController.view;
Expand All @@ -62,8 +60,7 @@ - (void)moveNavigtionBar:(CGFloat)deltaY animated:(BOOL)animated

- (void)setNavigationBarOriginY:(CGFloat)y animated:(BOOL)animated
{
CGSize statuBarFrameSize = [UIApplication sharedApplication].statusBarFrame.size;
CGFloat statusBarHeight = UIInterfaceOrientationIsPortrait(self.interfaceOrientation) ? statuBarFrameSize.height : statuBarFrameSize.width;
CGFloat statusBarHeight = [self statusBarHeight];

UIWindow *appKeyWindow = [UIApplication sharedApplication].keyWindow;
UIView *appBaseView = appKeyWindow.rootViewController.view;
Expand Down Expand Up @@ -97,6 +94,14 @@ - (void)setNavigationBarOriginY:(CGFloat)y animated:(BOOL)animated
}];
}

- (CGFloat)statusBarHeight {
CGSize statuBarFrameSize = [UIApplication sharedApplication].statusBarFrame.size;
if (NJK_IS_RUNNING_IOS8) {
return statuBarFrameSize.height;
}
return UIInterfaceOrientationIsPortrait(self.interfaceOrientation) ? statuBarFrameSize.height : statuBarFrameSize.width;
}

#pragma mark -
#pragma mark manage ToolBar

Expand Down

0 comments on commit 1f7f5c9

Please sign in to comment.