commit c8df6f7bfc358a730705eeaf409968b6c457052b
author Caolán McNamara <caolanm@redhat.com> Mon Apr 01 14:42:25 2019 +0100
committer Caolán McNamara <caolanm@redhat.com> Mon Apr 01 21:27:39 2019 +0200
tree 2acd48727128922df6ee2684d001a6de41ed838c
parent d4202e3ecd1f14cf4922e52c6e98046b190da386

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 <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

vcl/source/control/button.cxx

diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 471bc14..93aed20 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;