aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/material/qquickmaterialstyle.cpp
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-11-26 18:02:15 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-12-04 07:55:39 +0000
commit4ecb85d4468782378c091e42d5733a976a3e0307 (patch)
tree19b2dd4df95fad193ec5691a8cef1c7abb90bc27 /src/imports/controls/material/qquickmaterialstyle.cpp
parent7dd751c0ad4d8a4c1f4827cc9ae587f69d48807e (diff)
Add ComboBox
Change-Id: I4cfc2367db92786097a1ce66bd4b5a2f71322a2e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/material/qquickmaterialstyle.cpp')
-rw-r--r--src/imports/controls/material/qquickmaterialstyle.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp
index a3d2329a..bce5db21 100644
--- a/src/imports/controls/material/qquickmaterialstyle.cpp
+++ b/src/imports/controls/material/qquickmaterialstyle.cpp
@@ -724,6 +724,11 @@ QColor QQuickMaterialStyle::drawerBackgroundColor() const
return dividerTextColorLight;
}
+QColor QQuickMaterialStyle::comboBoxColor() const
+{
+ return m_theme == Light ? "#ffffff" : backgroundColorDark;
+}
+
QColor QQuickMaterialStyle::color(QQuickMaterialStyle::Color color, QQuickMaterialStyle::Shade shade) const
{
int count = sizeof(colors) / sizeof(colors[0]);