diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2018-10-27 13:23:46 -0400 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-11-08 22:37:44 +0100 |
| commit | 3ec34b3f7ae3ef569fe12e071c10d53fcc014882 (patch) | |
| tree | f01d64f933b2fee7daaec166aa36114384c31f49 | |
| parent | 512da26cd1b8f1451580025ec2e0eeb9ba7c2210 (diff) | |
custom widgets: rework colors and cleanup
Use ColorData for custom widget themes to
make it more readable and consistent.
Renamed and split out colors to be more accurately
named and representative of how they are used.
Fixed a number of inconsistencies in how colors
were used across widgets.
Change-Id: I1cbb5f19223bd55107379b049beccaf1de4e26b2
| -rw-r--r-- | vcl/headless/CustomWidgetDraw.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/headless/CustomWidgetDraw.cxx b/vcl/headless/CustomWidgetDraw.cxx index c428213c6000..38d52dedcfa2 100644 --- a/vcl/headless/CustomWidgetDraw.cxx +++ b/vcl/headless/CustomWidgetDraw.cxx @@ -334,7 +334,7 @@ bool CustomWidgetDraw::updateSettings(AllSettings& rSettings) aStyleSet.SetDialogTextColor(aStyle.maDialogTextColor); aStyleSet.SetWorkspaceColor(Color(0xDF, 0xDF, 0xDE)); aStyleSet.SetMonoColor(Color(COL_BLACK)); - aStyleSet.SetFieldColor(Color(COL_WHITE)); + aStyleSet.SetFieldColor(Color(aStyle.maFaceColor)); aStyleSet.SetFieldTextColor(Color(COL_BLACK)); aStyleSet.SetFieldRolloverTextColor(Color(COL_BLACK)); aStyleSet.SetActiveColor(Color(COL_BLUE)); @@ -349,10 +349,10 @@ bool CustomWidgetDraw::updateSettings(AllSettings& rSettings) aStyleSet.SetMenuBorderColor(Color(COL_LIGHTGRAY)); aStyleSet.SetMenuTextColor(Color(COL_BLACK)); aStyleSet.SetMenuBarTextColor(Color(COL_BLACK)); - aStyleSet.SetMenuBarRolloverTextColor(Color(COL_WHITE)); - aStyleSet.SetMenuBarHighlightTextColor(Color(COL_WHITE)); + aStyleSet.SetMenuBarRolloverTextColor(Color(COL_BLACK)); + aStyleSet.SetMenuBarHighlightTextColor(Color(COL_BLACK)); aStyleSet.SetMenuHighlightColor(aStyle.maHighlightColor); - aStyleSet.SetMenuHighlightTextColor(Color(COL_WHITE)); + aStyleSet.SetMenuHighlightTextColor(Color(COL_BLACK)); aStyleSet.SetHighlightColor(aStyle.maHighlightColor); aStyleSet.SetHighlightTextColor(aStyle.maHighlightTextColor); aStyleSet.SetActiveTabColor(aStyle.maActiveTabColor); |