mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-11 11:17:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Updated to build 32, UI layout fixes

Browse Source
This commit is contained in:
Anuken 2018-03-07 00:04:37 -05:00
parent 594c49ac91
commit 565c3ed12f
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/assets/version.properties
View File

@ -1,7 +1,7 @@
#Autogenerated file. Do not modify. #Autogenerated file. Do not modify.
#Tue Mar 06 23:33:29 EST 2018 #Wed Mar 07 00:00:12 EST 2018
version=release version=release
androidBuildCode=337 androidBuildCode=339
name=Mindustry name=Mindustry
code=3.4 code=3.4
build=custom build build=32

19
core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
View File

@ -1,6 +1,7 @@
package io.anuke.mindustry.ui.dialogs; package io.anuke.mindustry.ui.dialogs;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Array;
import io.anuke.mindustry.Vars; import io.anuke.mindustry.Vars;
import io.anuke.mindustry.io.Platform; 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.ImageButton;
import io.anuke.ucore.scene.ui.ScrollPane; import io.anuke.ucore.scene.ui.ScrollPane;
import io.anuke.ucore.scene.ui.TextButton; 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.scene.ui.layout.Table;
import io.anuke.ucore.util.Bundles; import io.anuke.ucore.util.Bundles;
import io.anuke.ucore.util.Log; 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, () -> { content().addCenteredImageTextButton("$text.server.add", "icon-add", "clear", 14*3, () -> {
renaming = null; renaming = null;
add.show(); 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){ void addLocalHosts(Array<Host> array){

3
html/src/io/anuke/mindustry/client/WebsocketClient.java
View File

@ -121,7 +121,8 @@ public class WebsocketClient implements ClientProvider {
if (!msg.startsWith("---")) return; if (!msg.startsWith("---")) return;
String[] text = msg.substring(3).split("\\|"); String[] text = msg.substring(3).split("\\|");
Host host = new Host(text[1], address, text[2], Strings.parseInt(text[3]), 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); valid.accept(host);
accepted[0] = true; accepted[0] = true;
socket.close(); socket.close();