diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Button.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Button.java index db866454d..8cff3d97b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Button.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Button.java @@ -144,12 +144,8 @@ public class Button extends Component { protected void onPointerDown() {} protected void onPointerUp() {} protected void onClick() {} //left click, default key type - protected void onRightClick() { - onClick(); - } - protected void onMiddleClick() { - onClick(); - } + protected void onRightClick() {} + protected void onMiddleClick() {} protected boolean onLongClick() { return false; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/InventoryPane.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/InventoryPane.java index 6a6d6674a..bee6e380e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/InventoryPane.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/InventoryPane.java @@ -498,9 +498,8 @@ public class InventoryPane extends Component { if (targeting){ if (targetingSlot == this){ onClick(); - } else{ - cancelTargeting(); } + return; } if (selector == null && item.defaultAction != null){ @@ -510,7 +509,7 @@ public class InventoryPane extends Component { InventoryPane.useTargeting(); } } else { - super.onMiddleClick(); + onClick(); } } @@ -522,11 +521,8 @@ public class InventoryPane extends Component { } if (targeting){ - if (targetingSlot == this){ - onClick(); - } else{ - cancelTargeting(); - } + //do nothing + return; } if (selector == null){ @@ -537,7 +533,7 @@ public class InventoryPane extends Component { mousePos = camera.screenToCamera((int)mousePos.x, (int)mousePos.y); r.setPos(mousePos.x-3, mousePos.y-3); } else { - super.onRightClick(); + //do nothing } } }