Add support for proxying mouseWheelMoved events

Lukafurlan123 · Mar 5, 2018 · 170991d · 170991d
1 parent ec77df3
commit 170991d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java
@@ -188,9 +188,9 @@ public static MouseEvent mouseMoved(MouseEvent mouseEvent)
 		return mouseManager.processMouseMoved(mouseEvent);
 	}
 
-	public static void mouseWheelMoved(MouseWheelEvent event)
+	public static MouseWheelEvent mouseWheelMoved(MouseWheelEvent event)
 	{
-		mouseManager.processMouseWheelMoved(event);
+		return mouseManager.processMouseWheelMoved(event);
 	}
 
 	public static void keyPressed(KeyEvent keyEvent)

diff --git a/runelite-client/src/main/java/net/runelite/client/input/MouseManager.java b/runelite-client/src/main/java/net/runelite/client/input/MouseManager.java
@@ -125,11 +125,12 @@ public MouseEvent processMouseMoved(MouseEvent mouseEvent)
 		return mouseEvent;
 	}
 
-	public void processMouseWheelMoved(MouseWheelEvent mouseWheelEvent)
+	public MouseWheelEvent processMouseWheelMoved(MouseWheelEvent mouseWheelEvent)
 	{
 		for (MouseWheelListener mouseWheelListener : mouseWheelListeners)
 		{
-			mouseWheelListener.mouseWheelMoved(mouseWheelEvent);
+			mouseWheelEvent = mouseWheelListener.mouseWheelMoved(mouseWheelEvent);
 		}
+		return mouseWheelEvent;
 	}
 }
diff --git a/runelite-client/src/main/java/net/runelite/client/input/MouseWheelListener.java b/runelite-client/src/main/java/net/runelite/client/input/MouseWheelListener.java
@@ -24,6 +24,12 @@
  */
 package net.runelite.client.input;
 
-public interface MouseWheelListener extends java.awt.event.MouseWheelListener
+import java.awt.event.MouseWheelEvent;
+
+public abstract class MouseWheelListener
 {
+	public MouseWheelEvent mouseWheelMoved(MouseWheelEvent event)
+	{
+		return event;
+	}
 }
diff --git a/runelite-mixins/src/main/java/net/runelite/client/callback/Hooks.java b/runelite-mixins/src/main/java/net/runelite/client/callback/Hooks.java
@@ -83,7 +83,7 @@ public static MouseEvent mouseMoved(MouseEvent mouseEvent)
 		throw new RuntimeException();
 	}
 
-	public static void mouseWheelMoved(MouseWheelEvent event)
+	public static MouseWheelEvent mouseWheelMoved(MouseWheelEvent event)
 	{
 		throw new RuntimeException();
 	}

diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSMouseWheelHandlerMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSMouseWheelHandlerMixin.java
@@ -41,7 +41,7 @@ public abstract class RSMouseWheelHandlerMixin implements RSMouseWheelHandler
 	@Replace("mouseWheelMoved")
 	public void mouseWheelMoved(MouseWheelEvent event)
 	{
-		Hooks.mouseWheelMoved(event);
+		event = Hooks.mouseWheelMoved(event);
 		if (!event.isConsumed())
 		{
 			rs$mouseWheelMoved(event);