diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-23 16:04:49 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-30 11:44:17 (GMT) |
| commit | 5c488b7e15dbd5ee08a909e4dcc997a58ba63a2d (patch) | |
| tree | 1575ff2260a04a6a5d6c16e19ceae33bfab86505 /src/gui/widgets/qcombobox.cpp | |
| parent | 14fcc4890cf41c17e69853ca7cafd14c947ba7b1 (diff) | |
| download | Qt-5c488b7e15dbd5ee08a909e4dcc997a58ba63a2d.zip Qt-5c488b7e15dbd5ee08a909e4dcc997a58ba63a2d.tar.gz Qt-5c488b7e15dbd5ee08a909e4dcc997a58ba63a2d.tar.bz2 | |
Adjust documentation on QCombobox::maxVisibleItems to mention that this does not work with gtk.
Also fixed the fact that it would show one item to many.
Task-number: QTBUG-760
Reviewed-by: jbache
Diffstat (limited to 'src/gui/widgets/qcombobox.cpp')
| -rw-r--r-- | src/gui/widgets/qcombobox.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp index bd1d8ba..ea65a40 100644 --- a/src/gui/widgets/qcombobox.cpp +++ b/src/gui/widgets/qcombobox.cpp @@ -1265,7 +1265,8 @@ QComboBox::~QComboBox() By default, this property has a value of 10. - \note This property is ignored for non-editable comboboxes in Mac style. + \note This property is ignored for non-editable comboboxes in styles that returns + false for QStyle::SH_ComboBox_Popup such as the Mac style or the Gtk+ Style. */ int QComboBox::maxVisibleItems() const { @@ -2345,7 +2346,7 @@ void QComboBox::showPopup() toCheck.push(idx); #endif ++count; - if (!usePopup && count > d->maxVisibleItems) { + if (!usePopup && count >= d->maxVisibleItems) { toCheck.clear(); break; } |