macOS: Report correct available geometry for non-primary screens

The assumption that the primary screen is the only one whose available
geometry differs from its full geometry no longer holds, so we need to
compute the available geometry for all screens.

Helpers methods for flipping between coordinates have been introduced
in QCocoaScreen, to make flipping possible relative to a specific
screen, and for exposing similar functionality in the future for
QScreen. The corresponding functions in qcocoahelpers.mm should
possibly be deprecated in favor of being explicit about which
screen is doing the mapping.

Change-Id: Iede658fabb4c3e4ef1f1b715db84fb927a661fa9
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>

1 files changed, 9 insertions, 0 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.h b/src/plugins/platforms/cocoa/qcocoaintegration.h
index 892ff6e00f..d0d88994d5 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.h
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.h
@@ -87,6 +87,15 @@ public:
     NSScreen *nsScreen() const;
     void updateGeometry();
 
+    QPointF mapToNative(const QPointF &pos) const { return flipCoordinate(pos); }
+    QRectF mapToNative(const QRectF &rect) const { return flipCoordinate(rect); }
+    QPointF mapFromNative(const QPointF &pos) const { return flipCoordinate(pos); }
+    QRectF mapFromNative(const QRectF &rect) const { return flipCoordinate(rect); }
+
+private:
+    QPointF flipCoordinate(const QPointF &pos) const;
+    QRectF flipCoordinate(const QRectF &rect) const;
+
 public:
     NSScreen *m_nsScreen;
     QRect m_geometry;