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

Implement popup id system so that popups don't flicker. (#11751)

Browse Source
This commit is contained in:
buthed010203
2026-03-12 16:46:43 -04:00
committed by GitHub
parent 9fa69c59f9
commit 04465c4abc
2 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/mindustry/core/UI.java
View File

@@ -85,6 +85,9 @@ public class UI implements ApplicationListener, Loadable{
private @Nullable Element lastAnnouncement; private @Nullable Element lastAnnouncement;
/** Maps popups to ids so that they can be removed or updated by id. */
private final ObjectMap<String, Table> popups = new ObjectMap<>();
public UI(){ public UI(){
Fonts.loadFonts(); Fonts.loadFonts();
} }
@@ -394,14 +397,21 @@ public class UI implements ApplicationListener, Loadable{
} }
/** Shows a label at some position on the screen. Does not fade. */ /** Shows a label at some position on the screen. Does not fade. */
public void showInfoPopup(String info, float duration, int align, int top, int left, int bottom, int right){ public void showInfoPopup(String info, @Nullable String id, float duration, int align, int top, int left, int bottom, int right){
Table table = new Table(); Table table = new Table();
if(id != null){
Table old = popups.put(id, table);
if (old != null) old.remove();
}
table.setFillParent(true); table.setFillParent(true);
table.touchable = Touchable.disabled; table.touchable = Touchable.disabled;
table.update(() -> { table.update(() -> {
if(state.isMenu()) table.remove(); if(state.isMenu()){
table.remove();
if(id != null) popups.remove(id);
}
}); });
table.actions(Actions.delay(duration), Actions.remove()); table.actions(Actions.delay(duration), Actions.remove(), Actions.run(() -> { if(id != null) popups.remove(id); }));
table.align(align).table(Styles.black3, t -> t.margin(4).add(info).style(Styles.outlineLabel)).pad(top, left, bottom, right); table.align(align).table(Styles.black3, t -> t.margin(4).add(info).style(Styles.outlineLabel)).pad(top, left, bottom, right);
Core.scene.add(table); Core.scene.add(table);
} }

30
core/src/mindustry/ui/Menus.java
View File

@@ -122,10 +122,29 @@ public class Menus{
} }
@Remote(variants = Variant.both, unreliable = true) @Remote(variants = Variant.both, unreliable = true)
public static void infoPopup(String message, float duration, int align, int top, int left, int bottom, int right){ public static void infoPopup(String message, @Nullable String id, float duration, int align, int top, int left, int bottom, int right){
if(message == null) return; if(message == null) return;
ui.showInfoPopup(message, duration, align, top, left, bottom, right); ui.showInfoPopup(message, id, duration, align, top, left, bottom, right);
}
@Remote(variants = Variant.both)
public static void infoPopupReliable(String message, @Nullable String id, float duration, int align, int top, int left, int bottom, int right){
infoPopup(message, id, duration, align, top, left, bottom, right);
}
/** @deprecated Prefer variants with ids to stop flickering popups. */
@Deprecated
@Remote(variants = Variant.both, unreliable = true)
public static void infoPopup(String message, float duration, int align, int top, int left, int bottom, int right){
infoPopup(message, null, duration, align, top, left, bottom, right);
}
/** @deprecated Prefer variants with ids to stop flickering popups. */
@Deprecated
@Remote(variants = Variant.both)
public static void infoPopupReliable(String message, float duration, int align, int top, int left, int bottom, int right){
infoPopup(message, duration, align, top, left, bottom, right);
} }
@Remote(variants = Variant.both, unreliable = true) @Remote(variants = Variant.both, unreliable = true)
@@ -135,13 +154,6 @@ public class Menus{
ui.showLabel(message, duration, worldx, worldy); ui.showLabel(message, duration, worldx, worldy);
} }
@Remote(variants = Variant.both)
public static void infoPopupReliable(String message, float duration, int align, int top, int left, int bottom, int right){
if(message == null) return;
ui.showInfoPopup(message, duration, align, top, left, bottom, right);
}
@Remote(variants = Variant.both) @Remote(variants = Variant.both)
public static void labelReliable(String message, float duration, float worldx, float worldy){ public static void labelReliable(String message, float duration, float worldx, float worldy){
label(message, duration, worldx, worldy); label(message, duration, worldx, worldy);