commit 64c400a67db8441fdc5597782c5270cd5028e0fd
author Caolán McNamara <caolanm@redhat.com> Tue Jan 31 10:22:35 2023 +0000
committer Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Wed Feb 15 16:05:15 2023 +0000
tree 0ccaafd99221467b1ea9246cb4fd2745bcc7ab43
parent 165dce050b41c1268a56905986f97263717f1184

tdf#153287 rollover in dark mode with "Explorer" is incongruous

Using "CFD" gives a brighter border with rollover, but no notable
focus state when focused. Try a combination here to get something
decent.

Change-Id: If7844cb0f1e88410959aa622b0271c3f3954230e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146388
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>

vcl/win/gdi/salnativewidgets-luna.cxx

diff --git a/vcl/win/gdi/salnativewidgets-luna.cxx b/vcl/win/gdi/salnativewidgets-luna.cxx
index 8156da8..fffcb2f 100644
--- a/vcl/win/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/gdi/salnativewidgets-luna.cxx
@@ -1163,7 +1163,11 @@ bool WinSalGraphics::drawNativeControl( ControlType nType,
            break;
        case ControlType::Combobox:
            if( nPart == ControlPart::Entire )
            {
                if (bUseDarkMode && !(nState & ControlState::FOCUSED))
                    SetWindowTheme(mhWnd, L"CFD", nullptr);
                hTheme = getThemeHandle(mhWnd, L"Edit", mpImpl.get());
            }
            else if( nPart == ControlPart::ButtonDown )
            {
                if (bUseDarkMode)
@@ -1173,7 +1177,11 @@ bool WinSalGraphics::drawNativeControl( ControlType nType,
            break;
        case ControlType::Spinbox:
            if( nPart == ControlPart::Entire )
            {
                if (bUseDarkMode && !(nState & ControlState::FOCUSED))
                    SetWindowTheme(mhWnd, L"CFD", nullptr);
                hTheme = getThemeHandle(mhWnd, L"Edit", mpImpl.get());
            }
            else
                hTheme = getThemeHandle(mhWnd, L"Spin", mpImpl.get());
            break;
@@ -1181,6 +1189,10 @@ bool WinSalGraphics::drawNativeControl( ControlType nType,
            hTheme = getThemeHandle(mhWnd, L"Spin", mpImpl.get());
            break;
        case ControlType::Editbox:
            if (bUseDarkMode && !(nState & ControlState::FOCUSED))
                SetWindowTheme(mhWnd, L"CFD", nullptr);
            hTheme = getThemeHandle(mhWnd, L"Edit", mpImpl.get());
            break;
        case ControlType::MultilineEditbox:
            hTheme = getThemeHandle(mhWnd, L"Edit", mpImpl.get());
            break;