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

1 files changed, 17 insertions, 9 deletions

diff --git a/src/gui/Leaderboard.java b/src/gui/Leaderboard.java
index 598b6aa..9580a5f 100644
--- a/src/gui/Leaderboard.java
+++ b/src/gui/Leaderboard.java
@@ -1,12 +1,12 @@
 package gui;
 
+
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
 import javafx.scene.control.ListView;
+import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
 
@@ -17,16 +17,24 @@ public class Leaderboard extends Pane
         ListView<String> scores = new ListView<String>();
         ObservableList<String> scoreList= FXCollections.observableArrayList ("Test Score 1", "Test Score 2", "Test Score 3", "Test Score 4");
         scores.setItems(scoreList);
+        scores.minWidthProperty().bind(super.widthProperty().multiply(0.25)); 
+        scores.minHeightProperty().bind(super.heightProperty().multiply(0.75));
 
         Button exit = new Button();
         exit.setText("Exit");
-        exit.setOnAction(e -> Driver.switchMenu("MainMenu"));
+        exit.setOnAction(e -> Driver.setMenu("MainMenu"));
+
+        VBox centerBox = new VBox();
+        centerBox.setAlignment(Pos.CENTER);
+        centerBox.setSpacing(10);
+        centerBox.getChildren().addAll(scores,exit);
+
+        HBox rootBox = new HBox();
+        rootBox.minWidthProperty().bind(super.widthProperty()); 
+        rootBox.minHeightProperty().bind(super.heightProperty());
+        rootBox.getChildren().add(centerBox);
+        rootBox.setAlignment(Pos.CENTER);
 
-        VBox centerMenu3 = new VBox();
-        centerMenu3.minWidthProperty().bind(super.widthProperty()); 
-        centerMenu3.minHeightProperty().bind(super.heightProperty());
-        centerMenu3.setAlignment(Pos.CENTER);
-        centerMenu3.getChildren().addAll(scores,exit);
-        super.getChildren().add(centerMenu3);
+        super.getChildren().add(rootBox);
     }
 }