[scene2d.ui] ScrollPane, fixed scrolling via mouse wheel when there a…

…re scrollbars in only one direction.
libgdx · Dec 27, 2020 · f3a7c6b · f3a7c6b
1 parent 7933720
commit f3a7c6b
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/gdx/src/com/badlogic/gdx/scenes/scene2d/ui/ScrollPane.java b/gdx/src/com/badlogic/gdx/scenes/scene2d/ui/ScrollPane.java
@@ -105,7 +105,7 @@ public ScrollPane (@Null Actor widget, ScrollPaneStyle style) {
 		addScrollListener();
 	}
 
-	protected void addCaptureListener() {
+	protected void addCaptureListener () {
 		addCaptureListener(new InputListener() {
 			private float handlePosition;
 
@@ -182,7 +182,7 @@ public boolean mouseMoved (InputEvent event, float x, float y) {
 		});
 	}
 
-	protected ActorGestureListener getFlickScrollListener() {
+	protected ActorGestureListener getFlickScrollListener () {
 		return new ActorGestureListener() {
 			public void pan (InputEvent event, float x, float y, float deltaX, float deltaY) {
 				setScrollbarsVisible(true);
@@ -216,11 +216,16 @@ public boolean handle (Event event) {
 		};
 	}
 
-	protected void addScrollListener() {
+	protected void addScrollListener () {
 		addListener(new InputListener() {
 			public boolean scrolled (InputEvent event, float x, float y, float scrollAmountX, float scrollAmountY) {
 				setScrollbarsVisible(true);
 				if (scrollY || scrollX) {
+					if (scrollY) {
+						if (!scrollX && scrollAmountY == 0) scrollAmountY = scrollAmountX;
+					} else {
+						if (scrollX && scrollAmountX == 0) scrollAmountX = scrollAmountY;
+					}
 					setScrollY(amountY + getMouseWheelY() * scrollAmountY);
 					setScrollX(amountX + getMouseWheelX() * scrollAmountX);
 				} else