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

Removed desktop top menu / Rebound pause back to space

Browse Source
This commit is contained in:
Anuken
2018-11-07 15:30:42 -05:00
parent 7953cc416b
commit 0ce08319e7
2 changed files with 52 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/input/DefaultKeybinds.java
View File

@@ -30,7 +30,7 @@ public class DefaultKeybinds{
"zoom", new Axis(Input.SCROLL), "zoom", new Axis(Input.SCROLL),
"zoom_minimap", new Axis(Input.MINUS, Input.PLUS), "zoom_minimap", new Axis(Input.MINUS, Input.PLUS),
"menu", Gdx.app.getType() == ApplicationType.Android ? Input.BACK : Input.ESCAPE, "menu", Gdx.app.getType() == ApplicationType.Android ? Input.BACK : Input.ESCAPE,
"pause", Input.Q, "pause", Input.SPACE,
"toggle_menus", Input.C, "toggle_menus", Input.C,
new Category("multiplayer"), new Category("multiplayer"),
"player_list", Input.TAB, "player_list", Input.TAB,

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

@@ -54,55 +54,57 @@ public class HudFragment extends Fragment{
cont.top().left().visible(() -> !state.is(State.menu)); cont.top().left().visible(() -> !state.is(State.menu));
cont.table(select -> { if(mobile){
select.left(); cont.table(select -> {
select.defaults().size(dsize).left(); select.left();
select.defaults().size(dsize).left();
menu = select.addImageButton("icon-menu", isize, ui.paused::show).get(); menu = select.addImageButton("icon-menu", isize, ui.paused::show).get();
flip = select.addImageButton("icon-arrow-up", isize, this::toggleMenus).get(); flip = select.addImageButton("icon-arrow-up", isize, this::toggleMenus).get();
select.update(() -> { select.addImageButton("icon-pause", isize, () -> {
if(Inputs.keyTap("toggle_menus") && !ui.chatfrag.chatOpen()){ if(Net.active()){
toggleMenus(); ui.listfrag.toggle();
} }else{
state.set(state.is(State.paused) ? State.playing : State.paused);
}
}).update(i -> {
if(Net.active()){
i.getStyle().imageUp = Core.skin.getDrawable("icon-players");
}else{
i.setDisabled(Net.active());
i.getStyle().imageUp = Core.skin.getDrawable(state.is(State.paused) ? "icon-play" : "icon-pause");
}
}).get();
select.addImageButton("icon-settings", isize, () -> {
if(Net.active() && mobile){
if(ui.chatfrag.chatOpen()){
ui.chatfrag.hide();
}else{
ui.chatfrag.toggle();
}
}else{
ui.unlocks.show();
}
}).update(i -> {
if(Net.active() && mobile){
i.getStyle().imageUp = Core.skin.getDrawable("icon-chat");
}else{
i.getStyle().imageUp = Core.skin.getDrawable("icon-unlocks");
}
}).get();
}); });
select.addImageButton("icon-pause", isize, () -> { cont.row();
if(Net.active()){ }
ui.listfrag.toggle();
}else{
state.set(state.is(State.paused) ? State.playing : State.paused);
}
}).update(i -> {
if(Net.active()){
i.getStyle().imageUp = Core.skin.getDrawable("icon-players");
}else{
i.setDisabled(Net.active());
i.getStyle().imageUp = Core.skin.getDrawable(state.is(State.paused) ? "icon-play" : "icon-pause");
}
}).get();
select.addImageButton("icon-settings", isize, () -> { cont.update(() -> {
if(Net.active() && mobile){ if(Inputs.keyTap("toggle_menus") && !ui.chatfrag.chatOpen()){
if(ui.chatfrag.chatOpen()){ toggleMenus();
ui.chatfrag.hide(); }
}else{
ui.chatfrag.toggle();
}
}else{
ui.unlocks.show();
}
}).update(i -> {
if(Net.active() && mobile){
i.getStyle().imageUp = Core.skin.getDrawable("icon-chat");
}else{
i.getStyle().imageUp = Core.skin.getDrawable("icon-unlocks");
}
}).get();
}); });
cont.row();
Stack stack = new Stack(); Stack stack = new Stack();
TextButton waves = new TextButton(""); TextButton waves = new TextButton("");
Table btable = new Table().margin(14); Table btable = new Table().margin(14);
@@ -114,7 +116,7 @@ public class HudFragment extends Fragment{
addWaveTable(waves); addWaveTable(waves);
addPlayButton(btable); addPlayButton(btable);
cont.add(stack).fillX(); cont.add(stack).width(dsize * 4);
cont.row(); cont.row();
@@ -132,7 +134,9 @@ public class HudFragment extends Fragment{
}).size(-1).visible(() -> Settings.getBool("fps")).update(t -> t.setTranslation(0, (!waves.isVisible() ? wavetable.getHeight() : Math.min(wavetable.getTranslation().y, wavetable.getHeight())) )).get(); }).size(-1).visible(() -> Settings.getBool("fps")).update(t -> t.setTranslation(0, (!waves.isVisible() ? wavetable.getHeight() : Math.min(wavetable.getTranslation().y, wavetable.getHeight())) )).get();
//make wave box appear below rest of menu //make wave box appear below rest of menu
cont.swapActor(wavetable, menu.getParent()); if(mobile){
cont.swapActor(wavetable, menu.getParent());
}
}); });
//minimap //minimap
@@ -333,7 +337,9 @@ public class HudFragment extends Fragment{
float dur = 0.3f; float dur = 0.3f;
Interpolation in = Interpolation.pow3Out; Interpolation in = Interpolation.pow3Out;
flip.getStyle().imageUp = Core.skin.getDrawable(shown ? "icon-arrow-down" : "icon-arrow-up"); if(flip != null){
flip.getStyle().imageUp = Core.skin.getDrawable(shown ? "icon-arrow-down" : "icon-arrow-up");
}
if(shown){ if(shown){
shown = false; shown = false;