Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2020-05-10 13:34:57 -04:00
parent 2cb9cfb097 11d2ed06cd
commit 07701f8c01
2 changed files with 51 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/mindustry/editor/MapView.java
View File

@@ -72,9 +72,14 @@ public class MapView extends Element implements GestureListener{
return false;
}
if(!mobile && button != KeyCode.mouseLeft && button != KeyCode.mouseMiddle){
if(!mobile && button != KeyCode.mouseLeft && button != KeyCode.mouseMiddle && button != KeyCode.mouseRight){
return true;
}
if(button == KeyCode.mouseRight){
lastTool = tool;
tool = EditorTool.eraser;
}
if(button == KeyCode.mouseMiddle){
lastTool = tool;
@@ -102,7 +107,7 @@ public class MapView extends Element implements GestureListener{
@Override
public void touchUp(InputEvent event, float x, float y, int pointer, KeyCode button){
if(!mobile && button != KeyCode.mouseLeft && button != KeyCode.mouseMiddle){
if(!mobile && button != KeyCode.mouseLeft && button != KeyCode.mouseMiddle && button != KeyCode.mouseRight){
return;
}
@@ -117,7 +122,7 @@ public class MapView extends Element implements GestureListener{
editor.flushOp();
if(button == KeyCode.mouseMiddle && lastTool != null){
if((button == KeyCode.mouseMiddle || button == KeyCode.mouseRight) && lastTool != null){
tool = lastTool;
lastTool = null;
}