Update clicked header

2 files changed, 15 insertions, 13 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/OptionDropdownWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/OptionDropdownWidget.java
index 1088b016..0a96ade0 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/OptionDropdownWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/partyfinder/OptionDropdownWidget.java
@@ -73,13 +73,12 @@ public class OptionDropdownWidget extends ElementListWidget<OptionDropdownWidget
             return true;
         }
 
-        boolean superClicked = super.mouseClicked(mouseX, mouseY, button);
+        if (super.mouseClicked(mouseX, mouseY, button)) return true;
 
-        if (!superClicked && clickedHeader((int)(mouseX - (double)(this.getX() + this.width / 2 - this.getRowWidth() / 2)), (int)(mouseY - (double)this.getY()) + (int)this.getScrollY() - 4)) {
-        	return true;
+        if (clickedHeader((int) (mouseX - (double) (this.getX() + this.width / 2 - this.getRowWidth() / 2)), (int) (mouseY - (double) this.getY()) + (int) this.getScrollY() - 4)) {
+            return true;
         }
-
-        return superClicked;
+        return false;
     }
 
     @Override
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/waypoint/DropdownWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/DropdownWidget.java
index 1d8bf63f..9ae0a9df 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/waypoint/DropdownWidget.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/DropdownWidget.java
@@ -42,16 +42,19 @@ public class DropdownWidget<T> extends ElementListWidget<DropdownWidget.Entry<T>
     }
 
     @Override
-    public boolean mouseClicked(double mouseX, double mouseY, int button) {
-    	boolean superClicked = super.mouseClicked(mouseX, mouseY, button);
-
-    	if (!superClicked && this.getEntryAtPosition(mouseX, mouseY) == null) {
-    		if ((!open && this.isMouseOver(mouseX, mouseY)) || open) open = !open;
+    protected int getScrollbarX() {
+        return getRowRight() + 2;
+    }
 
-    		return true;
-    	}
+    @Override
+    public boolean mouseClicked(double mouseX, double mouseY, int button) {
+        if (super.mouseClicked(mouseX, mouseY, button)) return true;
 
-    	return superClicked;
+        if (this.getEntryAtPosition(mouseX, mouseY) == null && (open || this.isMouseOver(mouseX, mouseY))) {
+            open = !open;
+            return true;
+        }
+        return false;
     }
 
     @Override