summaryrefslogtreecommitdiffstats
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-01-24 17:18:35 +0000
committerEike Rathke <erack@redhat.com>2018-01-26 14:37:51 +0100
commitea5384c177dcaf96a951019ab6a026b884832592 (patch)
tree86180789593948a6564f815da811c74f00df2afa /vcl
parenttdf#115080 menu id collision (diff)
downloadcore-ea5384c177dcaf96a951019ab6a026b884832592.tar.gz
core-ea5384c177dcaf96a951019ab6a026b884832592.zip
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@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/seleng.cxx2
1 files changed, 1 insertions, 1 deletions
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;