AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QWidget/Win: fix restoreGeometry() from fullscreen mode

Browse Source 
When turning off fullscreen mode and restoring the widget's geometry
we must inform the QWindow about the geometry change synchronously.
Otherwise QWidget::geometry() will return the old value.

Using the same technique for the state transition to fullscreen mode
without sending a separate resize event.

Autotest: tst_QWidget::saveRestoreGeometry
Task-number: QTBUG-26421

Change-Id: I869e36cd302d9a94e398f48949ab3cb7ee9cdf51
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Joerg Bornemann 2012-07-09 12:33:36 +02:00 committed by Qt by Nokia
parent 85d664c929
commit af8e318b35
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/platforms/windows/qwindowswindow.cpp
View File

@ -993,7 +993,10 @@ void QWindowsWindow::handleGeometryChange()
{ {
m_data.geometry = geometry_sys(); m_data.geometry = geometry_sys();
QPlatformWindow::setGeometry(m_data.geometry); QPlatformWindow::setGeometry(m_data.geometry);
QWindowSystemInterface::handleGeometryChange(window(), m_data.geometry); if (testFlag(SynchronousGeometryChangeEvent))
QWindowSystemInterface::handleSynchronousGeometryChange(window(), m_data.geometry);
else
QWindowSystemInterface::handleGeometryChange(window(), m_data.geometry);
if (QWindowsContext::verboseEvents || QWindowsContext::verboseWindows) if (QWindowsContext::verboseEvents || QWindowsContext::verboseWindows)
qDebug() << __FUNCTION__ << this << window() << m_data.geometry; qDebug() << __FUNCTION__ << this << window() << m_data.geometry;
@ -1246,7 +1249,11 @@ void QWindowsWindow::setWindowState_sys(Qt::WindowState newState)
UINT swpf = SWP_FRAMECHANGED; UINT swpf = SWP_FRAMECHANGED;
if (newStates & Qt::WindowActive) if (newStates & Qt::WindowActive)
swpf |= SWP_NOACTIVATE; swpf |= SWP_NOACTIVATE;
const bool wasSync = testFlag(SynchronousGeometryChangeEvent);
setFlag(SynchronousGeometryChangeEvent);
SetWindowPos(m_data.hwnd, HWND_TOP, r.left(), r.top(), r.width(), r.height(), swpf); SetWindowPos(m_data.hwnd, HWND_TOP, r.left(), r.top(), r.width(), r.height(), swpf);
if (!wasSync)
clearFlag(SynchronousGeometryChangeEvent);
QWindowSystemInterface::handleSynchronousGeometryChange(window(), r); QWindowSystemInterface::handleSynchronousGeometryChange(window(), r);
} else if (!(newStates & Qt::WindowMinimized)) { } else if (!(newStates & Qt::WindowMinimized)) {
// Restore saved state. // Restore saved state.
@ -1260,8 +1267,12 @@ void QWindowsWindow::setWindowState_sys(Qt::WindowState newState)
swpf |= SWP_NOACTIVATE; swpf |= SWP_NOACTIVATE;
if (!m_savedFrameGeometry.isValid()) if (!m_savedFrameGeometry.isValid())
swpf |= SWP_NOSIZE | SWP_NOMOVE; swpf |= SWP_NOSIZE | SWP_NOMOVE;
const bool wasSync = testFlag(SynchronousGeometryChangeEvent);
setFlag(SynchronousGeometryChangeEvent);
SetWindowPos(m_data.hwnd, 0, m_savedFrameGeometry.x(), m_savedFrameGeometry.y(), SetWindowPos(m_data.hwnd, 0, m_savedFrameGeometry.x(), m_savedFrameGeometry.y(),
m_savedFrameGeometry.width(), m_savedFrameGeometry.height(), swpf); m_savedFrameGeometry.width(), m_savedFrameGeometry.height(), swpf);
if (!wasSync)
clearFlag(SynchronousGeometryChangeEvent);
// preserve maximized state // preserve maximized state
if (visible) if (visible)
ShowWindow(m_data.hwnd, (newStates & Qt::WindowMaximized) ? max : normal); ShowWindow(m_data.hwnd, (newStates & Qt::WindowMaximized) ? max : normal);

3
src/plugins/platforms/windows/qwindowswindow.h
View File

@ -124,7 +124,8 @@ public:
OpenGlPixelFormatInitialized = 0x40, OpenGlPixelFormatInitialized = 0x40,
BlockedByModal = 0x80, BlockedByModal = 0x80,
SizeGripOperation = 0x100, SizeGripOperation = 0x100,
FrameStrutEventsEnabled = 0x200 FrameStrutEventsEnabled = 0x200,
SynchronousGeometryChangeEvent = 0x400
}; };
struct WindowData struct WindowData

3
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
View File

@ -2945,9 +2945,6 @@ void tst_QWidget::saveRestoreGeometry()
QVERIFY(widget.restoreGeometry(savedGeometry)); QVERIFY(widget.restoreGeometry(savedGeometry));
QTest::qWait(120); QTest::qWait(120);
QTRY_VERIFY(!(widget.windowState() & Qt::WindowFullScreen)); QTRY_VERIFY(!(widget.windowState() & Qt::WindowFullScreen));
#ifdef Q_OS_WIN
QEXPECT_FAIL("", "QTBUG-26421", Continue);
#endif
QTRY_COMPARE(widget.geometry(), geom); QTRY_COMPARE(widget.geometry(), geom);
//Restore to full screen //Restore to full screen