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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 6d724a494e37412c3fd2e5d0e5e54bda177c4108
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Oct 6 20:54:23 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Oct 7 00:14:39 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/+/141034
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/win/gdi/salnativewidgets-luna.cxx 
b/vcl/win/gdi/salnativewidgets-luna.cxx
index ec86df4e963d..331e6c36ef5b 100644
--- a/vcl/win/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/gdi/salnativewidgets-luna.cxx
@@ -891,7 +891,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;
@@ -922,7 +923,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, true );
                     return true;