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

[Caolán McNamara]

 vcl/source/window/seleng.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ea5384c177dcaf96a951019ab6a026b884832592
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 24 17:18:35 2018 +0000

    gtk3: single click with selection set doesn't unselect
    
    this is a safe backportable fix, the unconditional
    
    nFlags |= SelectionEngineFlags::CMDEVT
    
    looks the real dubious thing to me, but only the gtk3 backend has swipe support
    so just returning immediately on a swipe definitely ok
    
    Change-Id: Iade26d0d9260ce76dfb2766ac9e5ca9fa9275bf4
    Reviewed-on: https://gerrit.libreoffice.org/48528
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx
index 3b06d3d11623..286fa10275d6 100644
--- a/vcl/source/window/seleng.cxx
+++ b/vcl/source/window/seleng.cxx
@@ -343,7 +343,7 @@ void SelectionEngine::Reset()
 void SelectionEngine::Command( const CommandEvent& rCEvt )
 {
     // Timer aWTimer is active during enlarging a selection
-    if ( !pFunctionSet || !pWin || aWTimer.IsActive() )
+    if ( !pFunctionSet || !pWin || aWTimer.IsActive() || rCEvt.GetCommand() == CommandEventId::Swipe )
         return;
     aWTimer.Stop();
     nFlags |= SelectionEngineFlags::CMDEVT;