Merge fix for the Clamshell mode.

cocoabits · Sep 3, 2012 · 4825d5c · 4825d5c
1 parent e7104e0
commit 4825d5c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 19 deletions.
diff --git a/Popup/PanelController.h b/Popup/PanelController.h
@@ -33,6 +33,5 @@
 
 - (void)openPanel;
 - (void)closePanel;
-- (NSRect)statusRectInScreenRect:(NSRect *)outScreenRect;
 
 @end
diff --git a/Popup/PanelController.m b/Popup/PanelController.m
@@ -102,7 +102,7 @@ - (void)windowDidResignKey:(NSNotification *)notification;
 - (void)windowDidResize:(NSNotification *)notification
 {
     NSWindow *panel = [self window];
-    NSRect statusRect = [self statusRectInScreenRect:NULL];
+    NSRect statusRect = [self statusRectForWindow:panel];
     NSRect panelRect = [panel frame];
 
     CGFloat statusX = roundf(NSMidX(statusRect));
@@ -163,42 +163,38 @@ - (void)runSearch
 
 #pragma mark - Public methods
 
-- (NSRect)statusRectInScreenRect:(NSRect *)outScreenRect
+- (NSRect)statusRectForWindow:(NSWindow *)window
 {
+    NSRect screenRect = [[[NSScreen screens] objectAtIndex:0] frame];
+    NSRect statusRect = NSZeroRect;
+
     StatusItemView *statusItemView = nil;
-    if ([self.delegate respondsToSelector:@selector(statusItemViewForPanelController:)]) {
+    if ([self.delegate respondsToSelector:@selector(statusItemViewForPanelController:)])
+    {
         statusItemView = [self.delegate statusItemViewForPanelController:self];
     }
 
-    NSRect screenRect = NSZeroRect;
-    NSRect statusRect = NSZeroRect;
-
-    if (statusItemView) {
-        screenRect = statusItemView.window.screen.frame;
+    if (statusItemView)
+    {
         statusRect = statusItemView.globalRect;
         statusRect.origin.y = NSMinY(statusRect) - NSHeight(statusRect);
     }
-    else {
-        screenRect = self.window.screen.frame;
+    else
+    {
         statusRect.size = NSMakeSize(STATUS_ITEM_VIEW_WIDTH, [[NSStatusBar systemStatusBar] thickness]);
         statusRect.origin.x = roundf((NSWidth(screenRect) - NSWidth(statusRect)) / 2);
         statusRect.origin.y = NSHeight(screenRect) - NSHeight(statusRect) * 2;
     }
-
-    if (outScreenRect) {
-        *outScreenRect = screenRect;
-    }
-
     return statusRect;
 }
 
 - (void)openPanel
 {
     NSWindow *panel = [self window];
 
-    NSRect screenRect = NSZeroRect;
-    NSRect statusRect = [self statusRectInScreenRect:&screenRect];
-    
+    NSRect screenRect = [[[NSScreen screens] objectAtIndex:0] frame];
+    NSRect statusRect = [self statusRectForWindow:panel];
+
     NSRect panelRect = [panel frame];
     panelRect.size.width = PANEL_WIDTH;
     panelRect.origin.x = roundf(NSMidX(statusRect) - NSWidth(panelRect) / 2);