aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/material/qquickmaterialstyle.cpp
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2016-02-22 17:03:40 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2016-02-22 16:52:25 +0000
commitfd33c3991418c38075ac39291807d223cc525877 (patch)
tree89c652dcac4185a90d78060ea13fef71baf05893 /src/imports/controls/material/qquickmaterialstyle.cpp
parent119e43db9747ee070c84fc3ffb4c81ee4db35da8 (diff)
Material: tweak the accent color and ripples for the dark theme
In general, the appropriate shade is 200 in the dark theme. Furthermore, reduce the translucency of the ripple in the dark theme to make it better visible. Change-Id: I6060dfbdb2d291eded56ca648e1356d6228e3b25 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'src/imports/controls/material/qquickmaterialstyle.cpp')
-rw-r--r--src/imports/controls/material/qquickmaterialstyle.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp
index c2e43254..57b74d62 100644
--- a/src/imports/controls/material/qquickmaterialstyle.cpp
+++ b/src/imports/controls/material/qquickmaterialstyle.cpp
@@ -622,7 +622,7 @@ QColor QQuickMaterialStyle::accentColor() const
return QColor::fromRgba(m_accent);
if (m_accent > BlueGrey)
return QColor();
- return colors[m_accent][Shade500];
+ return colors[m_accent][m_theme == Light ? Shade500 : Shade200];
}
QColor QQuickMaterialStyle::backgroundColor() const
@@ -732,7 +732,7 @@ QColor QQuickMaterialStyle::checkBoxCheckedRippleColor() const
{
QColor pressColor = accentColor();
// TODO: find out actual value
- pressColor.setAlpha(30);
+ pressColor.setAlpha(m_theme == Light ? 30 : 50);
return pressColor;
}