macOS: Handle NSViewFrameDidChangeNotification via QCocaWindow

There's no need to set postsFrameChangedNotifications = YES, it's
already the default.

Change-Id: I8c50dc119ba3779cdc6b3114d39c64f3cb236172
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>

3 files changed, 26 insertions, 11 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h
index 05fc37ac1a..0ec1524b4d 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.h
+++ b/src/plugins/platforms/cocoa/qcocoawindow.h
@@ -197,6 +197,7 @@ public:
     Q_NOTIFICATION_HANDLER(NSWindowWillMoveNotification) void windowWillMove();
     Q_NOTIFICATION_HANDLER(NSWindowDidMoveNotification) void windowDidMove();
     Q_NOTIFICATION_HANDLER(NSWindowDidResizeNotification) void windowDidResize();
+    Q_NOTIFICATION_HANDLER(NSViewFrameDidChangeNotification) void viewDidChangeFrame();
     Q_NOTIFICATION_HANDLER(NSWindowDidEndLiveResizeNotification) void windowDidEndLiveResize();
     Q_NOTIFICATION_HANDLER(NSWindowDidBecomeKeyNotification) void windowDidBecomeKey();
     Q_NOTIFICATION_HANDLER(NSWindowDidResignKeyNotification) void windowDidResignKey();
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index 9e5b52d1f7..524d3f0703 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -362,15 +362,29 @@ static void qRegisterNotificationCallbacks()
         [center addObserverForName:notificationName.toNSString() object:nil queue:nil
             usingBlock:^(NSNotification *notification) {
 
-            NSWindow *window = notification.object;
-
-            // Only top level NSWindows should notify their QNSViews
-            if (window.parentWindow)
+            NSView *view = nullptr;
+            if ([notification.object isKindOfClass:[NSWindow class]]) {
+                NSWindow *window = notification.object;
+                // Only top level NSWindows should notify their QNSViews
+                if (window.parentWindow)
+                    return;
+
+                if (!window.contentView)
+                    return;
+
+                view = window.contentView;
+            } else if ([notification.object isKindOfClass:[NSView class]]) {
+                view = notification.object;
+            } else {
+                qCWarning(lcQpaCocoaWindow) << "Unhandled notifcation"
+                    << notification.name << "for" << notification.object;
                 return;
+            }
+            Q_ASSERT(view);
 
             QCocoaWindow *cocoaWindow = nullptr;
-            if (QNSView *view = qnsview_cast(window.contentView))
-                cocoaWindow = view.platformWindow;
+            if (QNSView *qnsView = qnsview_cast(view))
+                cocoaWindow = qnsView.platformWindow;
 
             // FIXME: Could be a foreign window, look up by iterating top level QWindows
 
@@ -1251,6 +1265,11 @@ void QCocoaWindow::windowDidResize()
     [qnsview_cast(m_view) updateGeometry];
 }
 
+void QCocoaWindow::viewDidChangeFrame()
+{
+    [qnsview_cast(m_view) updateGeometry];
+}
+
 void QCocoaWindow::windowDidEndLiveResize()
 {
     if (m_synchedWindowState == Qt::WindowMaximized && ![m_nsWindow isZoomed]) {
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
index 504db06900..a2971c06b0 100644
--- a/src/plugins/platforms/cocoa/qnsview.mm
+++ b/src/plugins/platforms/cocoa/qnsview.mm
@@ -217,11 +217,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:)