1 files changed, 46 insertions, 15 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index 3188463dbe..e1d09c0400 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -33,7 +33,6 @@
 #include "qcocoawindow.h"
 #include "qcocoaintegration.h"
 #include "qnswindowdelegate.h"
-#include "qcocoaautoreleasepool.h"
 #include "qcocoaeventdispatcher.h"
 #ifndef QT_NO_OPENGL
 #include "qcocoaglcontext.h"
@@ -350,6 +349,7 @@ QCocoaWindow::QCocoaWindow(QWindow *tlw)
     , m_inConstructor(true)
     , m_inSetVisible(false)
     , m_inSetGeometry(false)
+    , m_inSetStyleMask(false)
 #ifndef QT_NO_OPENGL
     , m_glContext(0)
 #endif
@@ -373,7 +373,7 @@ QCocoaWindow::QCocoaWindow(QWindow *tlw)
 #ifdef QT_COCOA_ENABLE_WINDOW_DEBUG
     qDebug() << "QCocoaWindow::QCocoaWindow" << this;
 #endif
-    QCocoaAutoReleasePool pool;
+    QMacAutoReleasePool pool;
 
     if (tlw->type() == Qt::ForeignWindow) {
         NSView *foreignView = (NSView *)WId(tlw->property("_q_foreignWinId").value<WId>());
@@ -409,7 +409,7 @@ QCocoaWindow::~QCocoaWindow()
     qDebug() << "QCocoaWindow::~QCocoaWindow" << this;
 #endif
 
-    QCocoaAutoReleasePool pool;
+    QMacAutoReleasePool pool;
     [m_nsWindow setContentView:nil];
     [m_nsWindow.helper detachFromPlatformWindow];
     if (m_isNSWindowChild) {
@@ -419,6 +419,8 @@ QCocoaWindow::~QCocoaWindow()
         [m_contentView removeFromSuperview];
     }
 
+    removeMonitor();
+
     // Make sure to disconnect observer in all case if view is valid
     // to avoid notifications received when deleting when using Qt::AA_NativeWindows attribute
     if (m_qtView) {
@@ -499,7 +501,7 @@ QRect QCocoaWindow::geometry() const
 
 void QCocoaWindow::setCocoaGeometry(const QRect &rect)
 {
-    QCocoaAutoReleasePool pool;
+    QMacAutoReleasePool pool;
 
     if (m_contentViewIsEmbedded) {
         QPlatformWindow::setGeometry(rect);
@@ -623,7 +625,7 @@ void QCocoaWindow::setVisible(bool visible)
 
     m_inSetVisible = true;
 
-    QCocoaAutoReleasePool pool;
+    QMacAutoReleasePool pool;
     QCocoaWindow *parentCocoaWindow = 0;
     if (window()->transientParent())
         parentCocoaWindow = static_cast<QCocoaWindow *>(window()->transientParent()->handle());
@@ -696,6 +698,7 @@ void QCocoaWindow::setVisible(bool visible)
                     && [m_nsWindow isKindOfClass:[NSPanel class]]) {
                     [(NSPanel *)m_nsWindow setWorksWhenModal:YES];
                     if (!(parentCocoaWindow && window()->transientParent()->isActive()) && window()->type() == Qt::Popup) {
+                        removeMonitor();
                         monitor = [NSEvent addGlobalMonitorForEventsMatchingMask:NSLeftMouseDownMask|NSRightMouseDownMask|NSOtherMouseDownMask|NSMouseMovedMask handler:^(NSEvent *e) {
                             QPointF localPoint = qt_mac_flipPoint([NSEvent mouseLocation]);
                             QWindowSystemInterface::handleMouseEvent(window(), window()->mapFromGlobal(localPoint.toPoint()), localPoint,
@@ -744,10 +747,7 @@ void QCocoaWindow::setVisible(bool visible)
         } else {
             [m_contentView setHidden:YES];
         }
-        if (monitor && window()->type() == Qt::Popup) {
-            [NSEvent removeMonitor:monitor];
-            monitor = nil;
-        }
+        removeMonitor();
 
         if (window()->type() == Qt::Popup || window()->type() == Qt::ToolTip)
             QCocoaIntegration::instance()->popupWindowStack()->removeAll(this);
@@ -875,10 +875,14 @@ void QCocoaWindow::setWindowFlags(Qt::WindowFlags flags)
     if (m_nsWindow && !m_isNSWindowChild) {
         NSUInteger styleMask = windowStyleMask(flags);
         NSInteger level = this->windowLevel(flags);
+        // While setting style mask we can have -updateGeometry calls on a content
+        // view with null geometry, reporting an invalid coordinates as a result.
+        m_inSetStyleMask = true;
         [m_nsWindow setStyleMask:styleMask];
+        m_inSetStyleMask = false;
         [m_nsWindow setLevel:level];
         setWindowShadow(flags);
-        if (!(styleMask & NSBorderlessWindowMask)) {
+        if (!(flags & Qt::FramelessWindowHint)) {
             setWindowTitle(window()->title());
         }
 
@@ -905,7 +909,7 @@ void QCocoaWindow::setWindowState(Qt::WindowState state)
 
 void QCocoaWindow::setWindowTitle(const QString &title)
 {
-    QCocoaAutoReleasePool pool;
+    QMacAutoReleasePool pool;
     if (!m_nsWindow)
         return;
 
@@ -916,7 +920,7 @@ void QCocoaWindow::setWindowTitle(const QString &title)
 
 void QCocoaWindow::setWindowFilePath(const QString &filePath)
 {
-    QCocoaAutoReleasePool pool;
+    QMacAutoReleasePool pool;
     if (!m_nsWindow)
         return;
 
@@ -926,7 +930,7 @@ void QCocoaWindow::setWindowFilePath(const QString &filePath)
 
 void QCocoaWindow::setWindowIcon(const QIcon &icon)
 {
-    QCocoaAutoReleasePool pool;
+    QMacAutoReleasePool pool;
 
     NSButton *iconButton = [m_nsWindow standardWindowButton:NSWindowDocumentIconButton];
     if (iconButton == nil) {
@@ -1044,7 +1048,7 @@ bool QCocoaWindow::isOpaque() const
 
 void QCocoaWindow::propagateSizeHints()
 {
-    QCocoaAutoReleasePool pool;
+    QMacAutoReleasePool pool;
     if (!m_nsWindow)
         return;
 
@@ -1387,7 +1391,7 @@ bool QCocoaWindow::shouldUseNSPanel()
 
 QCocoaNSWindow * QCocoaWindow::createNSWindow()
 {
-    QCocoaAutoReleasePool pool;
+    QMacAutoReleasePool pool;
 
     QRect rect = initialGeometry(window(), window()->geometry(), defaultWindowWidth, defaultWindowHeight);
     NSRect frame = qt_mac_flipRect(rect);
@@ -1476,6 +1480,14 @@ void QCocoaWindow::removeChildWindow(QCocoaWindow *child)
     [m_nsWindow removeChildWindow:child->m_nsWindow];
 }
 
+void QCocoaWindow::removeMonitor()
+{
+    if (!monitor)
+        return;
+    [NSEvent removeMonitor:monitor];
+    monitor = nil;
+}
+
 // Returns the current global screen geometry for the nswindow associated with this window.
 QRect QCocoaWindow::windowGeometry() const
 {
@@ -1827,6 +1839,25 @@ bool QCocoaWindow::shouldRefuseKeyWindowAndFirstResponder()
     return false;
 }
 
+QPoint QCocoaWindow::bottomLeftClippedByNSWindowOffsetStatic(QWindow *window)
+{
+    if (window->handle())
+        return static_cast<QCocoaWindow *>(window->handle())->bottomLeftClippedByNSWindowOffset();
+    return QPoint();
+}
+
+QPoint QCocoaWindow::bottomLeftClippedByNSWindowOffset() const
+{
+    if (!m_contentView)
+        return QPoint();
+    NSPoint origin = [m_contentView isFlipped] ?
+                        NSMakePoint(0, [m_contentView frame].size.height) :
+                        NSMakePoint(0, 0);
+    NSPoint windowPoint = [m_contentView convertPoint:origin toView:nil];
+
+    return QPoint(-std::min((int)windowPoint.x, 0), -std::min((int)windowPoint.y,0));
+}
+
 QMargins QCocoaWindow::frameMargins() const
 {
     NSRect frameW = [m_nsWindow frame];