This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository colobot.
commit c00a7fd13241272106e6a4f78977a8d766b0e86e Author: krzys-h <krzy...@interia.pl> Date: Fri Apr 22 19:20:31 2016 +0200 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 0cb3763..c46d5b0 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<MouseWheelEventData>(); 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 cb3d5bb..21bb3d4 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 dc4de23..88d36d9 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 256a67b..e47e561 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 6a85178..a492600 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; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits