[Libreoffice-commits] core.git: vcl/win

[Caolán McNamara (via logerrit)]

 vcl/win/window/salframe.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 892ef6e8b6888b3029041ab150b409f81a5c31b0
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Mar 18 21:29:00 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Mar 19 22:10:42 2022 +0100

    Related: tdf#118320 let windows icon theme know when a dark theme is 
preferred
    
    Change-Id: I7569814a575e3d7c216e790eb162397d312fa0e5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131843
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index 5965e9225058..cd9449c1a4ae 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -2662,7 +2662,12 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings 
)
     Color aMenuBarTextColor;
     Color aMenuBarRolloverTextColor;
 
-    if (UseDarkMode())
+    const bool bUseDarkMode(UseDarkMode());
+
+    OUString sThemeName(!bUseDarkMode ? u"colibre" : u"colibre_dark");
+    aStyleSettings.SetPreferredIconTheme(sThemeName, bUseDarkMode);
+
+    if (bUseDarkMode)
     {
         SetWindowTheme(mhWnd, L"Explorer", nullptr);