vcl/source/window/brdwin.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 2859febef0dd59e6714032887f1f4ababf0b1044
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Wed Oct 21 14:28:38 2020 +0200
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Thu Oct 22 12:20:01 2020 +0200
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.wegh...@posteo.de>
Tested-by: Jenkins
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() )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
