[Libreoffice-commits] core.git: svtools/source

[Heiko Tietze (via logerrit)]

 svtools/source/config/colorcfg.cxx |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 846e9a202b450445ede565c4f6a9a70954134438
Author:     Heiko Tietze <heiko.tie...@documentfoundation.org>
AuthorDate: Wed Apr 12 15:12:33 2023 +0200
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Apr 17 12:50:46 2023 +0200

    Resolves tdf#152184 - App color follow system colors
    
    Change-Id: I47d37a911baab57af832821bb66f8dd4818a8830
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150283
    Tested-by: Jenkins
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/svtools/source/config/colorcfg.cxx 
b/svtools/source/config/colorcfg.cxx
index 3fa88a3886cf..4847aeb6bd7d 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/uno/Sequence.h>
 #include <svl/poolitem.hxx>
 #include <mutex>
+#include <vcl/window.hxx>
 
 #include "itemholder2.hxx"
 
@@ -443,10 +444,14 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry 
eEntry)
         default:
             int nAppMod;
             switch (MiscSettings::GetAppColorMode()) {
-                case 0: nAppMod = clLight; break; // UseDarkMode() ? clDark : 
clLight; break;
+                default:
+                    if (MiscSettings::GetUseDarkMode())
+                        nAppMod = clDark;
+                    else
+                        nAppMod = clLight;
+                    break;
                 case 1: nAppMod = clLight; break;
                 case 2: nAppMod = clDark; break;
-                default: nAppMod = clLight;
             }
             aRet = cAutoColors[eEntry][nAppMod];
     }