[Libreoffice-commits] core.git: Branch 'feature/eszka' - 3 commits - vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/treelist/svimpbox.cxx    |   17 +++++------------
 vcl/source/treelist/treelistbox.cxx |    1 -
 2 files changed, 5 insertions(+), 13 deletions(-)

New commits:
commit 2bc5a8d6f76300aa7c62ec0c37342e120b70944f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Jun 7 20:00:08 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Nov 3 09:43:18 2020 +0100

    Resolves: tdf#133744 stop processing if DoubleClickHdl consumed event
    
    Change-Id: I69bb7d670b04b082df294d5ea56dfd6e8d6d4fe7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95703
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx
index 087496706d7c..5ca02e42ee74 100644
--- a/vcl/source/treelist/svimpbox.cxx
+++ b/vcl/source/treelist/svimpbox.cxx
@@ -2427,8 +2427,7 @@ bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
             break;
 
         case KEY_RETURN:
-            m_pView->DoubleClickHdl();
-            bKeyUsed = false;
+            bKeyUsed = !m_pView->DoubleClickHdl();
             break;
 
         case KEY_F2:
commit 421500c9cc49e6bd0c8a1bdb84f8f10c5200079a
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue May 26 16:17:59 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Nov 3 09:43:02 2020 +0100

    emit activate-row in vcl treeview on return
    
    to align it with the gtk one which does this
    
    Change-Id: Id439fe684f263f59285ba9291fc803f88309c066
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94875
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx
index 305248abbcca..087496706d7c 100644
--- a/vcl/source/treelist/svimpbox.cxx
+++ b/vcl/source/treelist/svimpbox.cxx
@@ -2427,8 +2427,7 @@ bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
             break;
 
         case KEY_RETURN:
-            if (m_pView->mbActivateOnSingleClick)
-                m_pView->DoubleClickHdl();
+            m_pView->DoubleClickHdl();
             bKeyUsed = false;
             break;
 
commit 618a22e31c6799624f34e012599c0362d3c8e85e
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun May 24 20:26:54 2020 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Nov 3 09:40:32 2020 +0100

    support activate-on-single-click
    
    Change-Id: Iac0231b3bd84d664b1ab59023ef8242f3bd08940
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94773
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx
index 7ccbb5856f01..305248abbcca 100644
--- a/vcl/source/treelist/svimpbox.cxx
+++ b/vcl/source/treelist/svimpbox.cxx
@@ -598,8 +598,6 @@ void SvImpLBox::RecalcFocusRect()
 
 
 //  Sets cursor. When using SingleSelection, the selection is adjusted.
-
-
 void SvImpLBox::SetCursor( SvTreeListEntry* pEntry, bool bForceNoSelect )
 {
     SvViewDataEntry* pViewDataNewCur = nullptr;
@@ -2023,7 +2021,7 @@ void SvImpLBox::MouseButtonDown( const MouseEvent& rMEvt )
     }
 
 
-    if( (rMEvt.GetClicks() % 2) == 0 )
+    if( (rMEvt.GetClicks() % 2) == 0)
     {
         m_nFlags &= ~LBoxFlags::StartEditTimer;
         m_pView->pHdlEntry = pEntry;
@@ -2087,6 +2085,9 @@ void SvImpLBox::MouseButtonUp( const MouseEvent& rMEvt)
         m_aEditClickPos = rMEvt.GetPosPixel();
         m_aEditIdle.Start();
     }
+
+    if (m_pView->mbActivateOnSingleClick)
+        m_pView->DoubleClickHdl();
 }
 
 void SvImpLBox::MouseMove( const MouseEvent& rMEvt)
@@ -2426,15 +2427,9 @@ bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
             break;
 
         case KEY_RETURN:
-            if( m_bSubLstOpRet && IsExpandable() )
-            {
-                if( m_pView->IsExpanded( m_pCursor ) )
-                    m_pView->Collapse( m_pCursor );
-                else
-                    m_pView->Expand( m_pCursor );
-            }
-            else
-                bKeyUsed = false;
+            if (m_pView->mbActivateOnSingleClick)
+                m_pView->DoubleClickHdl();
+            bKeyUsed = false;
             break;
 
         case KEY_F2:
diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx
index 6e3c612093d8..6c91289f019d 100644
--- a/vcl/source/treelist/treelistbox.cxx
+++ b/vcl/source/treelist/treelistbox.cxx
@@ -456,7 +456,6 @@ bool SvTreeListBox::DoubleClickHdl()
     return !aDoubleClickHdl.IsSet() || aDoubleClickHdl.Call(this);
 }
 
-
 bool SvTreeListBox::CheckDragAndDropMode( SvTreeListBox const * pSource, sal_Int8 nAction )
 {
     if ( pSource == this )