summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-07-13 16:56:23 +0100
committerCaolán McNamara <caolanm@redhat.com>2021-07-15 17:07:22 +0200
commitef86453a3f1dc0f3c73e731aaccfc4354bae70cc (patch)
tree81c9eccc73209fdde2c038a5440f953101db7d29
parenttdf#143291 the "none" item selected is distinct from nothing selected (diff)
downloadcore-ef86453a3f1dc0f3c73e731aaccfc4354bae70cc.tar.gz
core-ef86453a3f1dc0f3c73e731aaccfc4354bae70cc.zip
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@libreoffice.org> (cherry picked from commit bfc49fc16c1cc9b9a5dee406fe7348c079c45ba6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118811 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--vcl/source/treelist/svimpbox.cxx9
1 files changed, 9 insertions, 0 deletions
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)