arch-jedi/gdxapp4d
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add close all windows on exit and fixed remove row from mm doc app

Browse source
This commit is contained in:
Willem Cazander 2025-02-03 23:48:59 +01:00
parent 0bee837b52
commit d146d5aed8
5 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gdxapp4d-app-mmdoc/src/main/java/love/distributedrebirth/gdxapp4d/app/mmdoc/MMDocDeskApp.java
View file

@ -69,6 +69,12 @@ public class MMDocDeskApp extends AbstractDeskApp implements DeskAppRenderer {
docManager.loadDrivers(); docManager.loadDrivers();
} }
@Override
public void exit() {
docManager.getDataStore().clearAndCloseAllSafe();
}
@Override
public void create() { public void create() {
getContours().setTitle("MMDoc"); getContours().setTitle("MMDoc");
getContours().registrateContour(DeskAppContourSection.MAIN, this); getContours().registrateContour(DeskAppContourSection.MAIN, this);
@ -134,8 +140,10 @@ public class MMDocDeskApp extends AbstractDeskApp implements DeskAppRenderer {
ImGui.tableSetupColumn("Remove"); ImGui.tableSetupColumn("Remove");
ImGui.tableHeadersRow(); ImGui.tableHeadersRow();
int i=1;
String removeId = null; String removeId = null;
for (Entry<String,DataContext> data:docManager.getDataStore().entrySet()) { for (Entry<String,DataContext> data:docManager.getDataStore().entrySet()) {
ImGui.pushID(i);
ImGui.tableNextRow(); ImGui.tableNextRow();
ImGui.tableNextColumn(); ImGui.tableNextColumn();
ImGui.text(data.getKey()); ImGui.text(data.getKey());
@ -147,6 +155,8 @@ public class MMDocDeskApp extends AbstractDeskApp implements DeskAppRenderer {
if (ImGui.smallButton("Remove")) { if (ImGui.smallButton("Remove")) {
removeId = data.getKey(); removeId = data.getKey();
} }
ImGui.popID();
i++;
} }
ImGui.endTable(); ImGui.endTable();

1
gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/AbstractScreenDesktop.java
View file

@ -150,6 +150,7 @@ public abstract class AbstractScreenDesktop extends ScreenAdapter implements Des
batch.dispose(); batch.dispose();
font.dispose(); font.dispose();
modelBatch.dispose(); modelBatch.dispose();
deskAppScreen.dispose();
disposeDesktop(); disposeDesktop();
} }

1
gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/screen/ScreenDesktop1.java
View file

@ -66,7 +66,6 @@ public class ScreenDesktop1 extends AbstractScreenDesktop {
public ScreenDesktop1(SystemGdxBootArgs bootArgs, SystemGdxTerminal terminal, VrGem4DeskAppService deskAppService) { public ScreenDesktop1(SystemGdxBootArgs bootArgs, SystemGdxTerminal terminal, VrGem4DeskAppService deskAppService) {
super("Desktop1", bootArgs, terminal, deskAppService); super("Desktop1", bootArgs, terminal, deskAppService);
} }
protected void createModel(ModelBuilder modelBuilder, Array<ModelInstance> modelInstances) { protected void createModel(ModelBuilder modelBuilder, Array<ModelInstance> modelInstances) {

8
gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/view/DeskAppController.java
View file

@ -105,4 +105,12 @@ public class DeskAppController {
protected void renderBackground() { protected void renderBackground() {
} }
public final void dispose() {
for (DeskApp app : deskApps) {
app.exit();
}
deskApps.clear();
currentDeskApp = null;
}
} }

6
gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/view/DeskTopScreenMenu.java
View file

@ -57,9 +57,9 @@ import ᒢᐩᐩ.ᔆʸᔆᐪᓫᔿ.ᒃᣔᒃᓫᒻ.ᑊᐣᓑᖮᐪᔆ.DuytsDocAu
@DuytsDocAuthor注(name = "للَّٰهِilLצسُو", copyright = "©Δ∞ 仙上主天") @DuytsDocAuthor注(name = "للَّٰهِilLצسُو", copyright = "©Δ∞ 仙上主天")
public class DeskTopScreenMenu { public class DeskTopScreenMenu {
private SystemGdxBootArgs bootArgs; private final SystemGdxBootArgs bootArgs;
private SystemGdxTerminal terminal; private final SystemGdxTerminal terminal;
private VrGem4DeskAppService deskAppService; private final VrGem4DeskAppService deskAppService;
private ImBoolean fileMinimizeSelected = new ImBoolean(false); private ImBoolean fileMinimizeSelected = new ImBoolean(false);
private ImBoolean fileCloseSelected = new ImBoolean(false); private ImBoolean fileCloseSelected = new ImBoolean(false);
private ImBoolean tosSelfSelected = new ImBoolean(false); private ImBoolean tosSelfSelected = new ImBoolean(false);