[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - vcl/win

[Caolán McNamara (via logerrit)]

 vcl/win/gdi/salnativewidgets-luna.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 49f5b1a2750ec8f20d983c91ee99cb056a536901
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Oct 6 20:54:23 2022 +0100
Commit:     Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Sun Oct 9 04:38:21 2022 +0200

    tdf#98067 get menu readable in windows high contrast mode
    
    possibly a problem since:
    
    commit 9c5a22d19708eae17ad9880422bd03e81ea48c5d
    Date:   Thu Jun 21 17:55:53 2012 +0200
    
        aero toolbar: Extend the drawing of the toolbar to the menubar area.
    
    Change-Id: If76be9bf09a19992dafedf16d7e577acf1bc500d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141054
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
    (cherry picked from commit 6bd8ff51dd33e14d3e411630c8366a26e9550e77)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141057

diff --git a/vcl/win/gdi/salnativewidgets-luna.cxx 
b/vcl/win/gdi/salnativewidgets-luna.cxx
index eeef9b69e203..4dc4af12e2ff 100644
--- a/vcl/win/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/gdi/salnativewidgets-luna.cxx
@@ -943,7 +943,8 @@ static bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, 
RECT rc,
             }
 
             // make it more compatible with Aero
-            if( ImplGetSVData()->maNWFData.mbDockingAreaAvoidTBFrames )
+            if (ImplGetSVData()->maNWFData.mbDockingAreaAvoidTBFrames &&
+               
!Application::GetSettings().GetStyleSettings().GetHighContrastMode())
             {
                 impl_drawAeroToolbar( hDC, rc, nPart == 
ControlPart::DrawBackgroundHorz );
                 return true;
@@ -963,7 +964,8 @@ static bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, 
RECT rc,
                 rc.bottom += pValue->maTopDockingAreaHeight;    // extend 
potential gradient to cover docking area as well
 
                 // make it more compatible with Aero
-                if( ImplGetSVData()->maNWFData.mbDockingAreaAvoidTBFrames )
+                if (ImplGetSVData()->maNWFData.mbDockingAreaAvoidTBFrames &&
+                    
!Application::GetSettings().GetStyleSettings().GetHighContrastMode())
                 {
                     impl_drawAeroToolbar( hDC, rc, true );
                     return true;