summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabriel de Dietrich <gabriel.dedietrich@digia.com>2014-04-04 14:08:45 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-07 17:33:51 +0200
commit1a4fc0a129e330b9d80f87cb3e16ffe3b2968fab (patch)
treeffc057e2acfe93a3b30e39790fb6267f272de67e
parentabbdb4d98d13e78cf47cca3c1d6a049770c57750 (diff)
QStyle: Add new SH_ComboBox_UseNativePopup style hint
If the style hints it, QComboBox::showPopup() will try to show a native popup instead. This is currently undocumented and an opt-in feature (typically by using a proxy style). Works only on Mac so far. Task-number: QTBUG-32731 Change-Id: I4447e884cbd6b490f3039c7a95168698c0bed16e Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
-rw-r--r--src/widgets/styles/qstyle.cpp3
-rw-r--r--src/widgets/styles/qstyle.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp
index d244c10316..4c5c7cd17e 100644
--- a/src/widgets/styles/qstyle.cpp
+++ b/src/widgets/styles/qstyle.cpp
@@ -1750,6 +1750,9 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
\value SH_ComboBox_Popup Allows popups as a combobox drop-down
menu.
+ \omitvalue SH_ComboBox_UseNativePopup Whether we should use a native popup.
+ Only supported for non-editable combo boxes on Mac OS X so far.
+
\value SH_Workspace_FillSpaceOnMaximize The workspace should
maximize the client area.
diff --git a/src/widgets/styles/qstyle.h b/src/widgets/styles/qstyle.h
index 04112169ca..136daa9abd 100644
--- a/src/widgets/styles/qstyle.h
+++ b/src/widgets/styles/qstyle.h
@@ -702,6 +702,7 @@ public:
SH_ToolTip_FallAsleepDelay,
SH_Widget_Animate,
SH_Splitter_OpaqueResize,
+ SH_ComboBox_UseNativePopup,
// Add new style hint values here
SH_CustomBase = 0xf0000000