diff --git a/racevisionGame/src/main/java/visualiser/Controllers/MainController.java b/racevisionGame/src/main/java/visualiser/Controllers/MainController.java index 90469871..ee78d24f 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/MainController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/MainController.java @@ -73,6 +73,11 @@ public class MainController extends Controller { */ public void hostGame(){ hostController.hostGame(); } + /** + * Sets up the css for the start of the program + */ + public void startCss(){titleController.setDayMode();} + /** * Main Controller for the applications will house the menu and the displayed pane. * diff --git a/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java b/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java index c2f793ef..a9fcb5d8 100644 --- a/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java +++ b/racevisionGame/src/main/java/visualiser/Controllers/TitleController.java @@ -5,6 +5,7 @@ import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.scene.Scene; import javafx.scene.control.Button; +import javafx.scene.control.RadioButton; import javafx.scene.image.Image; import javafx.scene.layout.AnchorPane; import javafx.stage.Stage; @@ -24,6 +25,10 @@ public class TitleController extends Controller { Button btnJoin; @FXML AnchorPane titleWrapper; + @FXML + RadioButton dayModeRD; + @FXML + RadioButton nightModeRD; /** * Method called when the 'host a game' button is pressed. @@ -50,6 +55,18 @@ public class TitleController extends Controller { parent.enterLobby(); } + public void setDayMode(){ + dayModeRD.getScene().getStylesheets().clear(); + dayModeRD.getScene().getStylesheets().add("/css/dayMode.css"); + nightModeRD.setSelected(false); + } + + public void setNightMode(){ + nightModeRD.getScene().getStylesheets().clear(); + nightModeRD.getScene().getStylesheets().add("/css/nightMode.css"); + dayModeRD.setSelected(false); + } + @Override public void initialize(URL location, ResourceBundle resources) { diff --git a/racevisionGame/src/main/java/visualiser/app/App.java b/racevisionGame/src/main/java/visualiser/app/App.java index 05d733d1..bc176317 100644 --- a/racevisionGame/src/main/java/visualiser/app/App.java +++ b/racevisionGame/src/main/java/visualiser/app/App.java @@ -37,7 +37,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); @@ -45,6 +45,7 @@ public class App extends Application { stage.setScene(scene); stage.setTitle("RaceVision - Team 7"); stage.getIcons().add(new Image(getClass().getClassLoader().getResourceAsStream("images/SailIcon.png"))); + mc.startCss(); stage.show(); } } diff --git a/racevisionGame/src/main/resources/css/dayMode.css b/racevisionGame/src/main/resources/css/dayMode.css index 4e8e1736..c9dc0e69 100644 --- a/racevisionGame/src/main/resources/css/dayMode.css +++ b/racevisionGame/src/main/resources/css/dayMode.css @@ -11,9 +11,9 @@ -fx-control-inner-background-alt: derive(-fx-control-inner-background, 10%); /* text colors depending on background's brightness */ - -fx-light-text-color: rgb(220, 220, 220); - -fx-mid-text-color: rgb(100, 100, 100); - -fx-dark-text-color: rgb(20, 20, 20); + -fx-light-text-color: rgb(80, 80, 80); + -fx-mid-text-color: rgb(20, 20, 20); + -fx-dark-text-color: rgb(0, 0, 0); /*highlighting/accenting objects. */ -fx-accent: rgb(128, 128, 128); @@ -27,8 +27,8 @@ /* Fix derived prompt color for text fields */ .text-input { - -fx-prompt-text-fill: derive(-fx-control-inner-background, +50%); - + -fx-prompt-text-fill: derive(-fx-control-inner-background, +0%); + -fx-background-color: #a9a9a9 , black , black; } /* Keep prompt invisible when focused (above color fix overrides it) */ diff --git a/racevisionGame/src/main/resources/css/nightMode.css b/racevisionGame/src/main/resources/css/nightMode.css index 4844a810..a1c6f587 100644 --- a/racevisionGame/src/main/resources/css/nightMode.css +++ b/racevisionGame/src/main/resources/css/nightMode.css @@ -27,7 +27,8 @@ /* Fix derived prompt color for text fields */ .text-input { - -fx-prompt-text-fill: derive(-fx-control-inner-background, +50%); + -fx-prompt-text-fill: derive(-fx-control-inner-background, +0%); + -fx-background-color: #a9a9a9 , white , white; } diff --git a/racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml b/racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml index 7433cec1..51e5e9c5 100644 --- a/racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml +++ b/racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml @@ -7,7 +7,7 @@ - + @@ -21,8 +21,8 @@ - - + +