[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - vcl/source

[Caolán McNamara]

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

New commits:
commit 2663df310f3857b9334ac78663197e3c9edc281c
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/48529
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx
index c911a9059551..c545824436cd 100644
--- a/vcl/source/window/seleng.cxx
+++ b/vcl/source/window/seleng.cxx
@@ -342,7 +342,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;