diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2012-07-06 14:51:14 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-09 10:50:29 +0200 |
| commit | 1a86e35709593fcde8bbbbed6b09092f79aa863c (patch) | |
| tree | d474b696afeb5f6e73bfae0999ef54b411b17cf3 | |
| parent | a2bd91c5e96146fb2211d21e06071a1c21cf030c (diff) | |
QWindowsWindow: fix state transition FullScreen -> Minimized
When going from FullScreen to Minimized we must not restore the window's
saved geometry.
Task-number: QTBUG-26420
Change-Id: I75af8bb9aeb38f5bc24bc4e0b725786c8c22fdb3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| -rw-r--r-- | src/plugins/platforms/windows/qwindowswindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp index 0593778635..d6d12865b4 100644 --- a/src/plugins/platforms/windows/qwindowswindow.cpp +++ b/src/plugins/platforms/windows/qwindowswindow.cpp @@ -1251,7 +1251,7 @@ void QWindowsWindow::setWindowState_sys(Qt::WindowState newState) swpf |= SWP_NOACTIVATE; SetWindowPos(m_data.hwnd, HWND_TOP, r.left(), r.top(), r.width(), r.height(), swpf); QWindowSystemInterface::handleSynchronousGeometryChange(window(), r); - } else { + } else if (!(newStates & Qt::WindowMinimized)) { // Restore saved state. unsigned newStyle = m_savedStyle ? m_savedStyle : style(); if (visible) |