diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2012-07-06 14:45:07 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-09 10:50:25 +0200 |
| commit | 84e84b507cd6c1bf40cdc52429e38323dc1a4205 (patch) | |
| tree | 324b28843ac4c1f2d1962c4544a7a7d05a61e724 /src | |
| parent | 77b293d2ff5ae859535c890cd2a5ee8cda0757d1 (diff) | |
fix fullscreen state in QWidgetWindow::handleWindowStateChangedEvent
A widget can be Qt::WindowMaximized and Qt::WindowFullScreen at the same
time. See tst_qwidget::windowState.
Task-number: QTBUG-26420
Change-Id: I89d6edb857f41cda911152244cf23d36dfd1cdce
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/kernel/qwidgetwindow.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp index 1b076d1801..10de176834 100644 --- a/src/widgets/kernel/qwidgetwindow.cpp +++ b/src/widgets/kernel/qwidgetwindow.cpp @@ -526,14 +526,12 @@ void QWidgetWindow::handleWindowStateChangedEvent(QWindowStateChangeEvent *event if (effectiveState(widgetState) == Qt::WindowNoState) if (QTLWExtra *tle = m_widget->d_func()->maybeTopData()) tle->normalGeometry = m_widget->geometry(); - widgetState &= ~Qt::WindowFullScreen; widgetState |= Qt::WindowMaximized; break; case Qt::WindowFullScreen: if (effectiveState(widgetState) == Qt::WindowNoState) if (QTLWExtra *tle = m_widget->d_func()->maybeTopData()) tle->normalGeometry = m_widget->geometry(); - widgetState &= ~Qt::WindowMaximized; widgetState |= Qt::WindowFullScreen; break; case Qt::WindowActive: // Not handled by QWindow |