Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Text field dialog cleanup

Browse Source
This commit is contained in:
Anuken
2020-07-15 10:01:01 -04:00
parent 7f6026bd52
commit fd89911dd4
11 changed files with 54 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/mindustry/ui/dialogs/CustomRulesDialog.java
View File

@@ -1,14 +1,13 @@
package mindustry.ui.dialogs;
import arc.*;
import arc.struct.*;
import arc.func.*;
import arc.graphics.*;
import arc.scene.style.*;
import arc.scene.ui.*;
import arc.scene.ui.layout.*;
import arc.struct.*;
import arc.util.*;
import mindustry.*;
import mindustry.content.*;
import mindustry.game.*;
import mindustry.gen.*;
@@ -189,10 +188,10 @@ public class CustomRulesDialog extends BaseDialog{
t.left();
t.add(text).left().padRight(5)
.update(a -> a.setColor(condition.get() ? Color.white : Color.gray));
Vars.platform.addDialog(t.field((integer ? (int)prov.get() : prov.get()) + "", s -> cons.get(Strings.parseFloat(s)))
t.field((integer ? (int)prov.get() : prov.get()) + "", s -> cons.get(Strings.parseFloat(s)))
.padRight(100f)
.update(a -> a.setDisabled(!condition.get()))
.valid(Strings::canParsePositiveFloat).width(120f).left().get());
.valid(Strings::canParsePositiveFloat).width(120f).left().addInputDialog();
}).padTop(0);
main.row();
}

6
core/src/mindustry/ui/dialogs/FileChooser.java
View File

@@ -1,13 +1,13 @@
package mindustry.ui.dialogs;
import arc.*;
import arc.struct.*;
import arc.files.*;
import arc.func.*;
import arc.graphics.g2d.*;
import arc.scene.event.*;
import arc.scene.ui.*;
import arc.scene.ui.layout.*;
import arc.struct.*;
import arc.util.*;
import arc.util.pooling.*;
import mindustry.gen.*;
@@ -15,8 +15,6 @@ import mindustry.ui.*;
import java.util.*;
import static mindustry.Vars.platform;
public class FileChooser extends BaseDialog{
private static final Fi homeDirectory = Core.files.absolute(Core.files.getExternalStoragePath());
private static Fi lastDirectory = homeDirectory;
@@ -56,7 +54,7 @@ public class FileChooser extends BaseDialog{
filefield = new TextField();
filefield.setOnlyFontChars(false);
if(!open) platform.addDialog(filefield);
if(!open) filefield.addInputDialog();
filefield.setDisabled(open);
ok = new TextButton(open ? "$load" : "$save");

6
core/src/mindustry/ui/dialogs/JoinDialog.java
View File

@@ -49,9 +49,7 @@ public class JoinDialog extends BaseDialog{
TextField field = add.cont.field(Core.settings.getString("ip"), text -> {
Core.settings.put("ip", text);
}).size(320f, 54f).get();
platform.addDialog(field, 100);
}).size(320f, 54f).maxTextLength(100).addInputDialog().get();
add.cont.row();
add.buttons.defaults().size(140f, 60f).pad(4f);
@@ -261,7 +259,7 @@ public class JoinDialog extends BaseDialog{
t.field(Core.settings.getString("name"), text -> {
player.name(text);
Core.settings.put("name", text);
}).grow().pad(8).get().setMaxLength(maxNameLength);
}).grow().pad(8).addInputDialog(maxNameLength);
}else{
t.add(player.name).update(l -> l.setColor(player.color())).grow().pad(8);
}