diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-10-21 14:28:38 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-10-22 12:20:01 +0200 |
| commit | 2859febef0dd59e6714032887f1f4ababf0b1044 (patch) | |
| tree | 09a5c1630c131cb5f3b9cc4478225a7fa18327c4 /vcl | |
| parent | 31763e5af060f598c1699662adefe43f13d4db0e (diff) | |
tdf#136866 VCL don't drop the control background
Since tdf#136094, we handle the background color for native
controls. So we shouldn't set the control window to transparent,
if a control background is set.
I'm not sure, if this just papers over a more general bug, but
even if we report a border in native painting, the original
window shouldn't be painted anyway.
Change-Id: I86267028214586d46ca9ba0b2288d4729abef16f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104621
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/brdwin.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index 66c63af65370..78258d758776 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -500,7 +500,8 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, tools::Long nWidth, to mpBorderWindow->SetPaintTransparent( true ); mpBorderWindow->SetBackground(); - pCtrl->SetPaintTransparent( true ); + if (!pCtrl->IsControlBackground()) + pCtrl->SetPaintTransparent(true); vcl::Window* pCompoundParent = nullptr; if( pWin->GetParent() && pWin->GetParent()->IsCompoundControl() ) |