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

Various mobile bugfixes

Browse Source
This commit is contained in:
Anuken
2019-02-05 13:49:43 -05:00
parent c8fa116a24
commit 20529d3ebc
6 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,7 @@ public class PausedDialog extends FloatingDialog{
cont.addButton("$back", this::hide).colspan(2).width(dw*2 + 20f);
cont.row();
cont.addButton("techtree", ui.tech::show);
cont.addButton("$techtree", ui.tech::show);
cont.addButton("$settings", ui.settings::show);
if(!world.isZone()){

2
core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java
View File

@@ -147,7 +147,7 @@ public class TechTreeDialog extends FloatingDialog{
}
});
button.exited(() -> {
if(hoverNode == button && !infoTable.hasMouse() && !hoverNode.hasMouse()){
if(!mobile && hoverNode == button && !infoTable.hasMouse() && !hoverNode.hasMouse()){
hoverNode = null;
rebuild();
}

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

@@ -54,7 +54,6 @@ public class HudFragment extends Fragment{
//menu at top left
parent.fill(cont -> {
cont.top().left().visible(() -> !state.is(State.menu));
if(mobile){
@@ -147,12 +146,6 @@ public class HudFragment extends Fragment{
//minimap
//parent.fill(t -> t.top().right().add(new Minimap()).visible(() -> !state.is(State.menu) && Core.settings.getBool("minimap")));
//paused table
parent.fill(t -> {
t.top().visible(() -> state.is(State.paused) && !Net.active());
t.table("button", top -> top.add("$paused").pad(6f));
});
//spawner warning
parent.fill(t -> {
t.touchable(Touchable.disabled);
@@ -222,8 +215,9 @@ public class HudFragment extends Fragment{
.update(label -> label.getColor().set(Color.ORANGE).lerp(Color.SCARLET, Mathf.absin(Time.time(), 2f, 1f))));
});
//launch button
parent.fill(t -> {
t.top().right().visible(() -> !state.is(State.menu));
t.top().visible(() -> !state.is(State.menu));
TextButton button = Elements.newButton("$launch", Call::launchZone);
@@ -252,9 +246,12 @@ public class HudFragment extends Fragment{
button.getLabelCell().left().get().setAlignment(Align.left, Align.left);
t.add(button).size(350f, 80f);
});
//.addRowImageTextButton("$launch", "icon-arrow-up", 8*3, Call::launchZone)
//.size(94f, 70f).visible(() -> world.isZone() && world.getZone().metCondition() && !Net.client());
//paused table
parent.fill(t -> {
t.top().visible(() -> state.is(State.paused) && !Net.active());
t.table("button", top -> top.add("$paused").pad(6f));
});
//'saving' indicator