summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorSami Merila <sami.merila@nokia.com>2010-10-22 07:28:06 (GMT)
committerSami Merila <sami.merila@nokia.com>2010-10-22 07:28:06 (GMT)
commit80d7253b5881ed7f1e2a175c66f1f3ed57773227 (patch)
tree8da1e4d7689f55a165701caa926465e73a666066 /src/gui
parent4dc810be62a26efceaea827ce8d979aceadfbe48 (diff)
downloadQt-80d7253b5881ed7f1e2a175c66f1f3ed57773227.zip
Qt-80d7253b5881ed7f1e2a175c66f1f3ed57773227.tar.gz
Qt-80d7253b5881ed7f1e2a175c66f1f3ed57773227.tar.bz2
QComboBox popup is shown in incorrect location with bottom CBA
If native side uses "bottom softkeys" with landscape orientation, QComboBox's popup should be shown above softkeys and centered. Currently it is shown above softkeys and on right border. Task-number: QT-4174 Reviewed-by: mread
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/widgets/qcombobox.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp
index 96d2acd..7859bdc 100644
--- a/src/gui/widgets/qcombobox.cpp
+++ b/src/gui/widgets/qcombobox.cpp
@@ -2476,7 +2476,7 @@ void QComboBox::showPopup()
listRect.setWidth(listRect.height());
//by default popup is centered on screen in landscape
listRect.moveCenter(screen.center());
- if (staConTopRect.IsEmpty()) {
+ if (staConTopRect.IsEmpty() && AknLayoutUtils::CbaLocation() != AknLayoutUtils::EAknCbaLocationBottom) {
// landscape without stacon, menu should be at the right
(opt.direction == Qt::LeftToRight) ? listRect.setRight(screen.right()) :
listRect.setLeft(screen.left());