From ac86ea83bea7d0fac31b478bb1cda9d68908dffb Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Mon, 11 Mar 2013 00:24:40 +0100
Subject: [PATCH] Make it a bit easier to select stuff in lists.

---
 ui/ui.cpp | 6 +++++-
 ui/ui.h   | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ui/ui.cpp b/ui/ui.cpp
index 4c209d88be..14cd15e9db 100644
--- a/ui/ui.cpp
+++ b/ui/ui.cpp
@@ -280,6 +280,7 @@ void StringVectorListAdapter::drawItem(int item, int x, int y, int w, int h, boo
 
 UIList::UIList()
 	: scrollY(0.0f), startDragY(0.0f), dragFinger(-1), selected(-1) {
+	movedDistanceX = 0.0f;
 	movedDistanceY = 0.0f;
 	scrolling = false;
 	inertiaY = 0.0f;
@@ -292,14 +293,17 @@ void UIList::pointerDown(int pointer, float x, float y) {
 
 	startScrollY = scrollY;
 	startDragY = y;
+	movedDistanceX = 0.0f;
 	movedDistanceY = 0.0f;
 }
 
 const int holdFrames = 6;
 
 void UIList::pointerMove(int pointer, float x, float y, bool inside) {
+	float deltaX = x - lastX;
 	float deltaY = y - lastY;
 	movedDistanceY += fabsf(deltaY);
+	movedDistanceX += fabsf(deltaX);
 
 	if (inertiaY <= 0.0f && deltaY > 0.0f) {
 		inertiaY = -deltaY;
@@ -309,7 +313,7 @@ void UIList::pointerMove(int pointer, float x, float y, bool inside) {
 		inertiaY = 0.8 * inertiaY + 0.2 * -deltaY;
 	}
 
-	if (inside && movedDistanceY > 10 && !scrolling && uistate.mouseframesdown[0] > holdFrames) {
+	if (inside && movedDistanceY > 35 && movedDistanceY > movedDistanceX && !scrolling && uistate.mouseframesdown[0] > holdFrames) {
 		scrolling = true;
 	}
 }
diff --git a/ui/ui.h b/ui/ui.h
index aad8fa0675..e5d9dd55a6 100644
--- a/ui/ui.h
+++ b/ui/ui.h
@@ -220,6 +220,7 @@ public:
 	float lastX;
 	float lastY;
 	float startDragY;
+	float movedDistanceX;
 	float movedDistanceY;
 	float inertiaY;