Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt

1 files changed, 21 insertions, 0 deletions

diff --git a/src/gui/kernel/qcocoawindowdelegate_mac.mm b/src/gui/kernel/qcocoawindowdelegate_mac.mm
index b8be627..1faf068 100644
--- a/src/gui/kernel/qcocoawindowdelegate_mac.mm
+++ b/src/gui/kernel/qcocoawindowdelegate_mac.mm
@@ -48,6 +48,9 @@
 #include <qlayout.h>
 #include <qcoreapplication.h>
 #include <qmenubar.h>
+#include <QMainWindow>
+#include <QToolBar>
+#include <private/qmainwindowlayout_p.h>
 
 QT_BEGIN_NAMESPACE
 extern QWidgetData *qt_qwidget_data(QWidget *); // qwidget.cpp
@@ -215,6 +218,24 @@ static void cleanupCocoaWindowDelegate()
         QWidgetPrivate::qt_mac_update_sizer(qwidget);
         [self syncSizeForWidget:qwidget toSize:newSize fromSize:oldSize];
     }
+
+    // We force the repaint to be synchronized with the resize of the window.
+    // Otherwise, the resize looks sluggish because we paint one event loop later.
+    if ([[window contentView] inLiveResize]) {
+        qwidget->repaint();
+
+        // We need to repaint the toolbar as well.
+        QMainWindow* mWindow = qobject_cast<QMainWindow*>(qwidget->window());
+        if (mWindow) {
+            QMainWindowLayout *mLayout = qobject_cast<QMainWindowLayout*>(mWindow->layout());
+            QList<QToolBar *> toolbarList = mLayout->qtoolbarsInUnifiedToolbarList;
+
+            for (int i = 0; i < toolbarList.size(); ++i) {
+                QToolBar* toolbar = toolbarList.at(i);
+                toolbar->repaint();
+            }
+        }
+    }
 }
 
 - (void)windowDidMove:(NSNotification *)notification