diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-09-06 18:52:28 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-09-06 20:27:00 +0200 |
| commit | 86180aed5008779b1b94731d9b4c6b1fdac8f3d3 (patch) | |
| tree | c1c4ac6daa87042196fa66a92ea56737930c0920 /src/imports/controls/material/qquickmaterialstyle.cpp | |
| parent | 9a55b34e292c725a4fa394a71e0a3d851e4e488f (diff) | |
| parent | 9ae57848671419b2622e254af8642fef7b1b7c33 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: Ief98cd56abd13cfa4e30578e150207462a8243b8
Diffstat (limited to 'src/imports/controls/material/qquickmaterialstyle.cpp')
| -rw-r--r-- | src/imports/controls/material/qquickmaterialstyle.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp index e412ea12..0e9f31df 100644 --- a/src/imports/controls/material/qquickmaterialstyle.cpp +++ b/src/imports/controls/material/qquickmaterialstyle.cpp @@ -953,9 +953,9 @@ QColor QQuickMaterialStyle::scrollBarPressedColor() const QColor QQuickMaterialStyle::dialogColor() const { - if (!m_hasBackground) - return QColor::fromRgba(m_theme == Light ? dialogColorLight : dialogColorDark); - return backgroundColor(); + if (m_hasBackground) + return backgroundColor(); + return QColor::fromRgba(m_theme == Light ? dialogColorLight : dialogColorDark); } QColor QQuickMaterialStyle::backgroundDimColor() const @@ -970,9 +970,18 @@ QColor QQuickMaterialStyle::listHighlightColor() const QColor QQuickMaterialStyle::tooltipColor() const { + if (m_explicitBackground) + return backgroundColor(); return color(Grey, Shade700); } +QColor QQuickMaterialStyle::toolBarColor() const +{ + if (m_explicitBackground) + return backgroundColor(); + return primaryColor(); +} + QColor QQuickMaterialStyle::toolTextColor() const { if (m_hasForeground || m_customPrimary) |