[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/control/button.cxx |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 694743ccc19c39dc64fed4acce6a61dd0efc6a08
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Feb 8 16:37:33 2023 +0000
Commit:     Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Thu Feb 9 06:15:06 2023 +0000

    Related: tdf#152486 infobar is white text on light button in light mode
    
    background isn't "bright" or "dark" enough to be considered one or the
    other. This is only used for the infobars, so black text is good enough
    for the current bg colors in use.
    
    Change-Id: I4c2c4fadac72cc35aebeadec417186c6358c0a77
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146624
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 46d7b5123d82..98dc12397361 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -908,8 +908,6 @@ void PushButton::ImplDrawPushButtonContent(OutputDevice 
*pDev, SystemTextColorFl
         {
             if (aColor.IsBright() && !pParent->GetControlBackground().IsDark())
                 aColor = COL_BLACK;
-            else if (aColor.IsDark() && 
!pParent->GetControlBackground().IsBright())
-                aColor = COL_WHITE;
         }
     }
 #endif