From c00a7fd13241272106e6a4f78977a8d766b0e86e Mon Sep 17 00:00:00 2001 From: krzys-h Date: Fri, 22 Apr 2016 19:20:31 +0200 Subject: [PATCH] Do not zoom while scrolling lists, closes #769 --- src/ui/controls/edit.cpp | 2 +- src/ui/controls/editvalue.cpp | 1 + src/ui/controls/list.cpp | 2 +- src/ui/controls/scroll.cpp | 1 + src/ui/controls/slider.cpp | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/ui/controls/edit.cpp b/src/ui/controls/edit.cpp index 0cb3763b..c46d5b0b 100644 --- a/src/ui/controls/edit.cpp +++ b/src/ui/controls/edit.cpp @@ -248,7 +248,7 @@ bool CEdit::EventProcess(const Event &event) { auto data = event.GetData(); Scroll(m_lineFirst - data->y, true); - return true; + return false; } CControl::EventProcess(event); diff --git a/src/ui/controls/editvalue.cpp b/src/ui/controls/editvalue.cpp index cb3d5bb8..21bb3d46 100644 --- a/src/ui/controls/editvalue.cpp +++ b/src/ui/controls/editvalue.cpp @@ -190,6 +190,7 @@ bool CEditValue::EventProcess(const Event &event) if ( value > m_maxValue ) value = m_maxValue; SetValue(value, true); HiliteValue(event); + return false; } return true; diff --git a/src/ui/controls/list.cpp b/src/ui/controls/list.cpp index dc4de23e..88d36d94 100644 --- a/src/ui/controls/list.cpp +++ b/src/ui/controls/list.cpp @@ -288,7 +288,7 @@ bool CList::EventProcess(const Event &event) UpdateScroll(); UpdateButton(); - return true; + return false; } CControl::EventProcess(event); diff --git a/src/ui/controls/scroll.cpp b/src/ui/controls/scroll.cpp index 256a67b6..e47e561f 100644 --- a/src/ui/controls/scroll.cpp +++ b/src/ui/controls/scroll.cpp @@ -291,6 +291,7 @@ bool CScroll::EventProcess(const Event &event) m_event->AddEvent(Event(m_buttonDown->GetEventType())); } } + return false; } return true; diff --git a/src/ui/controls/slider.cpp b/src/ui/controls/slider.cpp index 6a851782..a4926005 100644 --- a/src/ui/controls/slider.cpp +++ b/src/ui/controls/slider.cpp @@ -356,6 +356,7 @@ bool CSlider::EventProcess(const Event &event) m_event->AddEvent(Event(m_buttonRight->GetEventType())); } } + return false; } return true;