ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #2464 from open-osrs/mousemanager-revert

Browse Source 
mousemanager: revert
This commit is contained in:
Kyle
2020-03-27 21:26:49 +00:00
committed by GitHub
parent 52c9d2b5a8 6d657a950f
commit 0f2668223b
1 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
runelite-client/src/main/java/net/runelite/client/input/MouseManager.java
View File

@@ -33,8 +33,6 @@ import javax.inject.Singleton;
@Singleton
public class MouseManager
{
// Button numbers greater than BUTTON3 have no constant identifier
private static final int MOUSE_BUTTON_4 = 4;
private final List<MouseListener> mouseListeners = new CopyOnWriteArrayList<>();
private final List<MouseWheelListener> mouseWheelListeners = new CopyOnWriteArrayList<>();
@@ -77,7 +75,6 @@ public class MouseManager
public MouseEvent processMousePressed(MouseEvent mouseEvent)
{
checkExtraMouseButtons(mouseEvent);
for (MouseListener mouseListener : mouseListeners)
{
mouseEvent = mouseListener.mousePressed(mouseEvent);
@@ -87,7 +84,6 @@ public class MouseManager
public MouseEvent processMouseReleased(MouseEvent mouseEvent)
{
checkExtraMouseButtons(mouseEvent);
for (MouseListener mouseListener : mouseListeners)
{
mouseEvent = mouseListener.mouseReleased(mouseEvent);
@@ -97,7 +93,6 @@ public class MouseManager
public MouseEvent processMouseClicked(MouseEvent mouseEvent)
{
checkExtraMouseButtons(mouseEvent);
for (MouseListener mouseListener : mouseListeners)
{
mouseEvent = mouseListener.mouseClicked(mouseEvent);
@@ -105,17 +100,6 @@ public class MouseManager
return mouseEvent;
}
private void checkExtraMouseButtons(MouseEvent mouseEvent)
{
// Prevent extra mouse buttins from being passed into the client,
// as it treats them all as left click
int button = mouseEvent.getButton();
if (button >= MOUSE_BUTTON_4)
{
mouseEvent.consume();
}
}
public MouseEvent processMouseEntered(MouseEvent mouseEvent)
{
for (MouseListener mouseListener : mouseListeners)
@@ -160,4 +144,4 @@ public class MouseManager
}
return mouseWheelEvent;
}
}
}