summaryrefslogtreecommitdiffstats
path: root/src/gui/dialogs
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-01-07 15:01:58 (GMT)
committeraxis <qt-info@nokia.com>2010-01-08 15:11:27 (GMT)
commit4a84b272459160780529f654e6aee3abf8569b51 (patch)
tree766aaa2c34e0e7a9014971e6f59658ff2291b848 /src/gui/dialogs
parent07b484b7c4685cfc2187be840a01e15f0fe08ff5 (diff)
downloadQt-4a84b272459160780529f654e6aee3abf8569b51.zip
Qt-4a84b272459160780529f654e6aee3abf8569b51.tar.gz
Qt-4a84b272459160780529f654e6aee3abf8569b51.tar.bz2
Added a flag to avoid construction of application panes.
This is purely an optimization for fullscreen-only apps. Task: QTBUG-6098 RevBy: Jason Barron RevBy: mread AutoTest: Included
Diffstat (limited to 'src/gui/dialogs')
-rw-r--r--src/gui/dialogs/qdialog.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/gui/dialogs/qdialog.cpp b/src/gui/dialogs/qdialog.cpp
index ed2d676..d7653e5 100644
--- a/src/gui/dialogs/qdialog.cpp
+++ b/src/gui/dialogs/qdialog.cpp
@@ -888,7 +888,14 @@ bool QDialog::s60AdjustedPosition()
if (doS60Positioning) {
// naive way to deduce screen orientation
if (S60->screenHeightInPixels > S60->screenWidthInPixels) {
- p.setY(S60->screenHeightInPixels-height()-qt_TSize2QSize(S60->buttonGroupContainer()->Size()).height());
+ int cbaHeight;
+ const CEikButtonGroupContainer* bgContainer = S60->buttonGroupContainer();
+ if (!bgContainer) {
+ cbaHeight = 0;
+ } else {
+ cbaHeight = qt_TSize2QSize(bgContainer->Size()).height();
+ }
+ p.setY(S60->screenHeightInPixels-height()-cbaHeight);
p.setX(0);
} else {
const int scrollbarWidth = style()->pixelMetric(QStyle::PM_ScrollBarExtent);