stef_buwalda/pism
1
0
Fork 0
mirror of https://github.com/2OOP/pism.git synced 2026-02-04 10:54:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Working escape menu

Browse Source
This commit is contained in:
lieght
2025-12-04 22:42:39 +01:00
parent 2fbda6f14d
commit 61f03fab26
3 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/toop/app/App.java
View File

@@ -141,8 +141,8 @@ public final class App extends Application {
if (WidgetContainer.getAllWidgets().stream().anyMatch( if (WidgetContainer.getAllWidgets().stream().anyMatch(
e -> e instanceof QuitPopup || e instanceof EscapePopup e -> e instanceof QuitPopup || e instanceof EscapePopup
)) { )) {
WidgetContainer.findRemove(QuitPopup.class); WidgetContainer.findRemoveFirst(QuitPopup.class);
WidgetContainer.findRemove(EscapePopup.class); WidgetContainer.findRemoveFirst(EscapePopup.class);
return; return;
} }

14
app/src/main/java/org/toop/app/widget/WidgetContainer.java
View File

@@ -1,5 +1,6 @@
package org.toop.app.widget; package org.toop.app.widget;
import javafx.scene.Node;
import org.toop.app.widget.complex.PopupWidget; import org.toop.app.widget.complex.PopupWidget;
import org.toop.app.widget.complex.ViewWidget; import org.toop.app.widget.complex.ViewWidget;
@@ -70,6 +71,19 @@ public final class WidgetContainer {
); );
} }
public static void findRemoveFirst(Class<? extends Widget> widgetClass) {
if (root == null || currentView == null) return;
Platform.runLater(() -> {
for (Node widget : currentView.getChildren()) {
if (widgetClass.isAssignableFrom(widget.getClass())) {
currentView.getChildren().remove(widget);
break;
}
}
});
}
public static ViewWidget getCurrentView() { public static ViewWidget getCurrentView() {
return currentView; return currentView;
} }

25
app/src/main/java/org/toop/app/widget/popup/EscapePopup.java
View File

@@ -2,25 +2,30 @@ package org.toop.app.widget.popup;
import javafx.geometry.Pos; import javafx.geometry.Pos;
import org.toop.app.App; import org.toop.app.App;
import org.toop.app.widget.Primitive;
import org.toop.app.widget.WidgetContainer;
import org.toop.app.widget.complex.ConfirmWidget; import org.toop.app.widget.complex.ConfirmWidget;
import org.toop.app.widget.complex.PopupWidget; import org.toop.app.widget.complex.PopupWidget;
import org.toop.app.widget.view.OptionsView;
public class EscapePopup extends PopupWidget { public class EscapePopup extends PopupWidget {
public EscapePopup() { public EscapePopup() {
var confirmWidget = new ConfirmWidget("are-you-sure"); var con = Primitive.button("Continue", () -> { hide(); }, false); // TODO, localize
confirmWidget.addButton("yes", () -> { var qui = Primitive.button("quit", () -> {
App.quit();
});
confirmWidget.addButton("no", () -> {
hide(); hide();
WidgetContainer.add(Pos.CENTER, new QuitPopup());
}); });
add(Pos.CENTER, confirmWidget); if (!(WidgetContainer.getCurrentView().getClass().isAssignableFrom(OptionsView.class))) {
var opt = Primitive.button("options", () -> {
hide();
WidgetContainer.getCurrentView().transitionNext(new OptionsView());
});
add(Pos.CENTER, Primitive.vbox(con, opt, qui));
} else {
add(Pos.CENTER, Primitive.vbox(con, qui));
}
setOnPop(() -> {
hide();
});
} }
} }