summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@nokia.com>2011-08-24 09:05:27 +0200
committerMorten Johan Sørvig <morten.sorvig@nokia.com>2011-08-24 12:22:43 +0200
commitb6ef26adce2727837488ab6f2d8fcefb5d32ce4d (patch)
tree82ccfdaad43231d985855dadf155ffb5ae28017a /src/plugins/platforms
parent1b2dae36d32bc4d37fa8a12653becd810101f82e (diff)
Preliminary change to get resizeEvents for QWindow::resize() calls
Change-Id: I43e1d7fb98f1b20939dba8cdccffa4dcb99a7369 Reviewed-on: http://codereview.qt.nokia.com/3453 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/plugins/platforms')
-rw-r--r--src/plugins/platforms/cocoa/qcocoawindow.mm5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index eef7f8b160..e594514383 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -100,6 +100,8 @@ QCocoaWindow::QCocoaWindow(QWindow *tlw)
m_windowSurfaceView = m_contentView;
}
+ setGeometry(tlw->geometry());
+
[m_nsWindow setContentView:m_contentView];
}
@@ -112,8 +114,9 @@ void QCocoaWindow::setGeometry(const QRect &rect)
{
QPlatformWindow::setGeometry(rect);
- NSRect bounds = globalGeometry(window()->geometry());
+ NSRect bounds = globalGeometry(rect);
[[m_nsWindow contentView]setFrameSize:bounds.size];
+ [m_nsWindow setContentSize : bounds.size];
[m_nsWindow setFrameOrigin : bounds.origin];
if (m_glContext)