From 80d7253b5881ed7f1e2a175c66f1f3ed57773227 Mon Sep 17 00:00:00 2001 From: Sami Merila Date: Fri, 22 Oct 2010 10:28:06 +0300 Subject: 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 --- src/gui/widgets/qcombobox.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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()); -- cgit v0.12