From 1a86e35709593fcde8bbbbed6b09092f79aa863c Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 6 Jul 2012 14:51:14 +0200 Subject: 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 --- src/plugins/platforms/windows/qwindowswindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) -- cgit v1.2.3