diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-08-09 13:42:56 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-08-11 07:21:26 +0000 |
| commit | 0bf6a3f4255c2e082db1f84de19034f05c48ce56 (patch) | |
| tree | 249c285f319ceb85ffe6ac38f5cd7b3808c0009c /src/imports/controls/material/qquickmaterialstyle.cpp | |
| parent | 038a0c308a03977d3694e16b31c1cf7c7e1a5611 (diff) | |
Add ComboBox::flat
[ChangeLog][ComboBox] Added a flat property that provides more suitable
looks for using ComboBox in a ToolBar.
Task-number: QTBUG-54935
Change-Id: Id458a078486aeac5d542a57f3ed247d63d25e95c
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/material/qquickmaterialstyle.cpp')
| -rw-r--r-- | src/imports/controls/material/qquickmaterialstyle.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp index a166e729..d71545b7 100644 --- a/src/imports/controls/material/qquickmaterialstyle.cpp +++ b/src/imports/controls/material/qquickmaterialstyle.cpp @@ -948,7 +948,9 @@ QColor QQuickMaterialStyle::drawerBackgroundColor() const QColor QQuickMaterialStyle::dialogColor() const { - return QColor::fromRgba(m_theme == Light ? dialogColorLight : dialogColorDark); + if (!m_hasBackground) + return QColor::fromRgba(m_theme == Light ? dialogColorLight : dialogColorDark); + return backgroundColor(); } QColor QQuickMaterialStyle::backgroundDimColor() const |