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

[Caolán McNamara (via logerrit)]

 vcl/source/app/settings.cxx |   23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

New commits:
commit 364e08622c7f852af82f252acf1a42393a56328a
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Feb 14 08:56:13 2023 +0000
Commit:     Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Wed Feb 15 04:49:25 2023 +0000

    base section Titles are invisible in dark mode
    
    Change-Id: I46848169f9376588e91d9684e47f388074c41493
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146997
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    (cherry picked from commit db6fbb0317fcb0a7babca9f71adbbb7c126b9e4e)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146981
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index c12a520ae025..d6cf251faa1f 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -2256,12 +2256,23 @@ void StyleSettings::Set3DColors( const Color& rColor )
     mxData->maDarkShadowColor   = COL_BLACK;
     if ( rColor != COL_LIGHTGRAY )
     {
-        mxData->maLightColor    = rColor;
-        mxData->maShadowColor   = rColor;
-        mxData->maDarkShadowColor=rColor;
-        mxData->maLightColor.IncreaseLuminance( 64 );
-        mxData->maShadowColor.DecreaseLuminance( 64 );
-        mxData->maDarkShadowColor.DecreaseLuminance( 100 );
+        mxData->maLightColor = rColor;
+        mxData->maShadowColor = rColor;
+        mxData->maDarkShadowColor = rColor;
+
+        if (!rColor.IsDark())
+        {
+            mxData->maLightColor.IncreaseLuminance(64);
+            mxData->maShadowColor.DecreaseLuminance(64);
+            mxData->maDarkShadowColor.DecreaseLuminance(100);
+        }
+        else
+        {
+            mxData->maLightColor.DecreaseLuminance(64);
+            mxData->maShadowColor.IncreaseLuminance(64);
+            mxData->maDarkShadowColor.IncreaseLuminance(100);
+        }
+
         sal_uLong   nRed    = mxData->maLightColor.GetRed();
         sal_uLong   nGreen  = mxData->maLightColor.GetGreen();
         sal_uLong   nBlue   = mxData->maLightColor.GetBlue();