Fixed bug with positioning when popover display area lies outside the…

… view which was supplied to the presentPopover method
Simplesd · May 8, 2011 · 0c8d321 · 0c8d321
1 parent 686f0d4
commit 0c8d321
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Classes/WEPopoverController.m b/Classes/WEPopoverController.m
@@ -261,7 +261,7 @@ - (CGRect)displayAreaForView:(UIView *)theView {
 	if ([theView conformsToProtocol:@protocol(WEPopoverParentView)] && [theView respondsToSelector:@selector(displayAreaForPopover)]) {
 		displayArea = [(id <WEPopoverParentView>)theView displayAreaForPopover];
 	} else {
-		displayArea = theView.bounds;
+		displayArea = [[[UIApplication sharedApplication] keyWindow] convertRect:[[UIScreen mainScreen] applicationFrame] toView:theView];
 	}
 	return displayArea;
 }

diff --git a/Classes/WEPopoverTableViewController.m b/Classes/WEPopoverTableViewController.m
@@ -8,6 +8,7 @@
 
 #import "WEPopoverTableViewController.h"
 #import "WEPopoverContentViewController.h"
+#import "UIBarButtonItem+WEPopover.h"
 
 @implementation WEPopoverTableViewController
 
@@ -206,6 +207,7 @@ - (IBAction)showPopover:(id)sender {
 		[self.popoverController presentPopoverFromBarButtonItem:sender 
 									   permittedArrowDirections:(UIPopoverArrowDirectionUp|UIPopoverArrowDirectionDown) 
 													   animated:YES];
+
 		[contentViewController release];
 	} else {
 		[self.popoverController dismissPopoverAnimated:YES];