From 2112c5c654b846b627e18131c7f8a4a00d3729e4 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 3 Oct 2024 22:39:21 -0400 Subject: [PATCH] Better portrait UI for mobile in-game editor --- core/src/mindustry/editor/MapEditorDialog.java | 1 + core/src/mindustry/input/MobileInput.java | 2 +- core/src/mindustry/ui/fragments/HudFragment.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/editor/MapEditorDialog.java b/core/src/mindustry/editor/MapEditorDialog.java index 29a18cb200..f7af548b61 100644 --- a/core/src/mindustry/editor/MapEditorDialog.java +++ b/core/src/mindustry/editor/MapEditorDialog.java @@ -271,6 +271,7 @@ public class MapEditorDialog extends Dialog implements Disposable{ )); world.endMapLoad(); player.set(world.width() * tilesize/2f, world.height() * tilesize/2f); + Core.camera.position.set(player); player.clearUnit(); for(var unit : Groups.unit){ diff --git a/core/src/mindustry/input/MobileInput.java b/core/src/mindustry/input/MobileInput.java index 470849fd81..fb9e24eac5 100644 --- a/core/src/mindustry/input/MobileInput.java +++ b/core/src/mindustry/input/MobileInput.java @@ -770,7 +770,7 @@ public class MobileInput extends InputHandler implements GestureListener{ } //zoom camera - if(!locked && Math.abs(Core.input.axisTap(Binding.zoom)) > 0 && !Core.input.keyDown(Binding.rotateplaced) && (Core.input.keyDown(Binding.diagonal_placement) || ((!player.isBuilder() || !isPlacing() || !block.rotate) && selectPlans.isEmpty()))){ + if(!locked && !scene.hasKeyboard() && !scene.hasScroll() && Math.abs(Core.input.axisTap(Binding.zoom)) > 0 && !Core.input.keyDown(Binding.rotateplaced) && (Core.input.keyDown(Binding.diagonal_placement) || ((!player.isBuilder() || !isPlacing() || !block.rotate) && selectPlans.isEmpty()))){ renderer.scaleCamera(Core.input.axisTap(Binding.zoom)); } diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java index 3708f11b34..91a9c1f8f6 100644 --- a/core/src/mindustry/ui/fragments/HudFragment.java +++ b/core/src/mindustry/ui/fragments/HudFragment.java @@ -391,6 +391,7 @@ public class HudFragment{ if(mobile){ editorMain.row().spacerY(() -> { if(control.input instanceof MobileInput mob){ + if(Core.graphics.isPortrait()) return Core.graphics.getHeight() / 2f / Scl.scl(1f); if(mob.hasSchematic()) return 156f; if(mob.showCancel()) return 50f; }