From f5f7a0a48b7eb3c5fa95d9802bf6eb207060f082 Mon Sep 17 00:00:00 2001 From: Willem Date: Wed, 2 Mar 2022 01:42:38 +0100 Subject: [PATCH] Improved tos menu --- .../gdxapp4d/vrgem4/desktop/DeskTopScreenMenu.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/desktop/DeskTopScreenMenu.java b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/desktop/DeskTopScreenMenu.java index a354c978..07f54bad 100644 --- a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/desktop/DeskTopScreenMenu.java +++ b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/desktop/DeskTopScreenMenu.java @@ -8,7 +8,6 @@ import com.badlogic.gdx.Gdx; import imgui.ImGui; import imgui.type.ImBoolean; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; -import love.distributedrebirth.gdxapp4d.tos4.GDXAppTos4; import love.distributedrebirth.gdxapp4d.vrgem4.FontAwesomeIcons; import love.distributedrebirth.gdxapp4d.vrgem4.GDXAppLauncher; import love.distributedrebirth.gdxapp4d.vrgem4.GDXAppVrGem4; @@ -32,6 +31,7 @@ public class DeskTopScreenMenu { private List apps; private ImBoolean fileMinimizeSelected = new ImBoolean(false); private ImBoolean fileCloseSelected = new ImBoolean(false); + private ImBoolean tosSelfSelected = new ImBoolean(false); public DeskTopScreenMenu() { apps = new ArrayList<>(); @@ -160,16 +160,18 @@ public class DeskTopScreenMenu { private void renderTOS4Menu(DeskTopScreen appScreen) { if (ImGui.beginMenu("仙" + " TOS⁴")) { - if (ImGui.menuItem(FontAwesomeIcons.Camera + " Main reality")) { + if (ImGui.menuItem(FontAwesomeIcons.Camera + " Main reality", "", tosSelfSelected, appScreen.getDeskAppScreen().getCurrentDeskApp() != null)) { appScreen.getDeskAppScreen().setCurrentDeskApp(null); + tosSelfSelected.set(false); } for (DeskApp app: appScreen.getDeskAppScreen().getDeskApps()) { - String infix = ""; + boolean enabled = true; if (appScreen.getDeskAppScreen().getCurrentDeskApp() == app) { - infix = FontAwesomeIcons.Wrench + " ";; + enabled = false; } - if (ImGui.menuItem(infix + app.getTitle())) { + if (ImGui.menuItem(app.getTitle(), "", tosSelfSelected, enabled)) { appScreen.getDeskAppScreen().setCurrentDeskApp(app); + tosSelfSelected.set(false); } } ImGui.endMenu();