PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't switch between fast and normal scroll during drag in listviews" into android-4.4

Browse Source
This commit is contained in:
Dees Troy
2014-02-06 20:08:17 +01:00
committed by Gerrit Code Review
parent a21b052589 59e51a4349
commit 5f1c7e3dce
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui/fileselector.cpp
+6 -2
View File
@@ -659,7 +659,7 @@ int GUIFileSelector::GetSelection(int x, int y)
int GUIFileSelector::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)
@@ -674,6 +674,9 @@ int GUIFileSelector::NotifyTouch(TOUCH_STATE state, int x, int y)
mUpdate = 1;
startY = lastY = last2Y = y;
scrollingSpeed = 0;
if(mFastScrollRectX != -1 && x >= mRenderX + mRenderW - mFastScrollW)
fastScroll = 1;
break;
case TOUCH_DRAG:
// Check if we dragged out of the selection window
@@ -687,7 +690,7 @@ int GUIFileSelector::NotifyTouch(TOUCH_STATE state, int x, int y)
}
// Fast scroll
if(mFastScrollRectX != -1 && x >= mRenderX + mRenderW - mFastScrollW)
if(fastScroll)
{
int pct = ((y-mRenderY-mHeaderH)*100)/(mRenderH-mHeaderH);
int totalSize = (mShowFolders ? mFolderList.size() : 0) + (mShowFiles ? mFileList.size() : 0);
@@ -761,6 +764,7 @@ int GUIFileSelector::NotifyTouch(TOUCH_STATE state, int x, int y)
case TOUCH_RELEASE:
isHighlighted = false;
fastScroll = 0;
if (startSelection >= 0)
{
// We've selected an item!
gui/listbox.cpp
+6 -2
View File
@@ -602,7 +602,7 @@ int GUIListBox::GetSelection(int x, int y)
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 @@ int GUIListBox::NotifyTouch(TOUCH_STATE state, int x, int y)
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 @@ int GUIListBox::NotifyTouch(TOUCH_STATE state, int x, int y)
}
// 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 @@ int GUIListBox::NotifyTouch(TOUCH_STATE state, int x, int y)
case TOUCH_RELEASE:
isHighlighted = false;
fastScroll = 0;
if (startSelection >= 0)
{
// We've selected an item!