From 565c3ed12f04f9a3f1f9bd41613c2e82219e5ba3 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 7 Mar 2018 00:04:37 -0500
Subject: [PATCH] Updated to build 32, UI layout fixes

---
 core/assets/version.properties                |  6 +++---
 .../mindustry/ui/dialogs/JoinDialog.java      | 19 ++++++++++++++++++-
 .../mindustry/client/WebsocketClient.java     |  3 ++-
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/core/assets/version.properties b/core/assets/version.properties
index a815b954a7..8ac18e8dfc 100644
--- a/core/assets/version.properties
+++ b/core/assets/version.properties
@@ -1,7 +1,7 @@
 #Autogenerated file. Do not modify.
-#Tue Mar 06 23:33:29 EST 2018
+#Wed Mar 07 00:00:12 EST 2018
 version=release
-androidBuildCode=337
+androidBuildCode=339
 name=Mindustry
 code=3.4
-build=custom build
+build=32
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
index adef04a1b7..c86285f8cf 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
@@ -1,6 +1,7 @@
 package io.anuke.mindustry.ui.dialogs;
 
 import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.math.MathUtils;
 import com.badlogic.gdx.utils.Array;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.io.Platform;
@@ -14,6 +15,7 @@ import io.anuke.ucore.scene.ui.Dialog;
 import io.anuke.ucore.scene.ui.ImageButton;
 import io.anuke.ucore.scene.ui.ScrollPane;
 import io.anuke.ucore.scene.ui.TextButton;
+import io.anuke.ucore.scene.ui.layout.Cell;
 import io.anuke.ucore.scene.ui.layout.Table;
 import io.anuke.ucore.util.Bundles;
 import io.anuke.ucore.util.Log;
@@ -217,7 +219,22 @@ public class JoinDialog extends FloatingDialog {
         content().addCenteredImageTextButton("$text.server.add", "icon-add", "clear", 14*3, () -> {
             renaming = null;
             add.show();
-        }).width(w).height(80f);
+        }).marginLeft(6).width(w).height(80f).update(button -> {
+            float pw = w;
+            float pad = 0f;
+            if(pane.getChildren().first().getPrefHeight() > pane.getHeight()){
+                pw = w + 30;
+                pad = 6;
+            }
+
+            Cell<TextButton> cell = ((Table)pane.getParent()).getCell(button);
+
+            if(!MathUtils.isEqual(cell.getMinWidth(), pw)){
+                cell.width(pw);
+                cell.padLeft(pad);
+                pane.getParent().invalidateHierarchy();
+            }
+        });
     }
 
     void addLocalHosts(Array<Host> array){
diff --git a/html/src/io/anuke/mindustry/client/WebsocketClient.java b/html/src/io/anuke/mindustry/client/WebsocketClient.java
index 19b944433e..450a85107f 100644
--- a/html/src/io/anuke/mindustry/client/WebsocketClient.java
+++ b/html/src/io/anuke/mindustry/client/WebsocketClient.java
@@ -121,7 +121,8 @@ public class WebsocketClient implements ClientProvider {
                         if (!msg.startsWith("---")) return;
                         String[] text = msg.substring(3).split("\\|");
                         Host host = new Host(text[1], address, text[2], Strings.parseInt(text[3]),
-                                Strings.parseInt(text[0]), Strings.parseInt(text[4]));
+                                Strings.parseInt(text[0]),
+                                text.length > 4 && Strings.canParsePostiveInt(text[4]) ? Strings.parseInt(text[4]) : 0);
                         valid.accept(host);
                         accepted[0] = true;
                         socket.close();