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_p.h | |
| 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_p.h')
| -rw-r--r-- | src/imports/controls/material/qquickmaterialstyle_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/controls/material/qquickmaterialstyle_p.h b/src/imports/controls/material/qquickmaterialstyle_p.h index 07870f48..fb73b7d7 100644 --- a/src/imports/controls/material/qquickmaterialstyle_p.h +++ b/src/imports/controls/material/qquickmaterialstyle_p.h @@ -104,6 +104,7 @@ class QQuickMaterialStyle : public QQuickStyleAttached Q_PROPERTY(QColor backgroundDimColor READ backgroundDimColor NOTIFY paletteChanged FINAL) Q_PROPERTY(QColor listHighlightColor READ listHighlightColor NOTIFY paletteChanged FINAL) Q_PROPERTY(QColor tooltipColor READ tooltipColor NOTIFY paletteChanged FINAL) + Q_PROPERTY(QColor toolTextColor READ toolTextColor NOTIFY paletteChanged FINAL) public: enum Theme { @@ -231,6 +232,7 @@ public: QColor backgroundDimColor() const; QColor listHighlightColor() const; QColor tooltipColor() const; + QColor toolTextColor() const; Q_INVOKABLE QColor color(Color color, Shade shade = Shade500) const; Q_INVOKABLE QColor shade(const QColor &color, Shade shade) const; |