whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QComboBox: use native popup on iOS 

Enable native popup on iOS as well as OS X

Change-Id: If99180a017768d9c94241adf2282ee9b3f69cbc1
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
bb10
Richard Moe Gustavsen 2015-03-12 13:59:42 +01:00
parent a776a03e75
commit 713e5e2914
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/widgets/widgets/qcombobox.cpp
View File

@ -93,7 +93,7 @@ QComboBoxPrivate::QComboBoxPrivate()
hoverControl(QStyle::SC_None),
autoCompletionCaseSensitivity(Qt::CaseInsensitive),
indexBeforeChange(-1)
#ifdef Q_OS_OSX
#ifdef Q_OS_MAC
, m_platformMenu(0)
#endif
#ifndef QT_NO_COMPLETER
@ -104,7 +104,7 @@ QComboBoxPrivate::QComboBoxPrivate()
QComboBoxPrivate::~QComboBoxPrivate()
{
#ifdef Q_OS_OSX
#ifdef Q_OS_MAC
cleanupNativePopup();
#endif
}
@ -2408,7 +2408,7 @@ QSize QComboBox::sizeHint() const
return d->recomputeSizeHint(d->sizeHint);
}
#ifdef Q_OS_OSX
#ifdef Q_OS_MAC
namespace {
struct IndexSetter {
@ -2519,7 +2519,7 @@ void QComboBox::showPopup()
initStyleOption(&opt);
const bool usePopup = style->styleHint(QStyle::SH_ComboBox_Popup, &opt, this);
#ifdef Q_OS_OSX
#ifdef Q_OS_MAC
if (usePopup
&& (!d->container
|| (view()->metaObject()->className() == QByteArray("QComboBoxListView")
@ -2527,7 +2527,7 @@ void QComboBox::showPopup()
&& style->styleHint(QStyle::SH_ComboBox_UseNativePopup, &opt, this)
&& d->showNativePopup())
return;
#endif // Q_OS_OSX
#endif // Q_OS_MAC
#ifdef QT_KEYPAD_NAVIGATION
#ifndef QT_NO_COMPLETER

4
src/widgets/widgets/qcombobox_p.h
View File

@ -373,7 +373,7 @@ public:
void updateViewContainerPaletteAndOpacity();
void updateFocusPolicy();
#ifdef Q_OS_OSX
#ifdef Q_OS_MAC
void cleanupNativePopup();
bool showNativePopup();
#endif
@ -403,7 +403,7 @@ public:
QPersistentModelIndex root;
Qt::CaseSensitivity autoCompletionCaseSensitivity;
int indexBeforeChange;
#ifdef Q_OS_OSX
#ifdef Q_OS_MAC
QPlatformMenu *m_platformMenu;
#endif
#ifndef QT_NO_COMPLETER