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

Mobile and desktop UI changes

Browse Source
This commit is contained in:
Anuken
2017-11-10 19:47:57 -05:00
parent 4a9fbf080e
commit 4ffbeacb07
14 changed files with 341 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/io/anuke/mindustry/ui/FloatingDialog.java
View File

@@ -5,7 +5,6 @@ import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.utils.Align;
import io.anuke.ucore.scene.ui.Dialog;
import io.anuke.ucore.scene.ui.Image;
import io.anuke.ucore.scene.ui.layout.Unit;
public class FloatingDialog extends Dialog{
@@ -15,8 +14,8 @@ public class FloatingDialog extends Dialog{
setFillParent(true);
title().setAlignment(Align.center);
getTitleTable().row();
getTitleTable().add(new Image("white"))
.growX().height(3f).pad(4f).units(Unit.dp).get().setColor(Color.ORANGE);
getTitleTable().addImage("white", Color.ORANGE)
.growX().height(3f).pad(4f).units(Unit.dp);
}
@Override

6
core/src/io/anuke/mindustry/ui/LevelDialog.java
View File

@@ -14,7 +14,7 @@ import io.anuke.ucore.scene.ui.ScrollPane;
import io.anuke.ucore.scene.ui.layout.Table;
import io.anuke.ucore.scene.ui.layout.Unit;
public class LevelDialog extends FloatingDialog{
public class LevelDialog extends FloatingDialog{
private Map selectedMap = Map.delta;
private TextureRegion region = new TextureRegion();
@@ -41,10 +41,10 @@ public class LevelDialog extends FloatingDialog{
maps.row();
}
Table inset = new Table("pane");
Table inset = new Table("pane-button");
inset.add("[orange]"+map.name()).pad(3f).units(Unit.dp);
inset.row();
inset.add((StringSupplier)(()->"High Score: [lime]" + Settings.getInt("hiscore" + map.name())))
inset.add((StringSupplier)(()->"High Score: [orange]" + Settings.getInt("hiscore" + map.name())))
.pad(3f).units(Unit.dp);
inset.pack();

13
core/src/io/anuke/mindustry/ui/LoadDialog.java
View File

@@ -1,5 +1,6 @@
package io.anuke.mindustry.ui;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.utils.Align;
import com.badlogic.gdx.utils.Timer;
import com.badlogic.gdx.utils.Timer.Task;
@@ -41,19 +42,23 @@ public class LoadDialog extends FloatingDialog{
final int slot = i;
TextButton button = new TextButton("[orange]Slot " + (i + 1));
button.getLabelCell().top().left().growX();
button.row();
button.pad(Unit.dp.inPixels(10));
button.getLabelCell().top().left().growX();
button.row();
Label info = new Label("[gray]" + (!SaveIO.isSaveValid(i) ? "<empty>" : "Wave " +
SaveIO.getWave(slot)+"\nLast Saved: " + SaveIO.getTimeString(i)));
info.setAlignment(Align.center, Align.center);
button.add(info).padBottom(2).padTop(6);
button.getLabel().setFontScale(Unit.dp.inPixels(0.75f));
button.row();
button.addImage("white", Color.GRAY)
.growX().height(3f).pad(4f).units(Unit.dp);
button.row();
modifyButton(button, slot);
content().add(button).size(400, 80).units(Unit.dp).pad(2);
content().add(button).size(400, 86).units(Unit.dp).pad(2);
content().row();
}

6
core/src/io/anuke/mindustry/ui/UpgradeDialog.java
View File

@@ -37,10 +37,6 @@ public class UpgradeDialog extends FloatingDialog{
GameState.set(State.paused);
});
getButtonTable().addButton("Ok", ()->{
hide();
}).size(96, 50).pad(5);
Table weptab = new Table();
weptab.pad(20);
@@ -75,7 +71,7 @@ public class UpgradeDialog extends FloatingDialog{
i++;
weptab.add(button).width(250);
weptab.add(button).width(220);
Table tiptable = new Table();