mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

widget theme: add new action button stylesettings to xml def.

Browse Source 
This adds new action button stylesettings to the xml def. parser
and adds the defeinitions to iOS theme.

Change-Id: If500d0a7a4633b3c7b90b14b6f62c320ef4b1c12
Reviewed-on: https://gerrit.libreoffice.org/82381
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
This commit is contained in:
Tomaž Vajngerl
2019-11-10 12:17:48 +01:00
committed by Tomaž Vajngerl
parent d1a4569acb
commit ec7374ff84
4 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vcl/inc/widgetdraw/WidgetDefinition.hxx
View File

@@ -211,6 +211,9 @@ public:
Color maShadowColor;
Color maDarkShadowColor;
Color maButtonTextColor;
Color maDefaultActionButtonTextColor;
Color maActionButtonTextColor;
Color maActionButtonRolloverTextColor;
Color maButtonRolloverTextColor;
Color maRadioCheckTextColor;
Color maGroupTextColor;

3
vcl/source/gdi/FileDefinitionWidgetDraw.cxx
View File

@@ -945,6 +945,9 @@ bool FileDefinitionWidgetDraw::updateSettings(AllSettings& rSettings)
aStyleSet.SetShadowColor(pDefinitionStyle->maShadowColor);
aStyleSet.SetDarkShadowColor(pDefinitionStyle->maDarkShadowColor);
aStyleSet.SetButtonTextColor(pDefinitionStyle->maButtonTextColor);
aStyleSet.SetDefaultActionButtonTextColor(pDefinitionStyle->maDefaultActionButtonTextColor);
aStyleSet.SetActionButtonTextColor(pDefinitionStyle->maActionButtonTextColor);
aStyleSet.SetActionButtonRolloverTextColor(pDefinitionStyle->maActionButtonRolloverTextColor);
aStyleSet.SetButtonRolloverTextColor(pDefinitionStyle->maButtonRolloverTextColor);
aStyleSet.SetRadioCheckTextColor(pDefinitionStyle->maRadioCheckTextColor);
aStyleSet.SetGroupTextColor(pDefinitionStyle->maGroupTextColor);

3
vcl/source/gdi/WidgetDefinitionReader.cxx
View File

@@ -365,6 +365,9 @@ bool WidgetDefinitionReader::read(WidgetDefinition& rWidgetDefinition)
{ "shadowColor", &pStyle->maShadowColor },
{ "darkShadowColor", &pStyle->maDarkShadowColor },
{ "buttonTextColor", &pStyle->maButtonTextColor },
{ "defaultActionButtonTextColor", &pStyle->maDefaultActionButtonTextColor },
{ "actionButtonTextColor", &pStyle->maActionButtonTextColor },
{ "actionButtonRolloverTextColor", &pStyle->maActionButtonRolloverTextColor },
{ "buttonRolloverTextColor", &pStyle->maButtonRolloverTextColor },
{ "radioCheckTextColor", &pStyle->maRadioCheckTextColor },
{ "groupTextColor", &pStyle->maGroupTextColor },

3
vcl/uiconfig/theme_definitions/ios/definition.xml
View File

@@ -9,6 +9,9 @@
<shadowColor value="#808080"/>
<darkShadowColor value="#000000"/>
<buttonTextColor value="#007AFF"/>
<defaultActionButtonTextColor value="#007AFF"/>
<actionButtonRolloverTextColor value="#007AFF"/>
<buttonTextColor value="#007AFF"/>
<buttonRolloverTextColor value="#FFFFFF"/>
<radioCheckTextColor value="#000000"/>
<groupTextColor value="#000000"/>