Fixed positioning when the navbar is hidden

ronhuiyuan · Nov 28, 2014 · c50c9ae · c50c9ae
1 parent cc7ba29
commit c50c9ae
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/AMWaveTransition/AMWaveTransition.m b/AMWaveTransition/AMWaveTransition.m
@@ -246,6 +246,8 @@ - (void)animationCompletionForInteractiveTransitionForView:(UIView *)view
     UINavigationController *navigationController = self.navigationController;
     if (navigationController.navigationBar.translucent && !navigationController.navigationBar.hidden) {
         rect.origin.y -= navigationController.navigationBar.frame.origin.y + navigationController.navigationBar.frame.size.height;
+    } else {
+        rect.origin.y -= [[UIApplication sharedApplication] statusBarFrame].size.height;
     }
     view.frame = rect;
     view.alpha = [self alphaForView:view];
@@ -265,8 +267,10 @@ - (void)kickCellOutside:(UIView *)view
     CGRect rect = view.frame;
     rect.origin.x = -SCREEN_WIDTH - self.viewControllersInset;
     UINavigationController *navigationController = self.navigationController;
-    if (navigationController.navigationBar.translucent) {
+    if (navigationController.navigationBar.translucent && !navigationController.navigationBar.hidden) {
         rect.origin.y += navigationController.navigationBar.frame.origin.y + navigationController.navigationBar.frame.size.height;
+    } else {
+        rect.origin.y += [[UIApplication sharedApplication] statusBarFrame].size.height;
     }
     view.alpha = [self alphaForView:view];
     view.frame = rect;

diff --git a/Demo/Demo/Base.lproj/Main.storyboard b/Demo/Demo/Base.lproj/Main.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6250" systemVersion="14B23" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="60y-Ty-eKT">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6250" systemVersion="14C68m" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="60y-Ty-eKT">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>