From 85347c169dc2a3b77b15e2c841b6a07de3a66b92 Mon Sep 17 00:00:00 2001 From: hba56 Date: Thu, 27 Jul 2017 13:05:56 +1200 Subject: [PATCH] You can now resize all windows other than the title screen #story[1087] --- .../java/visualiser/Controllers/TitleController.java | 4 +++- racevisionGame/src/main/java/visualiser/app/App.java | 12 +++++++++++- .../resources/visualiser/scenes/titleScreen.fxml | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java b/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java index a9fcb5d8..6b665b6e 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java @@ -9,6 +9,7 @@ import javafx.scene.control.RadioButton; import javafx.scene.image.Image; import javafx.scene.layout.AnchorPane; import javafx.stage.Stage; +import visualiser.app.App; import java.io.IOException; import java.net.URL; @@ -39,7 +40,7 @@ public class TitleController extends Controller { public void hostAGame() throws IOException { titleWrapper.setVisible(false); parent.hostGame(); - + App.getStage().setResizable(true); } public void enterTitle(){ @@ -53,6 +54,7 @@ public class TitleController extends Controller { public void joinAGame() { titleWrapper.setVisible(false); parent.enterLobby(); + App.getStage().setResizable(true); } public void setDayMode(){ diff --git a/racevisionGame/src/main/java/visualiser/app/App.java b/racevisionGame/src/main/java/visualiser/app/App.java index bc176317..6896556d 100644 --- a/racevisionGame/src/main/java/visualiser/app/App.java +++ b/racevisionGame/src/main/java/visualiser/app/App.java @@ -12,6 +12,7 @@ import javafx.stage.WindowEvent; import visualiser.Controllers.MainController; public class App extends Application { + private static Stage stage; /** * Entry point for running the programme @@ -37,7 +38,7 @@ public class App extends Application { }); FXMLLoader loader = new FXMLLoader(getClass().getResource("/visualiser/scenes/main.fxml")); Parent root = loader.load(); -// stage.setResizable(false); + stage.setResizable(false); MainController mc = (MainController) loader.getController(); mc.enterTitle(); Scene scene = new Scene(root); @@ -46,6 +47,15 @@ public class App extends Application { stage.setTitle("RaceVision - Team 7"); stage.getIcons().add(new Image(getClass().getClassLoader().getResourceAsStream("images/SailIcon.png"))); mc.startCss(); + setStage(stage); stage.show(); } + + public static Stage getStage() { + return App.stage; + } + + public static void setStage(Stage stage) { + App.stage = stage; + } } diff --git a/racevisionGame/src/main/resources/visualiser/scenes/titleScreen.fxml b/racevisionGame/src/main/resources/visualiser/scenes/titleScreen.fxml index 4ff15284..2b3c5ce8 100644 --- a/racevisionGame/src/main/resources/visualiser/scenes/titleScreen.fxml +++ b/racevisionGame/src/main/resources/visualiser/scenes/titleScreen.fxml @@ -15,7 +15,7 @@ - +