From c8df6f7bfc358a730705eeaf409968b6c457052b Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 1 Apr 2019 14:42:25 +0100 Subject: Resolves: tdf#123175 don't use NWF to draw buttons with an overridden bg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I434f476f62c5c754d96eeb0cb9ad7c0b8d38ccec Reviewed-on: https://gerrit.libreoffice.org/70069 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- vcl/source/control/button.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; -- cgit