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

[Caolán McNamara (via logerrit)]

 vcl/osx/salframe.cxx |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 254acd7c1d8fef437985c9b428a0edddede9d5a9
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Nov 28 10:26:00 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Nov 28 12:57:12 2022 +0100

    Resolves: tdf#152253 Text in calc Input Box unreadable in dark mode
    
    Change-Id: I60bfde908ac2d107d14aa7387d569d575622f962
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143376
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index df6413a8fe65..1b1d0eab1f6b 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1370,14 +1370,19 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
     Color aAlternateSelectedControlTextColor(getColor([NSColor 
alternateSelectedControlTextColor], COL_WHITE, mpNSWindow ));
     aStyleSettings.SetWindowColor(aWindowBackgroundColor);
     aStyleSettings.SetListBoxWindowBackgroundColor(aWindowBackgroundColor);
+
+    aStyleSettings.SetDialogTextColor(aControlTextColor);
     aStyleSettings.SetButtonTextColor(aControlTextColor);
-    aStyleSettings.SetLabelTextColor(aControlTextColor);
+    aStyleSettings.SetActionButtonTextColor(aControlTextColor);
     aStyleSettings.SetRadioCheckTextColor(aControlTextColor);
+    aStyleSettings.SetGroupTextColor(aControlTextColor);
+    aStyleSettings.SetLabelTextColor(aControlTextColor);
+    aStyleSettings.SetWindowTextColor(aControlTextColor);
     aStyleSettings.SetFieldTextColor(aControlTextColor);
+
     aStyleSettings.SetFieldRolloverTextColor(aControlTextColor);
     aStyleSettings.SetFieldColor(aControlBackgroundColor);
     
aStyleSettings.SetDefaultActionButtonTextColor(aAlternateSelectedControlTextColor);
-    aStyleSettings.SetActionButtonTextColor(aControlTextColor);
     aStyleSettings.SetFlatButtonTextColor(aControlTextColor);
     
aStyleSettings.SetDefaultButtonRolloverTextColor(aAlternateSelectedControlTextColor);
     aStyleSettings.SetButtonRolloverTextColor(aControlTextColor);
@@ -1401,7 +1406,6 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
     }
 
     aStyleSettings.SetWorkspaceColor(aUnderPageBackgroundColor);
-    aStyleSettings.SetDialogTextColor(aControlTextColor);
 
     aStyleSettings.SetHelpColor(aControlBackgroundColor);
     aStyleSettings.SetHelpTextColor(aControlTextColor);