mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-25 05:51:47 -08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry

Browse source
This commit is contained in:
Anuken 2020-01-27 00:11:24 -05:00
commit cd1ed97e52
2 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/src/mindustry/core/NetClient.java
View file

@ -266,6 +266,11 @@ public class NetClient implements ApplicationListener{
ui.showText("", message);
}
@Remote(variants = Variant.both)
public static void onInfoPopup(String message, float duration, int align, int top, int left, int bottom, int right){
ui.showInfoPopup(message, duration, align, top, left, bottom, right);
}
@Remote(variants = Variant.both)
public static void onInfoToast(String message, float duration){
ui.showInfoToast(message, duration);

9
core/src/mindustry/core/UI.java
View file

@ -302,6 +302,15 @@ public class UI implements ApplicationListener, Loadable{
Core.scene.add(table);
}
public void showInfoPopup(String info, float duration, int align, int top, int left, int bottom, int right){
Table table = new Table();
table.setFillParent(true);
table.update(() -> { if(state.is(State.menu)) table.remove(); });
table.actions(Actions.delay(duration), Actions.remove());
table.align(align).table(Styles.black3, t -> t.margin(4).add(info).style(Styles.outlineLabel)).pad(top,left,bottom,right);
Core.scene.add(table);
}
public void showInfo(String info){
new Dialog(""){{
getCell(cont).growX();