summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2019-06-15 15:44:33 +0900
committerTomaž Vajngerl <quikee@gmail.com>2019-06-17 12:18:41 +0200
commit08f485c6e92bd56c8c26171316b842cd213a8a09 (patch)
tree18ce98835f375e980c19fb895209d4fe2abf2969
parent596a03b65e1b870be671ea1a44f4fba9fc66e4ae (diff)
tdf#124907 vcl: react to pan gesture for listbox and other widgets
Change-Id: I4579f8edd2bf24506b1d55a7291cd86e276f30a4 Reviewed-on: https://gerrit.libreoffice.org/74087 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
-rw-r--r--vcl/source/control/listctrl.cxx10
-rw-r--r--vcl/source/edit/vclmedit.cxx8
-rw-r--r--vcl/source/treelist/svimpbox.cxx11
3 files changed, 21 insertions, 8 deletions
diff --git a/vcl/source/control/listctrl.cxx b/vcl/source/control/listctrl.cxx
index b3b4a1a2ca20..7ac9ee0f6773 100644
--- a/vcl/source/control/listctrl.cxx
+++ b/vcl/source/control/listctrl.cxx
@@ -161,9 +161,15 @@ bool ListControl::EventNotify( NotifyEvent& rNEvt )
if (rNEvt.GetType() == MouseNotifyEvent::COMMAND)
{
const CommandEvent* pEvent = rNEvt.GetCommandEvent();
- if (pEvent && pEvent->GetCommand() == CommandEventId::Wheel)
+ if (pEvent)
{
- HandleScrollCommand(*pEvent, nullptr, mpScrollBar.get());
+ CommandEventId nCommand = pEvent->GetCommand();
+
+ if (nCommand == CommandEventId::Wheel ||
+ nCommand == CommandEventId::Gesture)
+ {
+ HandleScrollCommand(*pEvent, nullptr, mpScrollBar.get());
+ }
}
}
return true;
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 1419602fa34b..df9e23683d62 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -625,9 +625,11 @@ void ImpVclMEdit::Enable( bool bEnable )
bool ImpVclMEdit::HandleCommand( const CommandEvent& rCEvt )
{
bool bDone = false;
- if ( ( rCEvt.GetCommand() == CommandEventId::Wheel ) ||
- ( rCEvt.GetCommand() == CommandEventId::StartAutoScroll ) ||
- ( rCEvt.GetCommand() == CommandEventId::AutoScroll ) )
+ CommandEventId nCommand = rCEvt.GetCommand();
+ if (nCommand == CommandEventId::Wheel ||
+ nCommand == CommandEventId::StartAutoScroll ||
+ nCommand == CommandEventId::AutoScroll ||
+ nCommand == CommandEventId::Gesture)
{
ScrollBar* pHScrollBar = mpHScrollBar->IsVisible() ? mpHScrollBar.get() : nullptr;
ScrollBar* pVScrollBar = mpVScrollBar->IsVisible() ? mpVScrollBar.get() : nullptr;
diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx
index e9b88fdf92b6..41bc706bab17 100644
--- a/vcl/source/treelist/svimpbox.cxx
+++ b/vcl/source/treelist/svimpbox.cxx
@@ -2895,15 +2895,20 @@ void SvImpLBox::PaintDDCursor(SvTreeListEntry* pEntry, bool bShow)
void SvImpLBox::Command( const CommandEvent& rCEvt )
{
- CommandEventId nCommand = rCEvt.GetCommand();
+ CommandEventId nCommand = rCEvt.GetCommand();
if( nCommand == CommandEventId::ContextMenu )
m_aEditIdle.Stop();
// scroll mouse event?
- if( ( ( nCommand == CommandEventId::Wheel ) || ( nCommand == CommandEventId::StartAutoScroll ) || ( nCommand == CommandEventId::AutoScroll ) )
- && m_pView->HandleScrollCommand( rCEvt, m_aHorSBar.get(), m_aVerSBar.get() ) )
+ if (nCommand == CommandEventId::Wheel ||
+ nCommand == CommandEventId::StartAutoScroll ||
+ nCommand == CommandEventId::AutoScroll ||
+ nCommand == CommandEventId::Gesture)
+ {
+ if (m_pView->HandleScrollCommand(rCEvt, m_aHorSBar.get(), m_aVerSBar.get()))
return;
+ }
if( m_bContextMenuHandling && nCommand == CommandEventId::ContextMenu )
{