Merge pull request #51 from jhersh/master

nicolaschengdev · nicolaschengdev · commit cdf3c2c602c1 · 2013-11-16T13:01:08.000-08:00
Determine content size with nav's visible controller by jhersh
diff --git a/WYPopoverController/WYPopoverController.m b/WYPopoverController/WYPopoverController.m
@@ -1478,10 +1478,7 @@ - (CGSize)contentSizeForViewInPopover
     {
         UINavigationController *navigationController = (UINavigationController *)controller;
         
-        if ([[navigationController viewControllers] count] > 0)
-        {
-            controller = (UIViewController *)[[navigationController viewControllers] objectAtIndex:0];
-        }
+        controller = [navigationController visibleViewController];
     }
     
 #ifdef WY_BASE_SDK_7_ENABLED

Original file line number	Diff line number	Diff line change
`@@ -1478,10 +1478,7 @@ - (CGSize)contentSizeForViewInPopover`
`1478`	`1478`	`{`
`1479`	`1479`	`UINavigationController navigationController = (UINavigationController )controller;`
`1480`	`1480`
`1481`		`- if ([[navigationController viewControllers] count] > 0)`
`1482`		`- {`
`1483`		`- controller = (UIViewController *)[[navigationController viewControllers] objectAtIndex:0];`
`1484`		`- }`
	`1481`	`+ controller = [navigationController visibleViewController];`
`1485`	`1482`	`}`
`1486`	`1483`
`1487`	`1484`	`#ifdef WY_BASE_SDK_7_ENABLED`