diff options
| -rw-r--r-- | src/plugins/platforms/windows/qwindowswindow.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp index d6d12865b4..4be743aaf0 100644 --- a/src/plugins/platforms/windows/qwindowswindow.cpp +++ b/src/plugins/platforms/windows/qwindowswindow.cpp @@ -1237,8 +1237,17 @@ void QWindowsWindow::setWindowState_sys(Qt::WindowState newState) // Save geometry and style to be restored when fullscreen // is turned off again, since on Windows, it is not a real // Window state but emulated by changing geometry and style. - m_savedStyle = style(); - m_savedFrameGeometry = frameGeometry_sys(); + if (!m_savedStyle) { + m_savedStyle = style(); + if (oldStates & Qt::WindowMinimized) { + WINDOWPLACEMENT wp; + wp.length = sizeof(WINDOWPLACEMENT); + if (GetWindowPlacement(m_data.hwnd, &wp)) + m_savedFrameGeometry = qrectFromRECT(wp.rcNormalPosition); + } else { + m_savedFrameGeometry = frameGeometry_sys(); + } + } if (m_savedStyle & WS_SYSMENU) newStyle |= WS_SYSMENU; if (visible) |