vcl/source/control/button.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit ef3f61476fc074a0186571e031dc69ce1c54560c Author: Caolán McNamara <[email protected]> AuthorDate: Mon Apr 1 14:42:25 2019 +0100 Commit: Andras Timar <[email protected]> CommitDate: Mon Apr 1 22:46:19 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 <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index ecffa1cf5722..f2a909dd753f 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -1026,7 +1026,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 [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
