vcl/source/control/button.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit c8df6f7bfc358a730705eeaf409968b6c457052b
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Apr 1 14:42:25 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Apr 1 21:27:39 2019 +0200
Resolves: tdf#123175 don't use NWF to draw buttons with an overridden bg
Change-Id: I434f476f62c5c754d96eeb0cb9ad7c0b8d38ccec
Reviewed-on: https://gerrit.libreoffice.org/70069
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 471bc1420b10..93aed205fdcb 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -1018,7 +1018,8 @@ void PushButton::ImplDrawPushButton(vcl::RenderContext&
rRenderContext)
if (!bRollOver && !HasFocus())
bDrawMenuSep = false;
}
- bNativeOK =
rRenderContext.IsNativeControlSupported(ControlType::Pushbutton,
ControlPart::Entire);
+ // tdf#123175 if there is a custom control bg set, draw the button without
outsourcing to the NWF
+ bNativeOK = !IsControlBackground() &&
rRenderContext.IsNativeControlSupported(ControlType::Pushbutton,
ControlPart::Entire);
if (bNativeOK)
{
PushButtonValue aControlValue;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
