From 3e4d3209b21254c1c90414b2af08c304c8d26be2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 8 Nov 2017 13:35:56 +0100 Subject: macOS: Remove unused method QCocoaWindow::nativeWindowGeometry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Its usage was removed in ef32f16fc284e5017. Change-Id: I5101131e401e615231ab05b241dd5b670f6a5a61 Reviewed-by: Morten Johan Sørvig --- src/plugins/platforms/cocoa/qcocoawindow.h | 2 -- src/plugins/platforms/cocoa/qcocoawindow.mm | 13 ------------- 2 files changed, 15 deletions(-) diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h index d9d7870da0..fb91c53a7a 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.h +++ b/src/plugins/platforms/cocoa/qcocoawindow.h @@ -209,8 +209,6 @@ protected: void recreateWindowIfNeeded(); QCocoaNSWindow *createNSWindow(bool shouldBePanel); - QRect nativeWindowGeometry() const; - Qt::WindowState windowState() const; void applyWindowState(Qt::WindowStates newState); void toggleMaximized(); diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index 9fdb5f166d..8ac3ec228f 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -1443,19 +1443,6 @@ void QCocoaWindow::removeMonitor() monitor = nil; } -// Returns the current global screen geometry for the nswindow associated with this window. -QRect QCocoaWindow::nativeWindowGeometry() const -{ - if (!isContentView()) - return geometry(); - - NSRect rect = m_view.window.frame; - QPlatformScreen *onScreen = QPlatformScreen::platformScreenForWindow(window()); - int flippedY = onScreen->geometry().height() - rect.origin.y - rect.size.height; // account for nswindow inverted y. - QRect qRect = QRect(rect.origin.x, flippedY, rect.size.width, rect.size.height); - return qRect; -} - /*! Applies the given state to the NSWindow, going in/out of minimize/zoomed/fullscreen -- cgit v1.2.3