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

[Caolán McNamara (via logerrit)]

 vcl/osx/salframe.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit ab0958d5eb87a82cdd54245ca7aa18124b175a05
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Oct 20 19:37:41 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Oct 21 10:36:05 2022 +0200

    macos: set some more background colors explicitly from theme
    
    noticeable if experimentally enabling dark mode
    
    Change-Id: If71223fe631cf4f361190171769f1557b9ee97d4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141602
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 5be4d724430c..72d26b560597 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1298,12 +1298,20 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 
     NSOperatingSystemVersion aOSVersion = { .majorVersion = 10, .minorVersion 
= 16, .patchVersion = 0 };
     Color aControlTextColor(getColor([NSColor controlTextColor], COL_BLACK, 
mpNSWindow));
+    Color aFaceColor(getColor([NSColor 
unemphasizedSelectedTextBackgroundColor], COL_LIGHTGRAY, mpNSWindow));
+    Color aControlBackgroundColor(getColor([NSColor controlBackgroundColor], 
COL_WHITE, mpNSWindow));
+    Color aWindowBackgroundColor(getColor([NSColor windowBackgroundColor], 
COL_WHITE, mpNSWindow));
     Color aSelectedControlTextColor(getColor([NSColor 
selectedControlTextColor], COL_BLACK, mpNSWindow));
     Color aAlternateSelectedControlTextColor(getColor([NSColor 
alternateSelectedControlTextColor], COL_WHITE, mpNSWindow));
+    aStyleSettings.SetWindowColor(aWindowBackgroundColor);
+    aStyleSettings.SetListBoxWindowBackgroundColor(aWindowBackgroundColor);
+    aStyleSettings.SetFaceColor(aFaceColor);
     aStyleSettings.SetButtonTextColor(aControlTextColor);
     aStyleSettings.SetLabelTextColor(aControlTextColor);
     aStyleSettings.SetRadioCheckTextColor(aControlTextColor);
     aStyleSettings.SetFieldTextColor(aControlTextColor);
+    aStyleSettings.SetFieldRolloverTextColor(aControlTextColor);
+    aStyleSettings.SetFieldColor(aControlBackgroundColor);
     
aStyleSettings.SetDefaultActionButtonTextColor(aAlternateSelectedControlTextColor);
     aStyleSettings.SetActionButtonTextColor(aControlTextColor);
     aStyleSettings.SetFlatButtonTextColor(aControlTextColor);