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

Block config UI fixes

Browse Source
This commit is contained in:
Anuken
2018-11-27 09:29:28 -05:00
parent dcea8ae64f
commit b45368342d
15 changed files with 881 additions and 934 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java
View File

@@ -51,27 +51,22 @@ public class PausedDialog extends FloatingDialog{
content().row();
if(!mobile){
content().defaults().width(220).height(50);
float dw = 210f;
content().defaults().width(dw).height(50).pad(5f);
content().addButton("$text.back", () -> {
hide();
});
content().addButton("$text.back", this::hide).colspan(2).width(dw*2 + 10f);
content().row();
content().addButton("$text.unlocks", ui.unlocks::show);
content().row();
content().addButton("$text.settings", ui.settings::show);
content().row();
content().addButton("$text.savegame", save::show).disabled(s -> world.getSector() != null);
content().row();
content().addButton("$text.loadgame", load::show).disabled(b -> Net.active());
content().row();
content().addButton("$text.hostserver", ui.host::show).disabled(b -> Net.active());
content().addButton("$text.hostserver", ui.host::show).disabled(b -> Net.active()).colspan(2).width(dw*2 + 10f);
content().row();
@@ -81,7 +76,7 @@ public class PausedDialog extends FloatingDialog{
runExitSave();
hide();
});
});
}).colspan(2).width(dw + 10f);
}else{
content().defaults().size(120f).pad(5);

10
core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
View File

@@ -59,10 +59,10 @@ public class HudFragment extends Fragment{
select.left();
select.defaults().size(dsize).left();
menu = select.addImageButton("icon-menu", isize, ui.paused::show).get();
flip = select.addImageButton("icon-arrow-up", isize, this::toggleMenus).get();
menu = select.addImageButton("icon-menu", "clear", isize, ui.paused::show).get();
flip = select.addImageButton("icon-arrow-up", "clear", isize, this::toggleMenus).get();
select.addImageButton("icon-pause", isize, () -> {
select.addImageButton("icon-pause", "clear", isize, () -> {
if(Net.active()){
ui.listfrag.toggle();
}else{
@@ -77,7 +77,7 @@ public class HudFragment extends Fragment{
}
}).get();
select.addImageButton("icon-settings", isize, () -> {
select.addImageButton("icon-settings", "clear", isize, () -> {
if(Net.active() && mobile){
if(ui.chatfrag.chatOpen()){
ui.chatfrag.hide();
@@ -150,7 +150,7 @@ public class HudFragment extends Fragment{
parent.fill(t -> {
t.visible(() -> netServer.isWaitingForPlayers() && !state.is(State.menu));
t.table("clear", c -> c.margin(10).add("$text.waiting.players"));
t.table("button", c -> c.add("$text.waiting.players"));
});
//'core is under attack' table