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

Escape can't be opened in mainview now

Browse Source
This commit is contained in:
lieght
2025-12-06 15:11:23 +01:00
parent b0c7c74346
commit 816a0b953e
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,6 +140,12 @@ public final class App extends Application {
} }
public void escapePopup() { public void escapePopup() {
if ( WidgetContainer.getCurrentView() == null
|| WidgetContainer.getCurrentView() instanceof MainView) {
return;
}
if (!Objects.requireNonNull( if (!Objects.requireNonNull(
WidgetContainer.find(widget -> widget instanceof QuitPopup || widget instanceof EscapePopup) WidgetContainer.find(widget -> widget instanceof QuitPopup || widget instanceof EscapePopup)
).isEmpty()) { ).isEmpty()) {

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

@@ -2,25 +2,22 @@ package org.toop.app.widget.popup;
import javafx.geometry.Pos; import javafx.geometry.Pos;
import javafx.scene.Node; import javafx.scene.Node;
import javafx.scene.control.Button;
import org.toop.app.App;
import org.toop.app.widget.Primitive; import org.toop.app.widget.Primitive;
import org.toop.app.widget.WidgetContainer; import org.toop.app.widget.WidgetContainer;
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.complex.ViewWidget; import org.toop.app.widget.complex.ViewWidget;
import org.toop.app.widget.tutorial.*; import org.toop.app.widget.tutorial.*;
import org.toop.app.widget.view.GameView; import org.toop.app.widget.view.GameView;
import org.toop.app.widget.view.MainView;
import org.toop.app.widget.view.OptionsView; import org.toop.app.widget.view.OptionsView;
import org.toop.local.AppContext; import org.toop.local.AppContext;
import java.awt.*;
import java.util.ArrayList; import java.util.ArrayList;
public class EscapePopup extends PopupWidget { public class EscapePopup extends PopupWidget {
public EscapePopup() { public EscapePopup() {
ArrayList<Node> nodes = new ArrayList<>();
ViewWidget currentView = WidgetContainer.getCurrentView(); ViewWidget currentView = WidgetContainer.getCurrentView();
ArrayList<Node> nodes = new ArrayList<>();
nodes.add(Primitive.button("Continue", this::hide, false)); // TODO, localize nodes.add(Primitive.button("Continue", this::hide, false)); // TODO, localize