From ffb6d398d7190a4ab3a6f8b313dd45e0a8cb2894 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 12 May 2019 12:00:19 -0400 Subject: [PATCH] Layout fixes --- build.gradle | 2 +- core/src/io/anuke/mindustry/input/MobileInput.java | 2 +- core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java | 4 ++-- gradle.properties | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 9f587e2791..a012b33279 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ allprojects{ arcHash = null debugged = { - return new File(projectDir.parent, '../debug').exists() && !project.hasProperty("release") + return new File(projectDir.parent, '../debug').exists() && !project.hasProperty("release") && project.hasProperty("args") } localArc = { diff --git a/core/src/io/anuke/mindustry/input/MobileInput.java b/core/src/io/anuke/mindustry/input/MobileInput.java index f4572b968e..7d592a83ad 100644 --- a/core/src/io/anuke/mindustry/input/MobileInput.java +++ b/core/src/io/anuke/mindustry/input/MobileInput.java @@ -266,7 +266,7 @@ public class MobileInput extends InputHandler implements GestureListener{ public void buildUI(Table table){ table.addImage("blank").color(Pal.accent).height(3f).colspan(4).growX(); table.row(); - table.left().margin(0f).defaults().size(49f); + table.left().margin(0f).defaults().size(48f); table.addImageButton("icon-break", "clear-toggle-partial", 16 * 2f, () -> { mode = mode == breaking ? block == null ? none : placing : breaking; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java index 7ea5b5b683..a38ffa4af7 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java @@ -34,9 +34,9 @@ public class DiscordDialog extends Dialog{ }).size(h).left(); t.add("$discord").color(Pal.accent).growX().padLeft(10f); - }).size(470f, h).pad(10f); + }).size(440f, h).pad(10f); - buttons.defaults().size(170f, 50); + buttons.defaults().size(150f, 50); buttons.addButton("$back", this::hide); buttons.addButton("$copylink", () -> { diff --git a/gradle.properties b/gradle.properties index 28fb6f7a7c..ae64744685 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -android.enableD8=true \ No newline at end of file +android.enableD8.desugaring=false \ No newline at end of file