diff options
| author | Zach Jordan <zxjordan5@gmail.com> | 2023-05-25 10:01:32 -0400 |
|---|---|---|
| committer | Zach Jordan <zxjordan5@gmail.com> | 2023-05-25 10:01:32 -0400 |
| commit | 520d9347eebaa78a503b659431cf6cb935cc0adf (patch) | |
| tree | c79941e8744469a103b07dc4769ff9491f5c99e0 | |
| parent | 9e0efb69279e86e7462fa3a4bdb8b9198cc29a9f (diff) | |
| parent | c9452a2777847efa441a14d03414f5811a924288 (diff) | |
| download | NPEhero-520d9347eebaa78a503b659431cf6cb935cc0adf.tar.gz NPEhero-520d9347eebaa78a503b659431cf6cb935cc0adf.tar.bz2 NPEhero-520d9347eebaa78a503b659431cf6cb935cc0adf.zip | |
Merge branch 'main' of https://gitlab.sowgro.net/guitarheros/guitarhero
| -rw-r--r-- | src/gameplay/SongPlayer.java | 3 | ||||
| -rw-r--r-- | src/gui/Driver.java | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/gameplay/SongPlayer.java b/src/gameplay/SongPlayer.java index 61f6abc..d97dbd2 100644 --- a/src/gameplay/SongPlayer.java +++ b/src/gameplay/SongPlayer.java @@ -105,8 +105,7 @@ public class SongPlayer extends Pane { genButton(jButton); genButton(kButton); - super.requestFocus(); - super.setOnKeyPressed(e -> { + gui.Driver.primaryStage.getScene().setOnKeyPressed(e -> { if (e.getCode() == KeyCode.D) { checkNote(dLane, dButton); } diff --git a/src/gui/Driver.java b/src/gui/Driver.java index d6dc742..020d75d 100644 --- a/src/gui/Driver.java +++ b/src/gui/Driver.java @@ -26,8 +26,7 @@ import main.SettingsController; public class Driver extends Application { - - static Stage primaryStage; + public static Stage primaryStage; static Pane primaryPane = new Pane(); public static SettingsController settingsController = new SettingsController(); |