Make configuring the onscreen controls less annoying.

Now instead of the top left corner of the button snapping to your finger.
Remember where we clicked on the button initially so it moves from the same location you touched.
This is more intuitive than before of course.

1 files changed, 15 insertions, 2 deletions

diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/overlayconfig/OverlayConfigButton.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/overlayconfig/OverlayConfigButton.java
index c450837df6..30288179ef 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/overlayconfig/OverlayConfigButton.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/input/overlayconfig/OverlayConfigButton.java
@@ -41,6 +41,10 @@ public final class OverlayConfigButton extends Button implements OnTouchListener
 	// float buttonY = sPrefs.getFloat(buttonId+"-Y", -1f);
 	//
 	private final String buttonId;
+
+	// The offset of the press while moving the button
+	private float moveOffsetX, moveOffsetY;
+
 	private Drawable resizeDrawable(Drawable image, float scale)
 	{
 		// Retrieve screen dimensions.
@@ -97,11 +101,20 @@ public final class OverlayConfigButton extends Button implements OnTouchListener
 	{
 		switch(event.getAction())
 		{
+			// Get the offset of the press within the button
+			// The event X and Y locations are the offset within the button, not the screen
+			case MotionEvent.ACTION_DOWN:
+			{
+				moveOffsetX = event.getX();
+				moveOffsetY = event.getY();
+				return true;
+			}
+
 			// Only change the X/Y coordinates when we move the button.
 			case MotionEvent.ACTION_MOVE:
 			{
-				setX(getX() + event.getX());
-				setY(getY() + event.getY());
+				setX(getX() + event.getX() - moveOffsetX);
+				setY(getY() + event.getY() - moveOffsetY);
 				return true;
 			}