Cocoa: don't call non-existent NSWindow setFrameSize
authorBradley T. Hughes <bradley.hughes@nokia.com>
Wed, 21 Mar 2012 09:39:39 +0000 (10:39 +0100)
committerQt by Nokia <qt-info@nokia.com>
Fri, 30 Mar 2012 10:19:22 +0000 (12:19 +0200)
Commit 140579cb3ef676aa3a7c3fc322ddfcc6ec1b70f2 changed a setFrame call
in propagateSizeHints() to setFrameSize, which doesn't exist in
NSWindow. Change it back to setFrame.

Spotted due to this objc warning:

qcocoawindow.mm:232:9: warning: instance method '-setFrameSize:display:'
      not found (return type defaults to 'id')
     [m_nsWindow setFrameSize : NSMakeSize(baseSize.width(),...
     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~...

Change-Id: Ieb7e022694ced7e59c07fdd2fc53048dab1e93c7
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
src/plugins/platforms/cocoa/qcocoawindow.mm

index 5229481..310317c 100644 (file)
@@ -231,9 +231,10 @@ void QCocoaWindow::propagateSizeHints()
     if (!window()->sizeIncrement().isNull())
         [m_nsWindow setResizeIncrements : qt_mac_toNSSize(window()->sizeIncrement())];
 
+    QRect rect = geometry();
     QSize baseSize = window()->baseSize();
     if (!baseSize.isNull() && baseSize.isValid()) {
-        [m_nsWindow setFrameSize : NSMakeSize(baseSize.width(), baseSize.height()) display : YES];
+        [m_nsWindow setFrame:NSMakeRect(rect.x(), rect.y(), baseSize.width(), baseSize.height()) display:YES];
     }
 }