From 99584f39f8e8f3b69255135665040c2a947d4021 Mon Sep 17 00:00:00 2001 From: sowgro Date: Wed, 31 May 2023 11:46:37 -0400 Subject: leaderboard sort by score by default, and fix gameOver diff title --- src/gui/GameOver.java | 2 +- src/gui/Leaderboard.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/gui/GameOver.java b/src/gui/GameOver.java index aceae2a..8d6e8ea 100644 --- a/src/gui/GameOver.java +++ b/src/gui/GameOver.java @@ -32,7 +32,7 @@ public class GameOver extends Pane levelName.getStyleClass().add("t2"); Text levelArtist = new Text(); - levelArtist.setText(level.getArtist()+" - "+diff); + levelArtist.setText(level.getArtist()+" - "+diff.title); levelArtist.getStyleClass().add("t3"); VBox levelDetailsBox = new VBox(); diff --git a/src/gui/Leaderboard.java b/src/gui/Leaderboard.java index 3ddf4d1..219cd35 100644 --- a/src/gui/Leaderboard.java +++ b/src/gui/Leaderboard.java @@ -4,6 +4,7 @@ import javafx.geometry.Pos; import javafx.scene.control.Button; import javafx.scene.control.TableColumn; import javafx.scene.control.TableView; +import javafx.scene.control.TableColumn.SortType; import javafx.scene.control.cell.PropertyValueFactory; import javafx.scene.layout.HBox; import javafx.scene.layout.Pane; @@ -21,13 +22,12 @@ public class Leaderboard extends Pane */ public Leaderboard(Level level, Difficulty diff, Pane prev) { - //sets up table view: requires special getters, setters and constructors to work + //sets up table view: requires java bean getters, setters and constructors to work TableView scores = new TableView(); TableColumn nameCol = new TableColumn("Name"); TableColumn scoreCol = new TableColumn("Score"); TableColumn dateCol = new TableColumn("Date"); - //scoreCol.minWidthProperty().bind(scores.widthProperty().subtract(nameCol.widthProperty())); scores.getColumns().add(nameCol); scores.getColumns().add(scoreCol); @@ -44,6 +44,8 @@ public class Leaderboard extends Pane scores.prefWidthProperty().bind(super.prefWidthProperty().multiply(0.25)); scores.prefHeightProperty().bind(super.prefHeightProperty().multiply(0.75)); + scoreCol.setSortType(SortType.DESCENDING); + scores.getSortOrder().add(scoreCol); Button exit = new Button(); exit.setText("Back"); -- cgit v1.2.3