diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-05-09 09:39:21 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-05-09 13:01:39 +0000 |
commit | 43b02ebb9687917082538f26ba321dc9c615d2fd (patch) | |
tree | 35c8129f77adf2afd52f520842b0487df81bca26 /src/imports/controls/material/qquickmaterialstyle.cpp | |
parent | 71b9ec9d4a97e3eb2e7ec8e2fea79622652be495 (diff) |
Material: set correct ToolBar foreground color for built-in primaries
When the primary color is one of the predefined values, we can choose
the appropriate light or dark foreground color according to:
https://www.google.com/design/spec/style/color.html#color-color-palette
Change-Id: I2a25211ec3bc091211ce58b809089acaa32cb960
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Nikita Krupenko <krnekit@gmail.com>
Diffstat (limited to 'src/imports/controls/material/qquickmaterialstyle.cpp')
-rw-r--r-- | src/imports/controls/material/qquickmaterialstyle.cpp | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp index 8c67c6d1..b80fc729 100644 --- a/src/imports/controls/material/qquickmaterialstyle.cpp +++ b/src/imports/controls/material/qquickmaterialstyle.cpp @@ -1023,6 +1023,42 @@ QColor QQuickMaterialStyle::tooltipColor() const return color(Grey, Shade700); } +QColor QQuickMaterialStyle::toolTextColor() const +{ + if (m_hasForeground || m_customPrimary) + return primaryTextColor(); + + switch (m_primary) { + case Red: + case Pink: + case Purple: + case DeepPurple: + case Indigo: + case Blue: + case Teal: + case DeepOrange: + case Brown: + case BlueGrey: + return QColor::fromRgba(primaryTextColorDark); + + case LightBlue: + case Cyan: + case Green: + case LightGreen: + case Lime: + case Yellow: + case Amber: + case Orange: + case Grey: + return QColor::fromRgba(primaryTextColorLight); + + default: + break; + } + + return primaryTextColor(); +} + QColor QQuickMaterialStyle::color(QQuickMaterialStyle::Color color, QQuickMaterialStyle::Shade shade) const { int count = sizeof(colors) / sizeof(colors[0]); |