1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't set the resize and move flags when activating fullscreen mode

Browse Source 
This fixes tst_QWidget::movedAndResizedAttributes() for platforms
that don't have support for QPlatformWindow::setWindowState().

Change-Id: Id0f123d11b08a75c0c131080d509e6b23b281600
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
This commit is contained in:
Thomas McGuire 2012-07-10 11:00:36 +02:00 committed by Qt by Nokia
parent 78203ccf80
commit a63c7a9382
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/widgets/kernel/qwidget_qpa.cpp
View File

@ -621,6 +621,9 @@ void QWidget::setWindowState(Qt::WindowStates newstate)
bool supported = windowHandle()->windowState() == newEffectiveState; bool supported = windowHandle()->windowState() == newEffectiveState;
if (!supported) { if (!supported) {
const bool wasResized = testAttribute(Qt::WA_Resized);
const bool wasMoved = testAttribute(Qt::WA_Moved);
// undo the effects of the old emulated state // undo the effects of the old emulated state
if (oldEffectiveState == Qt::WindowFullScreen) { if (oldEffectiveState == Qt::WindowFullScreen) {
setParent(0, d->topData()->savedFlags); setParent(0, d->topData()->savedFlags);
@ -651,6 +654,11 @@ void QWidget::setWindowState(Qt::WindowStates newstate)
setGeometry(r); setGeometry(r);
} }
} }
// setWindowState() is not an explicit move/resize, same as the supported == true
// case
setAttribute(Qt::WA_Resized, wasResized);
setAttribute(Qt::WA_Moved, wasMoved);
} }
} }
data->in_set_window_state = 0; data->in_set_window_state = 0;