From 8a5e05364a5dd10924687674e5c9fdd48b825c29 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Wed, 8 Oct 2025 13:30:35 -0400
Subject: [PATCH] v3.3.0: adjusted ScrollPane to use PointerArea's onClick
 logic

---
 .../shatteredpixeldungeon/ui/ScrollPane.java     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ScrollPane.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ScrollPane.java
index d066c2c2b..ea0abad3f 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ScrollPane.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ScrollPane.java
@@ -180,19 +180,19 @@ public class ScrollPane extends Component {
 
 		@Override
 		protected void onPointerUp( PointerEvent event ) {
-			if (dragging) {
-
+			if (event == curEvent && dragging) {
 				dragging = false;
 				thumb.am = THUMB_ALPHA;
-
-			} else {
-
-				PointF p = content.camera.screenToCamera( (int) event.current.x, (int) event.current.y );
-				ScrollPane.this.onClick( p.x, p.y );
-
+				curEvent = null; //cancel here so onClick is skipped
 			}
 		}
 
+		@Override
+		protected void onClick(PointerEvent event) {
+			PointF p = content.camera.screenToCamera((int) event.current.x, (int) event.current.y);
+			ScrollPane.this.onClick(p.x, p.y);
+		}
+
 		private boolean dragging = false;
 		private PointF lastPos = new PointF();