diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2019-11-10 12:17:48 +0100 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2019-11-14 10:57:39 +0100 |
| commit | 8c1837bbc1fe6732a06eda23516a727b391b3db8 (patch) | |
| tree | 6d5bb33c818ddd59ebed5f4d4f936e5b6e3a6b6c /vcl | |
| parent | 333ed807b2aa425a51126ec9ff912528c29c787b (diff) | |
widget theme: add new action button stylesettings to xml def.
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>
(cherry picked from commit ec7374ff84c71edfbb30d6e4dc5b486b6df7107f)
Reviewed-on: https://gerrit.libreoffice.org/82638
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/widgetdraw/WidgetDefinition.hxx | 3 | ||||
| -rw-r--r-- | vcl/source/gdi/FileDefinitionWidgetDraw.cxx | 3 | ||||
| -rw-r--r-- | vcl/source/gdi/WidgetDefinitionReader.cxx | 3 | ||||
| -rw-r--r-- | vcl/uiconfig/theme_definitions/ios/definition.xml | 3 |
4 files changed, 12 insertions, 0 deletions
diff --git a/vcl/inc/widgetdraw/WidgetDefinition.hxx b/vcl/inc/widgetdraw/WidgetDefinition.hxx index d5f5b3728abd..acaac53bfacf 100644 --- a/vcl/inc/widgetdraw/WidgetDefinition.hxx +++ b/vcl/inc/widgetdraw/WidgetDefinition.hxx @@ -208,6 +208,9 @@ public: Color maShadowColor; Color maDarkShadowColor; Color maButtonTextColor; + Color maDefaultActionButtonTextColor; + Color maActionButtonTextColor; + Color maActionButtonRolloverTextColor; Color maButtonRolloverTextColor; Color maRadioCheckTextColor; Color maGroupTextColor; diff --git a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx index 9243035ec1e7..8a3b43fddaf1 100644 --- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx +++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx @@ -946,6 +946,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); diff --git a/vcl/source/gdi/WidgetDefinitionReader.cxx b/vcl/source/gdi/WidgetDefinitionReader.cxx index dd6bf75abe32..50c6d7b3de98 100644 --- a/vcl/source/gdi/WidgetDefinitionReader.cxx +++ b/vcl/source/gdi/WidgetDefinitionReader.cxx @@ -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 }, diff --git a/vcl/uiconfig/theme_definitions/ios/definition.xml b/vcl/uiconfig/theme_definitions/ios/definition.xml index b0e26f01079c..2a29df41d378 100644 --- a/vcl/uiconfig/theme_definitions/ios/definition.xml +++ b/vcl/uiconfig/theme_definitions/ios/definition.xml @@ -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"/> |