[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - include/basegfx vcl/inc vcl/source vcl/uiconfig

[Tomaž Vajngerl (via logerrit)]

 include/basegfx/DrawCommands.hxx                  |    4 ++++
 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 +++
 5 files changed, 16 insertions(+)

New commits:
commit 8c1837bbc1fe6732a06eda23516a727b391b3db8
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Sun Nov 10 12:17:48 2019 +0100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Thu Nov 14 10:57:39 2019 +0100

    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 at gmail.com>
    (cherry picked from commit ec7374ff84c71edfbb30d6e4dc5b486b6df7107f)
    Reviewed-on: https://gerrit.libreoffice.org/82638
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

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"/>
commit 333ed807b2aa425a51126ec9ff912528c29c787b
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Sun Nov 10 12:08:36 2019 +0100
Commit:     Tomaž Vajngerl <quikee at gmail.com>
CommitDate: Thu Nov 14 10:57:28 2019 +0100

    cid#1455328 initialize variables to 0.0 in LinearGradientInfo
    
    Change-Id: I7232f5406ca019fa0634a7b6a69536c87ba46430
    Reviewed-on: https://gerrit.libreoffice.org/82380
    Tested-by: Jenkins
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    (cherry picked from commit 88785adc9d816e0e2975489581cb424d08cb082a)
    Reviewed-on: https://gerrit.libreoffice.org/82637
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/include/basegfx/DrawCommands.hxx b/include/basegfx/DrawCommands.hxx
index d7d861f9effd..df705e28a540 100644
--- a/include/basegfx/DrawCommands.hxx
+++ b/include/basegfx/DrawCommands.hxx
@@ -67,6 +67,10 @@ class LinearGradientInfo : public GradientInfo
 public:
     LinearGradientInfo()
         : GradientInfo(GradientType::Linear)
+        , x1(0.0)
+        , y1(0.0)
+        , x2(0.0)
+        , y2(0.0)
     {
     }