Don't switch between fast and normal scroll during drag in listviews
Signed-off-by: Vojtech Bocek <vbocek@gmail.com>
Change-Id: I925adda7f417c6e578f501babc8ef2bec638f66b
diff --git a/gui/listbox.cpp b/gui/listbox.cpp
index a4976f4..6709664 100644
--- a/gui/listbox.cpp
+++ b/gui/listbox.cpp
@@ -602,7 +602,7 @@
int GUIListBox::NotifyTouch(TOUCH_STATE state, int x, int y)
{
- static int lastY = 0, last2Y = 0;
+ static int lastY = 0, last2Y = 0, fastScroll = 0;
int selection = 0;
switch (state)
@@ -617,6 +617,9 @@
mUpdate = 1;
startY = lastY = last2Y = y;
scrollingSpeed = 0;
+
+ if(mFastScrollRectX != -1 && x >= mRenderX + mRenderW - mFastScrollW)
+ fastScroll = 1;
break;
case TOUCH_DRAG:
@@ -631,7 +634,7 @@
}
// Fast scroll
- if(mFastScrollRectX != -1 && x >= mRenderX + mRenderW - mFastScrollW)
+ if(fastScroll)
{
int pct = ((y-mRenderY-mHeaderH)*100)/(mRenderH-mHeaderH);
int totalSize = mList.size();
@@ -705,6 +708,7 @@
case TOUCH_RELEASE:
isHighlighted = false;
+ fastScroll = 0;
if (startSelection >= 0)
{
// We've selected an item!