[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - include/vcl vcl/qt5 vcl/source

[Jan-Marek Glogowski (via logerrit)]

 include/vcl/settings.hxx    |    1 +
 vcl/qt5/Qt5Frame.cxx        |    1 +
 vcl/source/app/settings.cxx |    6 ++++++
 3 files changed, 8 insertions(+)

New commits:
commit 0904fd7db170c8785d665172a71a7ac687670948
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Mon Oct 19 20:46:05 2020 +0200
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Tue Oct 20 12:45:52 2020 +0200

    tdf#133931 Qt5 set the themed AlternatingRowColor
    
    Change-Id: I6a4a0f90239686ff1c94e1a550540223324184e8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104540
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
    (cherry picked from commit 0839bfaf75d3a1bc78b63c71f28a763b1b39f979)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104500
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index c3567e4120d9..8e2dd05abbb2 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -415,6 +415,7 @@ public:
     void                            SetInactiveTabColor( const Color& rColor );
     const Color&                    GetInactiveTabColor() const;
 
+    void SetAlternatingRowColor(const Color& rColor);
     const Color&                    GetAlternatingRowColor() const;
 
     void                            SetHighContrastMode(bool bHighContrast );
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index ed3368ac3970..768872fe8db0 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -1046,6 +1046,7 @@ void Qt5Frame::UpdateSettings(AllSettings& rSettings)
     style.SetFieldColor(aBase);
     style.SetWindowColor(aBase);
     style.SetActiveTabColor(aBase);
+    style.SetAlternatingRowColor(toColor(pal.color(QPalette::Active, QPalette::AlternateBase)));
 
     // Buttons
     style.SetDefaultButtonTextColor(aButn);
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 8e18213f412a..c2ca35835064 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -1545,6 +1545,12 @@ StyleSettings::GetInactiveTabColor() const
     return mxData->maInactiveTabColor;
 }
 
+void StyleSettings::SetAlternatingRowColor(const Color& rColor)
+{
+    CopyData();
+    mxData->maAlternatingRowColor = rColor;
+}
+
 const Color&
 StyleSettings::GetAlternatingRowColor() const
 {