diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-11-17 13:04:58 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-11-17 13:07:26 +0000 |
| commit | b79cf88a048e5d8c784c97d99155104aef3d5dca (patch) | |
| tree | 88532121bba991ab9a924f4dda6834ec60b7731c /vcl/source/app/settings.cxx | |
| parent | 46f544fa4b9ce43d3c44be1f12ff0d85d12bdb0e (diff) | |
Resolves: tdf#87960 add and use a ToolFontColor for toolbar item entries
instead of using the MenuBar text color, cause for Ambiance theme the
menubar is dark and its font is light, while the toolbars can be light,
so light font on light bg appears greyed out
Change-Id: I0fa4ab8eabdd3cd69eb682e5ddba8314b8c9ff0f
Diffstat (limited to 'vcl/source/app/settings.cxx')
| -rw-r--r-- | vcl/source/app/settings.cxx | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 215a9e1a9232..d9dbe571081d 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -132,6 +132,7 @@ struct ImplStyleData Color maRadioCheckTextColor; Color maShadowColor; Color maVisitedLinkColor; + Color maToolTextColor; Color maWindowColor; Color maWindowTextColor; Color maWorkspaceColor; @@ -602,6 +603,7 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) : maRadioCheckTextColor( rData.maRadioCheckTextColor ), maShadowColor( rData.maShadowColor ), maVisitedLinkColor( rData.maVisitedLinkColor ), + maToolTextColor( rData.maToolTextColor ), maWindowColor( rData.maWindowColor ), maWindowTextColor( rData.maWindowTextColor ), maWorkspaceColor( rData.maWorkspaceColor ), @@ -745,6 +747,7 @@ void ImplStyleData::SetStandardStyles() maHelpTextColor = Color( COL_BLACK ); maLinkColor = Color( COL_BLUE ); maVisitedLinkColor = Color( 0x00, 0x00, 0xCC ); + maToolTextColor = Color( COL_BLACK ); maHighlightLinkColor = Color( COL_LIGHTBLUE ); maFontColor = Color( COL_BLACK ); maAlternatingRowColor = Color( 0xEE, 0xEE, 0xEE ); @@ -1358,6 +1361,19 @@ StyleSettings::GetVisitedLinkColor() const return mxData->maVisitedLinkColor; } +void +StyleSettings::SetToolTextColor( const Color& rColor ) +{ + CopyData(); + mxData->maToolTextColor = rColor; +} + +const Color& +StyleSettings::GetToolTextColor() const +{ + return mxData->maToolTextColor; +} + const Color& StyleSettings::GetHighlightLinkColor() const { @@ -2322,6 +2338,7 @@ bool StyleSettings::operator ==( const StyleSettings& rSet ) const (mxData->maHelpTextColor == rSet.mxData->maHelpTextColor) && (mxData->maLinkColor == rSet.mxData->maLinkColor) && (mxData->maVisitedLinkColor == rSet.mxData->maVisitedLinkColor) && + (mxData->maToolTextColor == rSet.mxData->maToolTextColor) && (mxData->maHighlightLinkColor == rSet.mxData->maHighlightLinkColor) && (mxData->maAppFont == rSet.mxData->maAppFont) && (mxData->maHelpFont == rSet.mxData->maHelpFont) && |