mirror of
https://github.com/2OOP/pism.git
synced 2026-02-04 10:54:51 +00:00
Tutorials fixed
This commit is contained in:
@@ -3,12 +3,12 @@ package org.toop.app.widget.popup;
|
|||||||
import javafx.geometry.Pos;
|
import javafx.geometry.Pos;
|
||||||
import javafx.scene.Node;
|
import javafx.scene.Node;
|
||||||
import org.toop.app.widget.Primitive;
|
import org.toop.app.widget.Primitive;
|
||||||
|
import org.toop.app.widget.Widget;
|
||||||
import org.toop.app.widget.WidgetContainer;
|
import org.toop.app.widget.WidgetContainer;
|
||||||
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;
|
||||||
|
|
||||||
@@ -30,9 +30,11 @@ public class EscapePopup extends PopupWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (currentView.getClass().isAssignableFrom(GameView.class)) {
|
if (currentView.getClass().isAssignableFrom(GameView.class)) {
|
||||||
BaseTutorialWidget tut = AppContext.currentTutorial();
|
Widget tut = AppContext.currentTutorial();
|
||||||
if (tut != null) {
|
if (tut != null) {
|
||||||
nodes.add(Primitive.button("tutorialstring", () -> {}));
|
nodes.add(Primitive.button("tutorialstring", () -> {
|
||||||
|
WidgetContainer.getCurrentView().add(Pos.CENTER, tut);
|
||||||
|
}));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -59,8 +59,6 @@ public class BaseTutorialWidget extends PopupWidget implements Updatable {
|
|||||||
var x = Primitive.vbox(imagery, tutorialText);
|
var x = Primitive.vbox(imagery, tutorialText);
|
||||||
|
|
||||||
add(Pos.CENTER, Primitive.vbox(x, w));
|
add(Pos.CENTER, Primitive.vbox(x, w));
|
||||||
|
|
||||||
WidgetContainer.add(Pos.CENTER, this);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user