1 files changed, 19 insertions, 104 deletions

diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
index a63bc4d570..689fd06d66 100644
--- a/src/plugins/platforms/cocoa/qnsview.mm
+++ b/src/plugins/platforms/cocoa/qnsview.mm
@@ -149,7 +149,6 @@ static bool _q_dontOverrideCtrlLMB = false;
         m_acceptedMouseDowns = Qt::NoButton;
         m_frameStrutButtons = Qt::NoButton;
         m_sendKeyEvent = false;
-        m_subscribesForGlobalFrameNotifications = false;
 #ifndef QT_NO_OPENGL
         m_glContext = 0;
         m_shouldSetGLContextinDrawRect = false;
@@ -181,7 +180,6 @@ static bool _q_dontOverrideCtrlLMB = false;
     CGImageRelease(m_maskImage);
     [m_trackingArea release];
     m_maskImage = 0;
-    m_subscribesForGlobalFrameNotifications = false;
     [m_inputSource release];
     [[NSNotificationCenter defaultCenter] removeObserver:self];
     [m_mouseMoveHelper release];
@@ -217,11 +215,6 @@ static bool _q_dontOverrideCtrlLMB = false;
 #endif
 
     [self registerDragTypes];
-    [self setPostsFrameChangedNotifications : YES];
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                          selector:@selector(updateGeometry)
-                                          name:NSViewFrameDidChangeNotification
-                                          object:self];
 
     [[NSNotificationCenter defaultCenter] addObserver:self
                                           selector:@selector(textInputContextKeyboardSelectionDidChangeNotification:)
@@ -240,27 +233,9 @@ static bool _q_dontOverrideCtrlLMB = false;
         //was unable to set view
         m_shouldSetGLContextinDrawRect = true;
     }
-
-    if (!m_subscribesForGlobalFrameNotifications) {
-        // NSOpenGLContext expects us to repaint (or update) the view when
-        // it changes position on screen. Since this happens unnoticed for
-        // the view when the parent view moves, we need to register a special
-        // notification that lets us handle this case:
-        m_subscribesForGlobalFrameNotifications = true;
-        [[NSNotificationCenter defaultCenter] addObserver:self
-            selector:@selector(globalFrameChanged:)
-            name:NSViewGlobalFrameDidChangeNotification
-            object:self];
-    }
 }
 #endif
 
-- (void) globalFrameChanged:(NSNotification*)notification
-{
-    Q_UNUSED(notification);
-    m_platformWindow->updateExposedGeometry();
-}
-
 - (void)viewDidMoveToSuperview
 {
     if (!(m_platformWindow->m_viewIsToBeEmbedded))
@@ -281,22 +256,6 @@ static bool _q_dontOverrideCtrlLMB = false;
     m_backingStore = Q_NULLPTR;
 }
 
-- (void)viewWillMoveToWindow:(NSWindow *)newWindow
-{
-    // ### Merge "normal" window code path with this one for 5.1.
-    if (!(m_platformWindow->window()->type() & Qt::SubWindow))
-        return;
-
-    if (newWindow) {
-        [[NSNotificationCenter defaultCenter] addObserver:self
-                                              selector:@selector(windowNotification:)
-                                              name:nil // Get all notifications
-                                              object:newWindow];
-    }
-    if ([self window])
-        [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:[self window]];
-}
-
 - (QWindow *)topLevelWindow
 {
     QWindow *focusWindow = m_platformWindow->window();
@@ -316,7 +275,7 @@ static bool _q_dontOverrideCtrlLMB = false;
 {
     QRect geometry;
 
-    if (m_platformWindow->m_isNSWindowChild) {
+    if (self.window.parentWindow) {
          return;
 #if 0
         //geometry = QRectF::fromCGRect([self frame]).toRect();
@@ -336,10 +295,10 @@ static bool _q_dontOverrideCtrlLMB = false;
         geometry = QRect(windowRect.origin.x, qt_mac_flipYCoordinate(windowRect.origin.y + rect.size.height), rect.size.width, rect.size.height);
     } else if (m_platformWindow->m_viewIsToBeEmbedded) {
         // embedded child window, use the frame rect ### merge with case below
-        geometry = QRectF::fromCGRect([self bounds]).toRect();
+        geometry = QRectF::fromCGRect(NSRectToCGRect([self bounds])).toRect();
     } else {
         // child window, use the frame rect
-        geometry = QRectF::fromCGRect([self frame]).toRect();
+        geometry = QRectF::fromCGRect(NSRectToCGRect([self frame])).toRect();
     }
 
     if (m_platformWindow->m_nsWindow && geometry == m_platformWindow->geometry())
@@ -395,64 +354,6 @@ static bool _q_dontOverrideCtrlLMB = false;
     m_platformWindow->setSynchedWindowStateFromWindow();
 }
 
-- (void)windowNotification : (NSNotification *) windowNotification
-{
-    //qDebug() << "windowNotification" << QString::fromNSString([windowNotification name]);
-
-    NSString *notificationName = [windowNotification name];
-    if (notificationName == NSWindowDidBecomeKeyNotification) {
-        if (!m_platformWindow->windowIsPopupType() && !m_isMenuView)
-            QWindowSystemInterface::handleWindowActivated(m_platformWindow->window());
-    } else if (notificationName == NSWindowDidResignKeyNotification) {
-        // key window will be non-nil if another window became key... do not
-        // set the active window to zero here, the new key window's
-        // NSWindowDidBecomeKeyNotification hander will change the active window
-        NSWindow *keyWindow = [NSApp keyWindow];
-        if (!keyWindow || keyWindow == windowNotification.object) {
-            // no new key window, go ahead and set the active window to zero
-            if (!m_platformWindow->windowIsPopupType() && !m_isMenuView)
-                QWindowSystemInterface::handleWindowActivated(0);
-        }
-    } else if (notificationName == NSWindowDidMiniaturizeNotification
-               || notificationName == NSWindowDidDeminiaturizeNotification) {
-        Qt::WindowState newState = notificationName == NSWindowDidMiniaturizeNotification ?
-                    Qt::WindowMinimized : Qt::WindowNoState;
-        [self notifyWindowStateChanged:newState];
-    } else if ([notificationName isEqualToString: @"NSWindowDidOrderOffScreenNotification"]) {
-        m_platformWindow->obscureWindow();
-    } else if ([notificationName isEqualToString: @"NSWindowDidOrderOnScreenAndFinishAnimatingNotification"]) {
-        m_platformWindow->exposeWindow();
-    } else if ([notificationName isEqualToString:NSWindowDidChangeOcclusionStateNotification]) {
-        // Several unit tests expect paint and/or expose events for windows that are
-        // sometimes (unpredictably) occluded and some unit tests depend on QWindow::isExposed -
-        // don't send Expose/Obscure events when running under QTestLib.
-        static const bool onTestLib = qt_mac_resolveOption(false, "QT_QTESTLIB_RUNNING");
-        if (!onTestLib) {
-            if ((NSUInteger)[self.window occlusionState] & NSWindowOcclusionStateVisible) {
-                m_platformWindow->exposeWindow();
-            } else {
-                // Send Obscure events on window occlusion to stop animations.
-                m_platformWindow->obscureWindow();
-            }
-        }
-    } else if (notificationName == NSWindowDidChangeScreenNotification) {
-        if (m_platformWindow->window()) {
-            NSUInteger screenIndex = [[NSScreen screens] indexOfObject:self.window.screen];
-            if (screenIndex != NSNotFound) {
-                QCocoaScreen *cocoaScreen = QCocoaIntegration::instance()->screenAtIndex(screenIndex);
-                if (cocoaScreen)
-                    QWindowSystemInterface::handleWindowScreenChanged(m_platformWindow->window(), cocoaScreen->screen());
-                m_platformWindow->updateExposedGeometry();
-            }
-        }
-    } else if (notificationName == NSWindowDidEnterFullScreenNotification
-               || notificationName == NSWindowDidExitFullScreenNotification) {
-        Qt::WindowState newState = notificationName == NSWindowDidEnterFullScreenNotification ?
-                                   Qt::WindowFullScreen : Qt::WindowNoState;
-        [self notifyWindowStateChanged:newState];
-    }
-}
-
 - (void)textInputContextKeyboardSelectionDidChangeNotification : (NSNotification *) textInputContextKeyboardSelectionDidChangeNotification
 {
     Q_UNUSED(textInputContextKeyboardSelectionDidChangeNotification)
@@ -553,7 +454,7 @@ static bool _q_dontOverrideCtrlLMB = false;
 
 - (void) drawRect:(NSRect)dirtyRect
 {
-    qCDebug(lcQpaCocoaWindow) << "[QNSView drawRect:]" << m_platformWindow->window() << QRectF::fromCGRect(dirtyRect);
+    qCDebug(lcQpaCocoaWindow) << "[QNSView drawRect:]" << m_platformWindow->window() << QRectF::fromCGRect(NSRectToCGRect(dirtyRect));
 
 #ifndef QT_NO_OPENGL
     if (m_glContext && m_shouldSetGLContextinDrawRect) {
@@ -1336,7 +1237,7 @@ static QTabletEvent::TabletDevice wacomTabletDevice(NSEvent *theEvent)
 
 - (bool)handleGestureAsBeginEnd:(NSEvent *)event
 {
-    if (QSysInfo::QSysInfo::MacintoshVersion < QSysInfo::MV_10_11)
+    if (QOperatingSystemVersion::current() < QOperatingSystemVersion::OSXElCapitan)
         return false;
 
     if ([event phase] == NSEventPhaseBegan) {
@@ -2201,3 +2102,17 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin
 }
 
 @end
+
+@implementation QT_MANGLE_NAMESPACE(QNSView) (QtExtras)
+
+- (QCocoaWindow*)platformWindow
+{
+    return m_platformWindow.data();;
+}
+
+- (BOOL)isMenuView
+{
+    return m_isMenuView;
+}
+
+@end