diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-26 14:19:43 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-26 14:19:43 (GMT) |
| commit | e70f1b1b0525e8745ccdc66d397c86c15b942493 (patch) | |
| tree | 8f0d82578e705948fcfa75483cf3e166222de22c /src/gui | |
| parent | 5498dcd7b10e147734a3414cab824b8b435aa3d9 (diff) | |
| parent | 208e8e87d338e8956f4dbb7243a7cc5ec6553f13 (diff) | |
| download | Qt-e70f1b1b0525e8745ccdc66d397c86c15b942493.zip Qt-e70f1b1b0525e8745ccdc66d397c86c15b942493.tar.gz Qt-e70f1b1b0525e8745ccdc66d397c86c15b942493.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QComboBox popup incorrectly opened in Sym^3
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/widgets/qcombobox.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp index 3e5f1b3..dbbf49a 100644 --- a/src/gui/widgets/qcombobox.cpp +++ b/src/gui/widgets/qcombobox.cpp @@ -2476,10 +2476,18 @@ void QComboBox::showPopup() listRect.setWidth(listRect.height()); //by default popup is centered on screen in landscape listRect.moveCenter(screen.center()); - 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()); + if (staConTopRect.IsEmpty()) { + TRect cbaRect = TRect(); + AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EControlPane, cbaRect); + AknLayoutUtils::TAknCbaLocation cbaLocation = AknLayoutUtils::CbaLocation(); + switch (cbaLocation) { + case AknLayoutUtils::EAknCbaLocationRight: + listRect.setRight(screen.right()); + break; + case AknLayoutUtils::EAknCbaLocationLeft: + listRect.setLeft(screen.left()); + break; + } } } #endif |