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

Renamed Table pad methods

Browse Source
This commit is contained in:
Anuken
2018-01-04 19:58:42 -05:00
parent 3004e627cc
commit c435249c4f
13 changed files with 14 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/ui/JoinDialog.java
+1 -1
View File
@@ -88,7 +88,7 @@ public class JoinDialog extends FloatingDialog {
if(array.size == 0){
hosts.add("$text.hosts.none").pad(10f);
hosts.add().growX();
hosts.addIButton("icon-loading", 16*2f, this::refresh).pad(-10f).padLeft(0).padTop(-6).size(70f, 74f);
hosts.addImageButton("icon-loading", 16*2f, this::refresh).pad(-10f).padLeft(0).padTop(-6).size(70f, 74f);
}else {
for (Address a : array) {
TextButton button = hosts.addButton("[accent]"+a.name, "clear", () -> {
core/src/io/anuke/mindustry/ui/LoadDialog.java
+3 -7
View File
@@ -6,12 +6,8 @@ import io.anuke.mindustry.core.GameState;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.io.SaveIO;
import io.anuke.mindustry.io.Saves.SaveSlot;
import io.anuke.ucore.UCore;
import io.anuke.ucore.core.Core;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.scene.builders.button;
import io.anuke.ucore.scene.builders.dialog;
import io.anuke.ucore.scene.ui.Dialog;
import io.anuke.ucore.scene.ui.ScrollPane;
import io.anuke.ucore.scene.ui.TextButton;
import io.anuke.ucore.scene.ui.layout.Table;
@@ -66,18 +62,18 @@ public class LoadDialog extends FloatingDialog{
button.table(t -> {
t.right();
t.addIButton("icon-floppy", "emptytoggle", 14*3, () -> {
t.addImageButton("icon-floppy", "emptytoggle", 14*3, () -> {
slot.setAutosave(!slot.isAutosave());
}).checked(slot.isAutosave()).right();
t.addIButton("icon-trash", "empty", 14*3, () -> {
t.addImageButton("icon-trash", "empty", 14*3, () -> {
Vars.ui.showConfirm("$text.confirm", "$text.save.delete.confirm", () -> {
slot.delete();
setup();
});
}).size(14*3).right();
t.addIButton("icon-dots", "empty", 14*3, () -> {
t.addImageButton("icon-dots", "empty", 14*3, () -> {
FloatingDialog dialog = new FloatingDialog("Save Options");
dialog.addCloseButton();
core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java
+1 -1
View File
@@ -57,7 +57,7 @@ public class PlayerListFragment implements Fragment{
if(Net.server() && !player.isLocal){
button.add().growY();
button.addIButton("icon-cancel", 14*3, () ->
button.addImageButton("icon-cancel", 14*3, () ->
Net.kickConnection(player.clientid)
).pad(-5).padBottom(-10).size(h+10, h+14);
}
core/src/io/anuke/mindustry/ui/fragments/ToolFragment.java
+3 -3
View File
@@ -26,7 +26,7 @@ public class ToolFragment implements Fragment{
tools = new Table();
tools.addIButton("icon-cancel", isize, () -> {
tools.addImageButton("icon-cancel", isize, () -> {
if(input.placeMode == PlaceMode.areaDelete && confirming){
confirming = false;
}else{
@@ -34,12 +34,12 @@ public class ToolFragment implements Fragment{
}
});
tools.addIButton("icon-rotate", isize, () -> {
tools.addImageButton("icon-rotate", isize, () -> {
input.rotation++;
input.rotation %= 4;
});
tools.addIButton("icon-check", isize, () -> {
tools.addImageButton("icon-check", isize, () -> {
if(input.placeMode == PlaceMode.areaDelete && confirming){
input.placeMode.released(px, py, px2, py2);
confirming = false;
core/src/io/anuke/mindustry/ui/fragments/WeaponFragment.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class WeaponFragment implements Fragment{
}
weapontable.addIButton("icon-menu", 8*4, ()->{
weapontable.addImageButton("icon-menu", 8*4, ()->{
ui.showUpgrades();
});
}