diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-09-02 01:15:33 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-09-06 07:59:31 +0000 |
| commit | 058f2dcc6070a9a36f269dd3fff6017c546d0b53 (patch) | |
| tree | 197378f268b04fd54c51504b43d85d1514130618 /src/imports/controls/material/qquickmaterialstyle.cpp | |
| parent | 7e109cdd105d3d152d4a5c9dba16926e78602a04 (diff) | |
Material: fix ToolBar to respect Material.background
Task-number: QTBUG-55687
Change-Id: I815291847bad72ae58b66dc70b510ce11cd88b8d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/material/qquickmaterialstyle.cpp')
| -rw-r--r-- | src/imports/controls/material/qquickmaterialstyle.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp index 3676bdbb..ae8c3a11 100644 --- a/src/imports/controls/material/qquickmaterialstyle.cpp +++ b/src/imports/controls/material/qquickmaterialstyle.cpp @@ -1042,6 +1042,13 @@ QColor QQuickMaterialStyle::tooltipColor() const return color(Grey, Shade700); } +QColor QQuickMaterialStyle::toolBarColor() const +{ + if (m_explicitBackground) + return backgroundColor(); + return primaryColor(); +} + QColor QQuickMaterialStyle::toolTextColor() const { if (m_hasForeground || m_customPrimary) |