1 files changed, 46 insertions, 14 deletions

diff --git a/src/gui/Settings.java b/src/gui/Settings.java
index 631048d..f16eb71 100644
--- a/src/gui/Settings.java
+++ b/src/gui/Settings.java
@@ -1,15 +1,18 @@
 package gui;
 
+import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
 import javafx.scene.control.Slider;
 import javafx.scene.control.Toggle;
 import javafx.scene.control.ToggleButton;
+import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
 import javafx.scene.text.Text;
+import main.SettingsController;
 
 public class Settings extends Pane
 {
@@ -20,28 +23,52 @@ public class Settings extends Pane
      */
     public Settings()
     {
-        Text t1 = new Text();
-        t1.setText("Music Volume");
-        t1.getStyleClass().add("t3");
+        Text musicText = new Text();
+        musicText.setText("Music Volume");
+        musicText.getStyleClass().add("t3");
 
-        Slider musicVol = new Slider();
-        musicVol.setMax(100);
-        musicVol.setMin(0);
+        Slider musicSlider = new Slider();
+        musicSlider.setMax(100);
+        musicSlider.setMin(0);
+        musicSlider.valueProperty().bindBidirectional(Driver.settingsController.musicVol);
 
-        Text t2 = new Text();
-        t2.setText("Sound Effects Volume");
-        t2.getStyleClass().add("t3");
+        VBox musicBox = new VBox();
+        musicBox.getChildren().addAll(musicText, musicSlider);
+        musicBox.getStyleClass().add("box");
+        musicBox.setPadding(new Insets(10));
 
-        Slider sfxVol = new Slider();
-        sfxVol.setMax(100);
-        sfxVol.setMin(0);
+
+        Text SFXText = new Text();
+        SFXText.setText("Sound Effects Volume");
+        SFXText.getStyleClass().add("t3");
+
+        Slider SFXSlider = new Slider();
+        SFXSlider.setMax(100);
+        SFXSlider.setMin(0);
+        SFXSlider.valueProperty().bindBidirectional(Driver.settingsController.effectsVol);
+
+        VBox SFXBox = new VBox();
+        SFXBox.getChildren().addAll(SFXText, SFXSlider);
+        SFXBox.getStyleClass().add("box");
+        SFXBox.setPadding(new Insets(10));
+
+
+        Text fullText = new Text();
+        fullText.setText("Fullscreen mode");
+        fullText.getStyleClass().add("t3");
 
         Button fullscreen = new Button();
-        fullscreen.setText("Toggle Fullscreen (F11)");
+        fullscreen.setText("Toggle (F11)");
         fullscreen.getStyleClass().remove("toggle-button");
         fullscreen.getStyleClass().add("button");
         fullscreen.setOnAction(e -> Driver.primaryStage.setFullScreen(!Driver.primaryStage.isFullScreen()));
 
+        VBox fullBox = new VBox();
+        fullBox.getChildren().addAll(fullText,fullscreen);
+        fullBox.getStyleClass().add("box");
+        fullBox.setPadding(new Insets(10));
+
+
         Button devMenu = new Button();
         devMenu.setText("Debug Menu");
         devMenu.setOnAction(e -> Driver.debug.show());
@@ -50,10 +77,15 @@ public class Settings extends Pane
         exit.setText("Back");
         exit.setOnAction(e -> Driver.setMenu(new MainMenu()));
 
+        BorderPane buttonBox = new BorderPane();
+        buttonBox.setLeft(exit);
+        buttonBox.setRight(devMenu);
+
+
         VBox options = new VBox();
         options.setSpacing(10);
         options.setAlignment(Pos.CENTER);
-        options.getChildren().addAll(t1,musicVol,t2,sfxVol,fullscreen,devMenu,exit);
+        options.getChildren().addAll(musicBox,SFXBox,fullBox,buttonBox);
         options.maxWidthProperty().bind(super.prefWidthProperty().multiply(0.25)); 
         options.setMinWidth(400);
         options.prefHeightProperty().bind(super.prefHeightProperty());