From 7f1193bb7747f868f35abc4e904a06b635fad68d Mon Sep 17 00:00:00 2001
From: Jeffrey Han <itdelatrisu@gmail.com>
Date: Wed, 9 Sep 2015 13:25:48 -0400
Subject: [PATCH] Slight changes to DropdownMenu behavior.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
---
 .../opsu/states/DownloadsMenu.java            |  8 ++--
 src/itdelatrisu/opsu/ui/DropdownMenu.java     | 38 +++++++++----------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/src/itdelatrisu/opsu/states/DownloadsMenu.java b/src/itdelatrisu/opsu/states/DownloadsMenu.java
index ec1d4e07..b019ef0f 100644
--- a/src/itdelatrisu/opsu/states/DownloadsMenu.java
+++ b/src/itdelatrisu/opsu/states/DownloadsMenu.java
@@ -524,8 +524,12 @@ public class DownloadsMenu extends BasicGameState {
 		}
 
 		// dropdown menu
-		if (serverMenu.click(x, y)) {
+		int oldServerIndex = serverMenu.getSelectedIndex(), serverMenuClickResult = serverMenu.click(x, y);
+		if (serverMenuClickResult > -2) {
 			SoundController.playSound(SoundEffect.MENUCLICK);
+			if (serverMenuClickResult == -1 || serverMenuClickResult == oldServerIndex)
+				return;
+
 			resultList = null;
 			startResult = 0;
 			focusResult = -1;
@@ -541,8 +545,6 @@ public class DownloadsMenu extends BasicGameState {
 			resetSearchTimer();
 			return;
 		}
-		if (serverMenu.contains(x, y))
-			return;
 
 		// search results
 		DownloadNode[] nodes = resultList;
diff --git a/src/itdelatrisu/opsu/ui/DropdownMenu.java b/src/itdelatrisu/opsu/ui/DropdownMenu.java
index ac55efec..5a9fbb5b 100644
--- a/src/itdelatrisu/opsu/ui/DropdownMenu.java
+++ b/src/itdelatrisu/opsu/ui/DropdownMenu.java
@@ -173,6 +173,12 @@ public class DropdownMenu<E> {
 	 */
 	public boolean isOpen() { return expanded; }
 
+	/**
+	 * Opens or closes the dropdown menu.
+	 * @param flag true to open, false to close
+	 */
+	public void open(boolean flag) { this.expanded = flag; }
+
 	/**
 	 * Returns true if the coordinates are within the menu bounds.
 	 * @param cx the x coordinate
@@ -180,8 +186,8 @@ public class DropdownMenu<E> {
 	 */
 	public boolean contains(float cx, float cy) {
 		return (cx > x && cx < x + width && (
-				(cy > y && cy < y + baseHeight) ||
-				(expanded && cy > y + offsetY && cy < y + height)));
+		        (cy > y && cy < y + baseHeight) ||
+		        (expanded && cy > y + offsetY && cy < y + height)));
 	}
 
 	/**
@@ -280,35 +286,25 @@ public class DropdownMenu<E> {
 	 * Registers a click at the given location.
 	 * If the base item is clicked and the menu is unexpanded, it will be expanded;
 	 * in all other cases, the menu will be unexpanded. If an item different from
-	 * the current one is selected, this will select that item and return {@code true}.
-	 * Otherwise, this will return {@code false}.
+	 * the current one is selected, that item will be selected.
 	 * @param cx the x coordinate
 	 * @param cy the y coordinate
+	 * @return the index of the item at the given location, -1 for the base item,
+	 *         and -2 if there is no item at the location
 	 */
-	public boolean click(float cx, float cy) {
+	public int click(float cx, float cy) {
 		int idx = getIndexAt(cx, cy);
-		if (idx == -2) {
-			this.expanded = false;
-			return false;
-		} else if (idx == -1) {
-			this.expanded = !expanded;
-			return false;
-		} else {
-			this.expanded = false;
-			if (itemIndex == idx)
-				return false;
-			else {
-				itemIndex = idx;
-				return true;
-			}
-		}
+		this.expanded = (idx == -1) ? !expanded : false;
+		if (idx >= 0)
+			this.itemIndex = idx;
+		return idx;
 	}
 
 	/**
 	 * Resets the menu state.
 	 */
 	public void reset() {
-		expanded = false;
+		this.expanded = false;
 		expandProgress.setTime(0);
 	}