diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-09-01 21:42:55 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-09-06 07:59:17 +0000 |
| commit | 7e109cdd105d3d152d4a5c9dba16926e78602a04 (patch) | |
| tree | 15573d8b0161f7e3b25a38891acc4a5ad4e2a616 /src | |
| parent | c4a7bcfa0bd92fdbfca362cd84487433507561c5 (diff) | |
Material: fix popups to respect Material.background
Task-number: QTBUG-55687
Change-Id: I217ad905cc06228a6a1608c0721dc20a31db6d9b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/controls/material/qquickmaterialstyle.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp index 8562cdbb..3676bdbb 100644 --- a/src/imports/controls/material/qquickmaterialstyle.cpp +++ b/src/imports/controls/material/qquickmaterialstyle.cpp @@ -1020,6 +1020,8 @@ QColor QQuickMaterialStyle::scrollBarPressedColor() const QColor QQuickMaterialStyle::dialogColor() const { + if (m_hasBackground) + return backgroundColor(); return QColor::fromRgba(m_theme == Light ? dialogColorLight : dialogColorDark); } @@ -1035,6 +1037,8 @@ QColor QQuickMaterialStyle::listHighlightColor() const QColor QQuickMaterialStyle::tooltipColor() const { + if (m_explicitBackground) + return backgroundColor(); return color(Grey, Shade700); } |