summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qapplication_qws.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/kernel/qapplication_qws.cpp')
-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 3ac3544b40..a665edc360 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