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

Fix showNormal() and friends for platforms with fullscreen hint

Browse Source 
Don't call show() inside of QWidget, as that might make the window
fullscreen due to QStyleHints::showIsFullScreen().

This regression was introduced earlier when QWidget::show() gained
support for the hint. No auto test caught the problem, as the
affected platforms (EGL and QNX) are not CI-tested.

Change-Id: I647c2362ac5b53ced562f1d77848552cc122fba0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Thomas McGuire 2012-07-10 09:06:11 +02:00 committed by Qt by Nokia
parent b1909fe118
commit b9bb115972
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widgets/kernel/qwidget.cpp
View File

@ -2664,7 +2664,7 @@ void QWidget::showMinimized()
if (!isMin)
setWindowState((windowState() & ~Qt::WindowActive) | Qt::WindowMinimized);
show();
setVisible(true);
}
/*!
@ -2835,7 +2835,7 @@ void QWidget::showMaximized()
}
}
#endif // Q_WS_MAC
show();
setVisible(true);
}
/*!
@ -2864,7 +2864,7 @@ void QWidget::showNormal()
}
}
#endif // Q_WS_MAC
show();
setVisible(true);
}
/*!

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

@ -656,7 +656,7 @@ void QWidget::setWindowState(Qt::WindowStates newstate)
data->in_set_window_state = 0;
if (needShow)
show();
setVisible(true);
if (newstate & Qt::WindowActive)
activateWindow();