Kaydet (Commit) e9f5fce4 authored tarafından Ashod Nakashian's avatar Ashod Nakashian Kaydeden (comit) Jan Holesovsky

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
üst a64bb41e
...@@ -334,7 +334,7 @@ bool CustomWidgetDraw::updateSettings(AllSettings& rSettings) ...@@ -334,7 +334,7 @@ bool CustomWidgetDraw::updateSettings(AllSettings& rSettings)
aStyleSet.SetDialogTextColor(aStyle.maDialogTextColor); aStyleSet.SetDialogTextColor(aStyle.maDialogTextColor);
aStyleSet.SetWorkspaceColor(Color(0xDF, 0xDF, 0xDE)); aStyleSet.SetWorkspaceColor(Color(0xDF, 0xDF, 0xDE));
aStyleSet.SetMonoColor(Color(COL_BLACK)); aStyleSet.SetMonoColor(Color(COL_BLACK));
aStyleSet.SetFieldColor(Color(COL_WHITE)); aStyleSet.SetFieldColor(Color(aStyle.maFaceColor));
aStyleSet.SetFieldTextColor(Color(COL_BLACK)); aStyleSet.SetFieldTextColor(Color(COL_BLACK));
aStyleSet.SetFieldRolloverTextColor(Color(COL_BLACK)); aStyleSet.SetFieldRolloverTextColor(Color(COL_BLACK));
aStyleSet.SetActiveColor(Color(COL_BLUE)); aStyleSet.SetActiveColor(Color(COL_BLUE));
...@@ -349,10 +349,10 @@ bool CustomWidgetDraw::updateSettings(AllSettings& rSettings) ...@@ -349,10 +349,10 @@ bool CustomWidgetDraw::updateSettings(AllSettings& rSettings)
aStyleSet.SetMenuBorderColor(Color(COL_LIGHTGRAY)); aStyleSet.SetMenuBorderColor(Color(COL_LIGHTGRAY));
aStyleSet.SetMenuTextColor(Color(COL_BLACK)); aStyleSet.SetMenuTextColor(Color(COL_BLACK));
aStyleSet.SetMenuBarTextColor(Color(COL_BLACK)); aStyleSet.SetMenuBarTextColor(Color(COL_BLACK));
aStyleSet.SetMenuBarRolloverTextColor(Color(COL_WHITE)); aStyleSet.SetMenuBarRolloverTextColor(Color(COL_BLACK));
aStyleSet.SetMenuBarHighlightTextColor(Color(COL_WHITE)); aStyleSet.SetMenuBarHighlightTextColor(Color(COL_BLACK));
aStyleSet.SetMenuHighlightColor(aStyle.maHighlightColor); aStyleSet.SetMenuHighlightColor(aStyle.maHighlightColor);
aStyleSet.SetMenuHighlightTextColor(Color(COL_WHITE)); aStyleSet.SetMenuHighlightTextColor(Color(COL_BLACK));
aStyleSet.SetHighlightColor(aStyle.maHighlightColor); aStyleSet.SetHighlightColor(aStyle.maHighlightColor);
aStyleSet.SetHighlightTextColor(aStyle.maHighlightTextColor); aStyleSet.SetHighlightTextColor(aStyle.maHighlightTextColor);
aStyleSet.SetActiveTabColor(aStyle.maActiveTabColor); aStyleSet.SetActiveTabColor(aStyle.maActiveTabColor);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment