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

#9835 But acually works. (#10462)

Browse Source 
* Easier access to adding custom buttons to vanilla menu categories.

* Initialize in constructor

Don't need to wait for `build` to be able to modify

* seqn't

* Fix null crash on startup

* Check if submenu is empty

Problem that came up in my test. Might be due to my test being done with js.

* Retain original functionality
This commit is contained in:
MEEPofFaith
2025-02-04 16:15:12 -08:00
committed by GitHub
parent 22d62067a0
commit 5e19014b3e
1 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
core/src/mindustry/ui/fragments/MenuFragment.java
View File

@@ -28,6 +28,7 @@ public class MenuFragment{
private Button currentMenu; private Button currentMenu;
private MenuRenderer renderer; private MenuRenderer renderer;
private Seq<MenuButton> customButtons = new Seq<>(); private Seq<MenuButton> customButtons = new Seq<>();
public Seq<MenuButton> desktopButtons = null;
public void build(Group parent){ public void build(Group parent){
renderer = new MenuRenderer(); renderer = new MenuRenderer();
@@ -187,22 +188,26 @@ public class MenuFragment{
t.defaults().width(width).height(70f); t.defaults().width(width).height(70f);
t.name = "buttons"; t.name = "buttons";
buttons(t, if(desktopButtons == null){
new MenuButton("@play", Icon.play, desktopButtons = Seq.with(
new MenuButton("@campaign", Icon.play, () -> checkPlay(ui.planet::show)), new MenuButton("@play", Icon.play,
new MenuButton("@joingame", Icon.add, () -> checkPlay(ui.join::show)), new MenuButton("@campaign", Icon.play, () -> checkPlay(ui.planet::show)),
new MenuButton("@customgame", Icon.terrain, () -> checkPlay(ui.custom::show)), new MenuButton("@joingame", Icon.add, () -> checkPlay(ui.join::show)),
new MenuButton("@loadgame", Icon.download, () -> checkPlay(ui.load::show)) new MenuButton("@customgame", Icon.terrain, () -> checkPlay(ui.custom::show)),
), new MenuButton("@loadgame", Icon.download, () -> checkPlay(ui.load::show))
new MenuButton("@database.button", Icon.menu, ),
new MenuButton("@schematics", Icon.paste, ui.schematics::show), new MenuButton("@database.button", Icon.menu,
new MenuButton("@database", Icon.book, ui.database::show), new MenuButton("@schematics", Icon.paste, ui.schematics::show),
new MenuButton("@about.button", Icon.info, ui.about::show) new MenuButton("@database", Icon.book, ui.database::show),
), new MenuButton("@about.button", Icon.info, ui.about::show)
new MenuButton("@editor", Icon.terrain, () -> checkPlay(ui.maps::show)), steam ? new MenuButton("@workshop", Icon.steam, platform::openWorkshop) : null, ),
new MenuButton("@mods", Icon.book, ui.mods::show), new MenuButton("@editor", Icon.terrain, () -> checkPlay(ui.maps::show)), steam ? new MenuButton("@workshop", Icon.steam, platform::openWorkshop) : null,
new MenuButton("@settings", Icon.settings, ui.settings::show) new MenuButton("@mods", Icon.book, ui.mods::show),
); new MenuButton("@settings", Icon.settings, ui.settings::show)
);
}
buttons(t, desktopButtons.toArray(MenuButton.class));
buttons(t, customButtons.toArray(MenuButton.class)); buttons(t, customButtons.toArray(MenuButton.class));
buttons(t, new MenuButton("@quit", Icon.exit, Core.app::exit)); buttons(t, new MenuButton("@quit", Icon.exit, Core.app::exit));
}).width(width).growY(); }).width(width).growY();
@@ -250,14 +255,14 @@ public class MenuFragment{
currentMenu = null; currentMenu = null;
fadeOutMenu(); fadeOutMenu();
}else{ }else{
if(b.submenu != null){ if(b.submenu != null && b.submenu.any()){
currentMenu = out[0]; currentMenu = out[0];
submenu.clearChildren(); submenu.clearChildren();
fadeInMenu(); fadeInMenu();
//correctly offset the button //correctly offset the button
submenu.add().height((Core.graphics.getHeight() - Core.scene.marginTop - Core.scene.marginBottom - out[0].getY(Align.topLeft)) / Scl.scl(1f)); submenu.add().height((Core.graphics.getHeight() - Core.scene.marginTop - Core.scene.marginBottom - out[0].getY(Align.topLeft)) / Scl.scl(1f));
submenu.row(); submenu.row();
buttons(submenu, b.submenu); buttons(submenu, b.submenu.toArray());
}else{ }else{
currentMenu = null; currentMenu = null;
fadeOutMenu(); fadeOutMenu();
@@ -296,7 +301,7 @@ public class MenuFragment{
/** Runnable ran when the button is clicked. Ignored on desktop if {@link #submenu} is not null. */ /** Runnable ran when the button is clicked. Ignored on desktop if {@link #submenu} is not null. */
public final Runnable runnable; public final Runnable runnable;
/** Submenu shown when this button is clicked. Used instead of {@link #runnable} on desktop. */ /** Submenu shown when this button is clicked. Used instead of {@link #runnable} on desktop. */
public final @Nullable MenuButton[] submenu; public final @Nullable Seq<MenuButton> submenu;
/** Constructs a simple menu button, which behaves the same way on desktop and mobile. */ /** Constructs a simple menu button, which behaves the same way on desktop and mobile. */
public MenuButton(String text, Drawable icon, Runnable runnable){ public MenuButton(String text, Drawable icon, Runnable runnable){
@@ -311,7 +316,7 @@ public class MenuFragment{
this.icon = icon; this.icon = icon;
this.text = text; this.text = text;
this.runnable = runnable; this.runnable = runnable;
this.submenu = submenu; this.submenu = submenu != null ? Seq.with(submenu) : null;
} }
/** Comstructs a desktop-only button; used internally. */ /** Comstructs a desktop-only button; used internally. */
@@ -319,7 +324,7 @@ public class MenuFragment{
this.icon = icon; this.icon = icon;
this.text = text; this.text = text;
this.runnable = () -> {}; this.runnable = () -> {};
this.submenu = submenu; this.submenu = submenu != null ? Seq.with(submenu) : null;
} }
} }
} }