summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorKarim Pinter <karim.pinter@digia.com>2012-10-17 11:30:31 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-07 08:42:58 (GMT)
commit712ecafd07eae7e5e3bd2ca5f50703debf966a63 (patch)
treeb1b9b9710d257b4da8878a84f45841effc43610e /src/gui
parentfc27933affb49f70a8a5dc93dd7f4b2d105ccdfe (diff)
downloadQt-712ecafd07eae7e5e3bd2ca5f50703debf966a63.zip
Qt-712ecafd07eae7e5e3bd2ca5f50703debf966a63.tar.gz
Qt-712ecafd07eae7e5e3bd2ca5f50703debf966a63.tar.bz2
Fix for fullscreen resolution change on QWS
Fix for QTBUG-27607. Now it handles the setMaxWindowRect for fullscreen widgets. It is called when the resolution changes with QWS. Change-Id: I0fdbb39c55f727b6507fbb14369943dd8b7c2d7e Reviewed-by: Samuli Piippo <samuli.piippo@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/kernel/qapplication_qws.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gui/kernel/qapplication_qws.cpp b/src/gui/kernel/qapplication_qws.cpp
index 3ac3544..a665edc 100644
--- a/src/gui/kernel/qapplication_qws.cpp
+++ b/src/gui/kernel/qapplication_qws.cpp
@@ -258,8 +258,12 @@ void QApplicationPrivate::setMaxWindowRect(const QScreen *screen, int screenNo,
for (int i = 0; i < l.size(); ++i) {
QWidget *w = l.at(i);
QScreen *s = w->d_func()->getScreen();
- if (w->isMaximized() && s == screen)
- w->d_func()->setMaxWindowState_helper();
+ if (s == screen) {
+ if (w->isMaximized())
+ w->d_func()->setMaxWindowState_helper();
+ else if (w->isFullScreen())
+ w->d_func()->setFullScreenSize_helper();
+ }
}
if ( qt_desktopWidget ) // XXX workaround crash