From e2e6024e8f45cac409fcf08bca6ffded7da8763f Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 28 Nov 2018 14:00:51 -0500 Subject: [PATCH] Pan tweak --- core/src/io/anuke/mindustry/input/MobileInput.java | 4 +++- core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/io/anuke/mindustry/input/MobileInput.java b/core/src/io/anuke/mindustry/input/MobileInput.java index ea26deb6b0..dba880f8c0 100644 --- a/core/src/io/anuke/mindustry/input/MobileInput.java +++ b/core/src/io/anuke/mindustry/input/MobileInput.java @@ -45,6 +45,7 @@ public class MobileInput extends InputHandler implements GestureListener{ //gesture data private Vector2 vector = new Vector2(); + private boolean canPan; private boolean zoomed = false; /** Set of completed guides. */ private ObjectSet guides = new ObjectSet<>(); @@ -650,7 +651,7 @@ public class MobileInput extends InputHandler implements GestureListener{ @Override public boolean pan(float x, float y, float deltaX, float deltaY){ - if(ui.hasMouse()) return false; + if(!canPan) return false; //can't pan in line mode with one finger or while dropping items! if((lineMode && !Gdx.input.isTouched(1)) || droppingItem){ @@ -704,6 +705,7 @@ public class MobileInput extends InputHandler implements GestureListener{ @Override public boolean touchDown(float x, float y, int pointer, int button){ + canPan = !ui.hasMouse(); return false; } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java index a05dc70e5d..cc3de460cb 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java @@ -258,7 +258,7 @@ public class JoinDialog extends FloatingDialog{ local.background("button"); local.add("$text.hosts.none").pad(10f); local.add().growX(); - local.addImageButton("icon-loading", 16 * 2f, this::refreshLocal).pad(-10f).padLeft(0).padTop(-6).size(70f, 74f); + local.addImageButton("icon-loading", 16 * 2f, this::refreshLocal).pad(-12f).padLeft(0).size(70f); }else{ local.background((Drawable) null); }