From ec7374ff84c71edfbb30d6e4dc5b486b6df7107f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Toma=C5=BE=20Vajngerl?= Date: Sun, 10 Nov 2019 12:17:48 +0100 Subject: [PATCH] widget theme: add new action button stylesettings to xml def. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- vcl/inc/widgetdraw/WidgetDefinition.hxx | 3 +++ vcl/source/gdi/FileDefinitionWidgetDraw.cxx | 3 +++ vcl/source/gdi/WidgetDefinitionReader.cxx | 3 +++ vcl/uiconfig/theme_definitions/ios/definition.xml | 3 +++ 4 files changed, 12 insertions(+) diff --git a/vcl/inc/widgetdraw/WidgetDefinition.hxx b/vcl/inc/widgetdraw/WidgetDefinition.hxx index 0d3c0a1d1062..7c0259468328 100644 --- a/vcl/inc/widgetdraw/WidgetDefinition.hxx +++ b/vcl/inc/widgetdraw/WidgetDefinition.hxx @@ -211,6 +211,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 40d443bb0edf..0eb0484d4cbe 100644 --- a/vcl/source/gdi/FileDefinitionWidgetDraw.cxx +++ b/vcl/source/gdi/FileDefinitionWidgetDraw.cxx @@ -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); diff --git a/vcl/source/gdi/WidgetDefinitionReader.cxx b/vcl/source/gdi/WidgetDefinitionReader.cxx index cbfa7c8bfe87..cdd14802f137 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 @@ + + +