From 0e0034d93a88d1871bfea813cbe48a4deeafb7dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Fri, 2 Jun 2017 11:37:53 +0200 Subject: macOS: Simplify QCocoaWindow::handleGeometryChange MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There are really only two cases here, where the difference is the coordinate system of the window position. 1) Child QWindow and embedded QWindow: The position is relative to parent view/window origin. 2) Top-level QWindow: The position is relative to screen origin. Change-Id: I867133a5adbbf3a690f574aec06b70c2bc64ad95 Reviewed-by: Timur Pocheptsov Reviewed-by: Tor Arne Vestbø --- src/plugins/platforms/cocoa/qcocoaintegration.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/plugins/platforms/cocoa/qcocoaintegration.h') diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.h b/src/plugins/platforms/cocoa/qcocoaintegration.h index ecdd20c4dc..d3f2079042 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.h +++ b/src/plugins/platforms/cocoa/qcocoaintegration.h @@ -92,6 +92,8 @@ public: QPointF mapFromNative(const QPointF &pos) const { return flipCoordinate(pos); } QRectF mapFromNative(const QRectF &rect) const { return flipCoordinate(rect); } + static QCocoaScreen *primaryScreen(); + private: QPointF flipCoordinate(const QPointF &pos) const; QRectF flipCoordinate(const QRectF &rect) const; -- cgit v1.2.3