diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2023-01-31 10:49:51 +0000 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2023-01-31 16:52:21 +0000 |
| commit | 5b64ac83cdbab98052c478d5bb6954b324a36171 (patch) | |
| tree | 320c195a64d41f0e39aa91506c49c5847f1f6b76 /vcl | |
| parent | 57a886ddef0c8e4b8095e28c0c997074a5e96d22 (diff) | |
tdf#153273 bodge dark scrollbar into drop downs
Change-Id: I9c53b931feb7f720f86edfbb6ae88ff5ee436cef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146396
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/win/gdi/salnativewidgets-luna.cxx | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/vcl/win/gdi/salnativewidgets-luna.cxx b/vcl/win/gdi/salnativewidgets-luna.cxx index 1c177a1b2a97..5ab4c6cb4dd6 100644 --- a/vcl/win/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/gdi/salnativewidgets-luna.cxx @@ -1172,7 +1172,20 @@ bool WinSalGraphics::drawNativeControl( ControlType nType, hTheme = getThemeHandle(mhWnd, L"Button", mWinSalGraphicsImplBase); break; case ControlType::Scrollbar: - hTheme = getThemeHandle(mhWnd, L"Scrollbar", mWinSalGraphicsImplBase); + if (bUseDarkMode) + { + // tdf#153273 undo the earlier SetWindowTheme, and use an explicit Explorer::Scrollbar + // a) with "Scrollbar" and SetWindowTheme(... "Explorer" ...) then scrollbars in dialog + // and main windows are dark, but dropdowns are light + // b) with "Explorer::Scrollbar" and SetWindowTheme(... "Explorer" ...) then scrollbars + // in dropdowns are dark, but scrollbars in dialogs and main windows are sort of "extra + // dark" + // c) with "Explorer::Scrollbar" and no SetWindowTheme both cases are dark + SetWindowTheme(mhWnd, nullptr, nullptr); + hTheme = getThemeHandle(mhWnd, L"Explorer::Scrollbar", mWinSalGraphicsImplBase); + } + else + hTheme = getThemeHandle(mhWnd, L"Scrollbar", mWinSalGraphicsImplBase); break; case ControlType::Combobox: if( nPart == ControlPart::Entire ) |