From 84e84b507cd6c1bf40cdc52429e38323dc1a4205 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 6 Jul 2012 14:45:07 +0200 Subject: 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 --- src/widgets/kernel/qwidgetwindow.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src') 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 -- cgit v1.2.3