Merge branch 'master' of github.com:toursprung/TSMessages

KrauseFx · KrauseFx · commit 0b452b09c193 · 2013-09-03T20:06:37.000+02:00
diff --git a/TSMessages/Classes/TSMessage.m b/TSMessages/Classes/TSMessage.m
@@ -195,8 +195,11 @@ - (void)fadeInCurrentNotification
     }
     else
     {
-        toPoint = CGPointMake(currentView.center.x,
-                              currentView.viewController.view.bounds.size.height - CGRectGetHeight(currentView.frame) / 2.0);
+        CGFloat y = currentView.viewController.view.bounds.size.height - CGRectGetHeight(currentView.frame) / 2.0;
+        if (!currentView.viewController.navigationController.isToolbarHidden) {
+            y -= CGRectGetHeight(currentView.viewController.navigationController.toolbar.bounds);
+        }
+        toPoint = CGPointMake(currentView.center.x, y);
     }
 
     dispatch_block_t animationBlock = ^{

Original file line number	Diff line number	Diff line change
`@@ -195,8 +195,11 @@ - (void)fadeInCurrentNotification`
`195`	`195`	`}`
`196`	`196`	`else`
`197`	`197`	`{`
`198`		`- toPoint = CGPointMake(currentView.center.x,`
`199`		`- currentView.viewController.view.bounds.size.height - CGRectGetHeight(currentView.frame) / 2.0);`
	`198`	`+ CGFloat y = currentView.viewController.view.bounds.size.height - CGRectGetHeight(currentView.frame) / 2.0;`
	`199`	`+ if (!currentView.viewController.navigationController.isToolbarHidden) {`
	`200`	`+ y -= CGRectGetHeight(currentView.viewController.navigationController.toolbar.bounds);`
	`201`	`+ }`
	`202`	`+ toPoint = CGPointMake(currentView.center.x, y);`
`200`	`203`	`}`
`201`	`204`
`202`	`205`	`dispatch_block_t animationBlock = ^{`