[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/control/button.cxx      |    3 ++-
 vcl/source/control/imp_listbox.cxx |    6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit dfe0b5ee5cdeeef65fb0bd35457d64d10540eede
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Apr 2 20:26:53 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Sep 19 13:22:17 2019 +0200

    Related: tdf#124148 null-deref on clicking inside empty listbox
    
    since...
    
    commit ce9dab8c161e29769131cec741a6a9cceec8552d
    Date:   Thu Mar 28 17:43:29 2019 +0900
    
        tdf#124148 add configurable margin for the listbox pop-up list
    
    Change-Id: Id0bedb86f4fb74aff230d65f1e4371959814fd0f
    Reviewed-on: https://gerrit.libreoffice.org/70151
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 728f074ab672469af933d492843230bd5c5bd0cd)

diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx
index fca0e4c28205..1d9b246e4d6a 100644
--- a/vcl/source/control/imp_listbox.cxx
+++ b/vcl/source/control/imp_listbox.cxx
@@ -810,9 +810,11 @@ sal_Int32 ImplListBoxWindow::GetEntryPosForPoint( const Point& rPoint ) const
 
     sal_Int32 nSelect = mnTop;
     const ImplEntryType* pEntry = mpEntryList->GetEntryPtr( nSelect );
-    long nEntryHeight = pEntry->getHeightWithMargin();
-    while( pEntry && rPoint.Y() > nEntryHeight + nY )
+    while (pEntry)
     {
+        long nEntryHeight = pEntry->getHeightWithMargin();
+        if (rPoint.Y() <= nEntryHeight + nY)
+            break;
         nY += nEntryHeight;
         pEntry = mpEntryList->GetEntryPtr( ++nSelect );
     }
commit 687fdb9407edb5813bc8e378911b85f4fea4fe3d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Apr 1 14:42:25 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Sep 19 13:21:01 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 <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 1ecff165a9e1..03089aca6742 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -1042,7 +1042,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;