diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-09-14 09:56:41 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-09-15 04:38:11 +0000 |
| commit | 020ddba56e8cf477d3c6c78d00e6137d7cc50355 (patch) | |
| tree | ccd1f6a39a8685d14d6cad1ffc761f379d7995bb /src | |
| parent | 8ed2fcd366caf310e99db982f222bc6ec750c0a7 (diff) | |
Revert "Cocoa: correct QDesktopWidget::availableGeometry()"
Wrong calculation of flip.
This reverts commit 1a5cc2a868969f1b1e9278c4145b7af2fc4b8f69.
Task-number: QTBUG-47030
Change-Id: Ide178eb5e027c4ecec1e3952c973fb64987eb7ce
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaintegration.mm | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm index 8f84539e04..c8f6dd05db 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.mm +++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm @@ -86,17 +86,9 @@ void QCocoaScreen::updateGeometry() NSRect frameRect = [nsScreen frame]; - // Since Mavericks, there is a setting, System Preferences->Mission Control-> - // Displays have separate Spaces. - BOOL spansDisplays = NO; -#if QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_9) - if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_9) - spansDisplays = [NSScreen screensHaveSeparateSpaces]; -#endif - if (spansDisplays || m_screenIndex == 0) { + if (m_screenIndex == 0) { m_geometry = QRect(frameRect.origin.x, frameRect.origin.y, frameRect.size.width, frameRect.size.height); - // Displays have separate Spaces setting is on or this is the primary screen, - // the one that contains the menubar. Its origin should be + // This is the primary screen, the one that contains the menubar. Its origin should be // (0, 0), and it's the only one whose available geometry differs from its full geometry. NSRect visibleRect = [nsScreen visibleFrame]; m_availableGeometry = QRect(visibleRect.origin.x, |