summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qwidget_x11.cpp
diff options
context:
space:
mode:
authormread <qt-info@nokia.com>2009-08-10 13:18:56 (GMT)
committermread <qt-info@nokia.com>2009-08-10 13:18:56 (GMT)
commit34dd8163f4fcd16be5677fc94ce960cc464991d5 (patch)
treef871fef42b4f337a98bce77ad307efe079b7dc5f /src/gui/kernel/qwidget_x11.cpp
parent0dfca6e13a7ad3cce38d5509d446f76eb496f398 (diff)
parent70e098d965318651acb725374b73e026f2946b76 (diff)
downloadQt-34dd8163f4fcd16be5677fc94ce960cc464991d5.zip
Qt-34dd8163f4fcd16be5677fc94ce960cc464991d5.tar.gz
Qt-34dd8163f4fcd16be5677fc94ce960cc464991d5.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/gui/kernel/qwidget_x11.cpp')
-rw-r--r--src/gui/kernel/qwidget_x11.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
index 2bb3626..056e26b 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -512,6 +512,13 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
dialog = popup = false; // force these flags off
data.crect.setRect(0, 0, sw, sh);
} else if (topLevel && !q->testAttribute(Qt::WA_Resized)) {
+ QDesktopWidget *desktopWidget = qApp->desktop();
+ if (desktopWidget->isVirtualDesktop()) {
+ QRect r = desktopWidget->screenGeometry();
+ sw = r.width();
+ sh = r.height();
+ }
+
int width = sw / 2;
int height = 4 * sh / 10;
if (extra) {