* Don't hard-code the height of status bar - ask OS for it so that pr…

…esence of in-call status bar is considered
almakdad · Aug 3, 2009 · f56fe8f · f56fe8f
1 parent 917c195
commit f56fe8f
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 12 deletions.
diff --git a/src/TTGlobal.m b/src/TTGlobal.m
@@ -75,6 +75,14 @@ CGRect TTToolbarNavigationFrame() {
   return CGRectMake(0, 0, frame.size.width, frame.size.height - TT_ROW_HEIGHT*2);
 }
 
+CGFloat TTStatusHeight() {
+  return [UIScreen mainScreen].applicationFrame.origin.y;
+}
+
+CGFloat TTBarsHeight() {
+  return [UIScreen mainScreen].applicationFrame.origin.y + TT_ROW_HEIGHT;
+}
+
 CGRect TTRectContract(CGRect rect, CGFloat dx, CGFloat dy) {
   return CGRectMake(rect.origin.x, rect.origin.y, rect.size.width - dx, rect.size.height - dy);
 }
@@ -87,7 +95,6 @@ CGRect TTRectInset(CGRect rect, UIEdgeInsets insets) {
   return CGRectMake(rect.origin.x + insets.left, rect.origin.y + insets.top,
                     rect.size.width - (insets.left + insets.right),
                     rect.size.height - (insets.top + insets.bottom));
-
 }
 
 void TTNetworkRequestStarted() {

diff --git a/src/TTPhotoView.m b/src/TTPhotoView.m
@@ -122,7 +122,7 @@ - (void)layoutSubviews {
   CGFloat cy = self.bounds.origin.y + height/2;
 
   BOOL portrait = self.width == width;
-  CGFloat marginRight = portrait ? 0 : TT_CHROME_HEIGHT;
+  CGFloat marginRight = portrait ? 0 : TTBarsHeight();
   CGFloat marginLeft = portrait ? 0 : TT_ROW_HEIGHT;
   CGFloat marginBottom = portrait ? TT_ROW_HEIGHT : 0;
 

diff --git a/src/TTPostController.m b/src/TTPostController.m
@@ -256,7 +256,7 @@ - (void)showInView:(UIView*)view animated:(BOOL)animated {
     }
 
     if (!CGRectIsEmpty(originRect)) {
-      _textEditor.frame = CGRectOffset(originRect, 0, -TT_STATUS_HEIGHT);
+      _textEditor.frame = CGRectOffset(originRect, 0, -TTStatusHeight());
     } else {
       [self layoutTextEditor];
       _textEditor.transform = CGAffineTransformMakeScale(0.00001, 0.00001);
@@ -391,7 +391,7 @@ - (void)dismissWithResult:(id)result animated:(BOOL)animated {
     [UIView setAnimationDidStopSelector:@selector(dismissAnimationDidStop)];
 
     if (!CGRectIsEmpty(originRect)) {
-      _textEditor.frame = CGRectOffset(originRect, 0, -TT_STATUS_HEIGHT);
+      _textEditor.frame = CGRectOffset(originRect, 0, -TTStatusHeight());
     } else {
       _textEditor.transform = CGAffineTransformMakeScale(0.00001, 0.00001);
     }

diff --git a/src/TTSearchDisplayController.m b/src/TTSearchDisplayController.m
@@ -73,7 +73,7 @@ - (void)searchDisplayControllerWillBeginSearch:(UISearchDisplayController*)contr
   }
   if (!self.searchContentsController.navigationController) {
     [UIView beginAnimations:nil context:nil];
-    self.searchBar.superview.top -= self.searchBar.screenY - TT_STATUS_HEIGHT;
+    self.searchBar.superview.top -= self.searchBar.screenY - TTStatusHeight();
     [UIView commitAnimations];
   }
 }
@@ -93,7 +93,7 @@ - (void)searchDisplayControllerWillEndSearch:(UISearchDisplayController*)control
 
   if (!self.searchContentsController.navigationController) {
     [UIView beginAnimations:nil context:nil];
-    self.searchBar.superview.top += self.searchBar.top - TT_STATUS_HEIGHT;
+    self.searchBar.superview.top += self.searchBar.top - TTStatusHeight();
     [UIView commitAnimations];
   }
 }

diff --git a/src/TTThumbsViewController.m b/src/TTThumbsViewController.m
@@ -210,8 +210,8 @@ - (void)loadView {
     | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin;
   self.tableView.backgroundColor = TTSTYLEVAR(backgroundColor);
   self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
-  self.tableView.contentInset = UIEdgeInsetsMake(TT_CHROME_HEIGHT+4, 0, 0, 0);
-  self.tableView.scrollIndicatorInsets = UIEdgeInsetsMake(TT_CHROME_HEIGHT, 0, 0, 0);
+  self.tableView.contentInset = UIEdgeInsetsMake(TTBarsHeight()+4, 0, 0, 0);
+  self.tableView.scrollIndicatorInsets = UIEdgeInsetsMake(TTBarsHeight(), 0, 0, 0);
 }
 
 - (void)viewDidAppear:(BOOL)animated {
@@ -269,8 +269,8 @@ - (void)didRefreshModel {
 // TTTableViewController
 
 - (CGRect)rectForOverlayView {
-  return TTRectContract(CGRectOffset([super rectForOverlayView], 0, TT_CHROME_HEIGHT-_tableView.top),
-                        0, TT_CHROME_HEIGHT);
+  return TTRectContract(CGRectOffset([super rectForOverlayView], 0, TTBarsHeight()-_tableView.top),
+                        0, TTBarsHeight());
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////

diff --git a/src/Three20/TTGlobal.h b/src/Three20/TTGlobal.h
@@ -53,10 +53,8 @@
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // Dimensions of common iPhone OS Views
 
-#define TT_STATUS_HEIGHT 20
 #define TT_ROW_HEIGHT 44
 #define TT_KEYBOARD_HEIGHT 216
-#define TT_CHROME_HEIGHT (TT_STATUS_HEIGHT + TT_ROW_HEIGHT)
 #define TT_ROUNDED -1
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -194,6 +192,16 @@ CGRect TTKeyboardNavigationFrame();
  */
 CGRect TTToolbarNavigationFrame();
 
+/**
+ * The height of the area containing the status bar and possibly the in-call status bar.
+ */
+CGFloat TTStatusHeight();
+
+/**
+ * The height of the area containing the status bar and navigation bar.
+ */
+CGFloat TTBarsHeight();
+
 /**
  * Returns a rectangle that is smaller or larger than the source rectangle.
  */