diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-11-22 13:40:30 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-11-22 13:40:30 (GMT) |
| commit | dd8ae3d39b9181bebcba6ea60fb9edc2aea0a4e2 (patch) | |
| tree | d238497b25df4a72ec834dad86aaf76d37898a0e /src/gui | |
| parent | 718dc1e87de2cb991e4000e480ea61bf5d559e62 (diff) | |
| download | Qt-dd8ae3d39b9181bebcba6ea60fb9edc2aea0a4e2.zip Qt-dd8ae3d39b9181bebcba6ea60fb9edc2aea0a4e2.tar.gz Qt-dd8ae3d39b9181bebcba6ea60fb9edc2aea0a4e2.tar.bz2 | |
Revert "Resolve two save/restore geometry issues on X11."
This reverts commit 3b80b70d1464320aee2b38ddeb1ec0d257f6bd1c.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 6bc699c..cd1c9f0 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -7066,8 +7066,13 @@ bool QWidget::restoreGeometry(const QByteArray &geometry) setWindowState(ws); d_func()->topData()->normalGeometry = restoredNormalGeometry; } else { + QPoint offset; +#ifdef Q_WS_X11 + if (isFullScreen()) + offset = d_func()->topData()->fullScreenOffset; +#endif setWindowState(windowState() & ~(Qt::WindowMaximized | Qt::WindowFullScreen)); - move(restoredFrameGeometry.topLeft()); + move(restoredFrameGeometry.topLeft() + offset); resize(restoredNormalGeometry.size()); } return true; |