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

[Heiko Tietze (via logerrit)]

 sc/source/ui/view/hdrcont.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 306093f8f82a646a2a82ebfc57fbef70af2d30a7
Author:     Heiko Tietze <tietze.he...@gmail.com>
AuthorDate: Fri May 26 11:20:06 2023 +0200
Commit:     Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Fri May 26 13:04:48 2023 +0200

    Related tdf#145080 - Less obtrusive col/row header color on macOS
    
    Change-Id: I4821643148afa205d94fe2f6178091c2acfb5bc7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152299
    Tested-by: Jenkins
    Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>

diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index d6e9b5dbeb3f..c6688ea11562 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -361,7 +361,14 @@ void ScHeaderControl::Paint( vcl::RenderContext& 
/*rRenderContext*/, const tools
             {
                 // background for selection
                 GetOutDev()->SetLineColor();
-                GetOutDev()->SetFillColor( rStyleSettings.GetAccentColor() );
+                Color aColor( rStyleSettings.GetAccentColor() );
+// merging the highlightcolor (which is used if accent does not exist) with 
the background
+// fails in many cases such as Breeze Dark (highlight is too close to 
background) and
+// Breeze Light (font color is white and not readable anymore)
+#ifdef MACOSX
+                aColor.Merge( rStyleSettings.GetFaceColor(), 80 );
+#endif
+                GetOutDev()->SetFillColor( aColor );
                 GetOutDev()->DrawRect( aFillRect );
             }
         }