Cocoa: remove 'double' content view from window, second try

Up til now, we always used to create a new NSView for a top
level widget, and make it a child of the windows content view.
This is/should be unnecessary, as NSWindow has a method for
setting the content view directly, thereby allowing for reducing
the stacking level with one view. Not the biggest gain if the
year, but it seems effortless to implement. And I do it as
a part of Alien preparation.

Rev-By: msorvig

2 files changed, 17 insertions, 19 deletions

diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index 4953c48..86c4025 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -473,7 +473,7 @@ static int qCocoaViewCount = 0;
     }
 
     // Make sure the opengl context is updated on resize.
-    if (qwidgetprivate && qwidgetprivate->isGLWidget) {
+    if (qwidgetprivate && qwidgetprivate->isGLWidget && [self window]) {
         qwidgetprivate->needWindowChange = true;
         QEvent event(QEvent::MacGLWindowChange);
         qApp->sendEvent(qwidget, &event);
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm
index 5bb3f1c..6df9c3b 100644
--- a/src/gui/kernel/qwidget_mac.mm
+++ b/src/gui/kernel/qwidget_mac.mm
@@ -239,6 +239,9 @@ static NSDrawer *qt_mac_drawer_for(const QWidget *widget)
 static void qt_mac_destructView(OSViewRef view)
 {
 #ifdef QT_MAC_USE_COCOA
+    NSWindow *window = [view window];
+    if ([window contentView] == view)
+        [window setContentView:[[NSView alloc] initWithFrame:[view bounds]]];
     [view removeFromSuperview];
     [view release];
 #else
@@ -2287,28 +2290,23 @@ void QWidgetPrivate::finishCreateWindow_sys_Cocoa(void * /*NSWindow * */ voidWin
     Q_UNUSED(dialog);
 
     data.fstrut_dirty = true; // when we create a toplevel widget, the frame strut should be dirty
+
     OSViewRef nsview = (OSViewRef)data.winid;
-    OSViewRef window_contentview = qt_mac_get_contentview_for(windowRef);
     if (!nsview) {
-        nsview = qt_mac_create_widget(q, this, window_contentview);
+        nsview = qt_mac_create_widget(q, this, 0);
         setWinId(WId(nsview));
-    } else {
-        [window_contentview addSubview:nsview];
-    }
-    if (nsview) {
-        NSRect bounds = [window_contentview bounds];
-        [nsview setFrame:bounds];
-        [nsview setHidden:NO];
-        if (q->testAttribute(Qt::WA_DropSiteRegistered))
-            registerDropSite(true);
-        transferChildren();
-
-        // Tell Cocoa explicit that we wan't the view to receive key events
-        // (regardless of focus policy) because this is how it works on other
-        // platforms (and in the carbon port):
-        if (!qApp->focusWidget())
-            [windowRef makeFirstResponder:nsview];
     }
+    [windowRef setContentView:nsview];
+    [nsview setHidden:NO];
+    if (q->testAttribute(Qt::WA_DropSiteRegistered))
+        registerDropSite(true);
+    transferChildren();
+
+    // Tell Cocoa explicit that we wan't the view to receive key events
+    // (regardless of focus policy) because this is how it works on other
+    // platforms (and in the carbon port):
+    if (!qApp->focusWidget())
+        [windowRef makeFirstResponder:nsview];
 
     if (topExtra->posFromMove) {
         updateFrameStrut();