Merge branch 'main' of https://gitlab.sowgro.net/guitarheros/guitarhero into main

1 files changed, 4 insertions, 16 deletions

diff --git a/src/gui/MainMenu.java b/src/gui/MainMenu.java
index 3ad91ad..d04408d 100644
--- a/src/gui/MainMenu.java
+++ b/src/gui/MainMenu.java
@@ -1,16 +1,9 @@
 package gui;
 
-import javafx.event.EventHandler;
-import javafx.event.ActionEvent;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
 import javafx.scene.effect.BlurType;
 import javafx.scene.effect.DropShadow;
-import javafx.scene.layout.Border;
-import javafx.scene.layout.BorderStroke;
-import javafx.scene.layout.BorderStrokeStyle;
-import javafx.scene.layout.BorderWidths;
-import javafx.scene.layout.CornerRadii;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
 import javafx.scene.paint.Color;
@@ -21,7 +14,6 @@ public class MainMenu extends Pane
 {
     public MainMenu()
     {
-
         DropShadow dropShadow = new DropShadow();
         dropShadow.setRadius(50.0);
         dropShadow.setColor(Color.WHITE);
@@ -35,36 +27,32 @@ public class MainMenu extends Pane
 
         Button play = new Button();
         play.setText("Play");
-        play.setOnAction(e -> Driver.switchMenu("LevelSelector"));
+        play.setOnAction(e -> Driver.setMenu("LevelSelector"));
 
         Button settings = new Button();
         settings.setText("Settings");
-        settings.setOnAction(e -> Driver.switchMenu("Settings"));
+        settings.setOnAction(e -> Driver.setMenu("Settings"));
 
         Button leaderboard = new Button();
         leaderboard.setText("Leaderboard");
-        leaderboard.setOnAction(e -> Driver.switchMenu("Leaderboard"));
-
-        //Border border = new Border(new BorderStroke(Color.WHITE, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, BorderWidths.DEFAULT));
+        leaderboard.setOnAction(e -> Driver.setMenu("Leaderboard"));
 
         VBox buttonBox = new VBox();
         buttonBox.getChildren().addAll(play, settings, leaderboard);
         buttonBox.setAlignment(Pos.CENTER);
         buttonBox.setSpacing(10);
-        //buttonBox.setBorder(border);
 
         VBox centerBox = new VBox();
         centerBox.setAlignment(Pos.CENTER);
         centerBox.getChildren().addAll(title, buttonBox);
         centerBox.setSpacing(10);
-        //centerBox.setBorder(border);
 
         VBox rootBox = new VBox();
         rootBox.minWidthProperty().bind(super.widthProperty()); 
         rootBox.minHeightProperty().bind(super.heightProperty());
         rootBox.setAlignment(Pos.CENTER);
         rootBox.getChildren().add(centerBox);
-        //rootBox.setBorder(border);
+
         super.getChildren().add(rootBox);
         
     }