diff options
| author | Sami Merila <sami.merila@nokia.com> | 2011-03-25 11:05:00 (GMT) |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2011-03-25 11:05:00 (GMT) |
| commit | 9d1a8d385798dc9bfe0cd7f3818846874d17574d (patch) | |
| tree | 9aad76e99df595befa9127e481180860214554dd /src/gui/widgets | |
| parent | c8a8a54d77b82b142f751d84175e010995abfa97 (diff) | |
| download | Qt-9d1a8d385798dc9bfe0cd7f3818846874d17574d.zip Qt-9d1a8d385798dc9bfe0cd7f3818846874d17574d.tar.gz Qt-9d1a8d385798dc9bfe0cd7f3818846874d17574d.tar.bz2 | |
Symbian: QComboBox popup Listbox size is not adjusted
Don't stretch the combobox menu across the minimum screen dimension,
but respect the values given by the application.
Task-number: QTBUG-12714
Reviewed-by: Dmitry Trofimov
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qcombobox.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp index dbbf49a..59b9750 100644 --- a/src/gui/widgets/qcombobox.cpp +++ b/src/gui/widgets/qcombobox.cpp @@ -2453,12 +2453,7 @@ void QComboBox::showPopup() // available screen geometry.This may override the vertical position, but it is more // important to show as much as possible of the popup. const int height = !boundToScreen ? listRect.height() : qMin(listRect.height(), screen.height()); -#ifdef Q_WS_S60 - //popup needs to be stretched with screen minimum dimension - listRect.setHeight(qMin(screen.height(), screen.width())); -#else listRect.setHeight(height); -#endif if (boundToScreen) { if (listRect.top() < screen.top()) |