summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@nokia.com>2010-11-11 12:37:48 (GMT)
committerMorten Johan Sørvig <morten.sorvig@nokia.com>2010-11-11 12:37:48 (GMT)
commit54865d47cfd859a0e84ba8e1bbff3b56c93d4e0d (patch)
tree0b69911cb94612ecf72e7f14d9c097c6b0dcf2bc /src/gui/kernel
parent451c3e973a49c8b467cc865f6d1f4a2c21902dc7 (diff)
downloadQt-54865d47cfd859a0e84ba8e1bbff3b56c93d4e0d.zip
Qt-54865d47cfd859a0e84ba8e1bbff3b56c93d4e0d.tar.gz
Qt-54865d47cfd859a0e84ba8e1bbff3b56c93d4e0d.tar.bz2
Fix restore of maximized window geometry on Windows
Task-number: QTBUG-2064
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qwidget.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 25450ce..cd1c9f0 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -7053,7 +7053,11 @@ bool QWidget::restoreGeometry(const QByteArray &geometry)
if (maximized || fullScreen) {
// set geomerty before setting the window state to make
// sure the window is maximized to the right screen.
+ // Skip on windows: the window is restored into a broken
+ // half-maximized state.
+#ifndef Q_WS_WIN
setGeometry(restoredNormalGeometry);
+#endif
Qt::WindowStates ws = windowState();
if (maximized)
ws |= Qt::WindowMaximized;