[Libreoffice-commits] core.git: Branch 'libreoffice-7-1-5' - vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/treelist/svimpbox.cxx |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit ef86453a3f1dc0f3c73e731aaccfc4354bae70cc
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jul 13 16:56:23 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jul 15 17:07:22 2021 +0200

    tdf#143245 activate-on-single-click only if 'up' is at active entry
    
    which is typically selected by the 'down'
    
    Change-Id: I23382fb97146820da49e570280778729a3156f03
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118807
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    (cherry picked from commit bfc49fc16c1cc9b9a5dee406fe7348c079c45ba6)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118811
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx
index d72de8763981..bab21eb7c1c7 100644
--- a/vcl/source/treelist/svimpbox.cxx
+++ b/vcl/source/treelist/svimpbox.cxx
@@ -2011,7 +2011,16 @@ void SvImpLBox::MouseButtonUp( const MouseEvent& rMEvt)
     }
 
     if (m_pView->mbActivateOnSingleClick)
+    {
+        Point aPos(rMEvt.GetPosPixel());
+        SvTreeListEntry* pEntry = GetEntry(aPos);
+        // tdf#143245 ActivateOnSingleClick only
+        // if the 'up' is at the active entry
+        // typically selected by the 'down'
+        if (!pEntry || pEntry != m_pCursor)
+            return;
         m_pView->DoubleClickHdl();
+    }
 }
 
 void SvImpLBox::MouseMove( const MouseEvent& rMEvt)