From d895d7cc8908ce5c6157c8261b9145d81b21501f Mon Sep 17 00:00:00 2001
From: Fred Emmott <mail@fredemmott.co.uk>
Date: Fri, 6 Nov 2009 11:27:57 +0100
Subject: Fix QDesktopWidget::availableGeometry() on OSX Was ignoring top OSX
 menu bar. Example c++: http://pastebin.ca/1585763
 http://fred.uwcs.co.uk/testAvailableGeometry.cpp Example output:
 http://pastebin.ca/1585766
 http://fred.uwcs.co.uk/testAvailableGeometry.output

Introduced by commit 13254da6c3192937812983f44ce95fe8e1bc602c

Merge-request: 1652
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
---
 src/gui/kernel/qdesktopwidget_mac.mm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/gui/kernel/qdesktopwidget_mac.mm b/src/gui/kernel/qdesktopwidget_mac.mm
index 88dc173..1020435 100644
--- a/src/gui/kernel/qdesktopwidget_mac.mm
+++ b/src/gui/kernel/qdesktopwidget_mac.mm
@@ -136,16 +136,20 @@ void QDesktopWidgetImplementation::onResize()
     screenRects.clear(); 
     availableRects.clear(); 
     NSRect primaryRect = [[displays objectAtIndex:0] frame]; 
-    for (int i = 0; i<screenCount; i++) { 
-        NSRect r = [[displays objectAtIndex:i] frame]; 
+    for (int i = 0; i<screenCount; i++) {
+        const NSRect r = [[displays objectAtIndex:i] frame]; 
         const int flippedY = - r.origin.y +            // account for position offset and 
               primaryRect.size.height - r.size.height; // height difference. 
         screenRects.append(QRectF(r.origin.x, flippedY, 
             r.size.width, r.size.height)); 
-        r = [[displays objectAtIndex:i] visibleFrame]; 
+    }
+    for (int i = 0; i<screenCount; i++) {
+        const NSRect r = [[displays objectAtIndex:i] visibleFrame]; 
+        const int flippedY = - r.origin.y +            // account for position offset and 
+              primaryRect.size.height - r.size.height; // height difference. 
         availableRects.append(QRectF(r.origin.x, flippedY, 
                 r.size.width, r.size.height)); 
-    } 
+    }
 }
 
 
-- 
cgit v0.12