Quit the game if user triggers any of the Quit shortcuts after the Qu…

…it overlay is being displayed. Prevent Cmd+Q to trigger double actions.
brunoborges · Sep 2, 2019 · 08dd882 · 08dd882
1 parent a6ffa58
commit 08dd882
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 10 deletions.
diff --git a/src/main/java/game2048/Board.java b/src/main/java/game2048/Board.java
@@ -266,7 +266,7 @@ private void keepGoing() {
         timer.play();
     }
 
-    private void quit() {
+    private void exitGame() {
         timerPause.stop();
         Platform.exit();
     }
@@ -383,11 +383,11 @@ private void initGameProperties() {
         });
 
         bQuit.getStyleClass().add("game-button");
-        bQuit.setOnTouchPressed(e -> quit());
-        bQuit.setOnMouseClicked(e -> quit());
+        bQuit.setOnTouchPressed(e -> exitGame());
+        bQuit.setOnMouseClicked(e -> exitGame());
         bQuit.setOnKeyPressed(e -> {
             if (e.getCode().equals(KeyCode.ENTER) || e.getCode().equals(KeyCode.SPACE)) {
-                quit();
+                exitGame();
             }
         });
 
@@ -623,7 +623,9 @@ public void aboutGame() {
     }
 
     public void quitGame() {
-        if (!gameQuitProperty.get()) {
+        if (gameQuitProperty.get()) {
+            exitGame();
+        } else {
             gameQuitProperty.set(true);
         }
     }

diff --git a/src/main/java/game2048/Game2048.java b/src/main/java/game2048/Game2048.java
@@ -23,7 +23,7 @@ public Game2048() {
         applicationInstance = this;
     }
 
-    public synchronized static Application getInstance() {
+    public synchronized static Game2048 getInstance() {
         if (applicationInstance == null) {
             while (applicationInstance == null) {
                 try {
@@ -33,6 +33,7 @@ public synchronized static Application getInstance() {
                 }
             }
         }
+
         return applicationInstance;
     }
 

diff --git a/src/main/java/game2048/GamePane.java b/src/main/java/game2048/GamePane.java
@@ -1,5 +1,7 @@
 package game2048;
 
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.value.ChangeListener;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
@@ -48,31 +50,51 @@ public GamePane() {
         widthProperty().addListener(resize);
         heightProperty().addListener(resize);
 
-        addKeyHandler(this);
+        addKeyHandlers(this);
         addSwipeHandlers(this);
         setFocusTraversable(true);
         this.setOnMouseClicked(e -> requestFocus());
     }
 
-    private void addKeyHandler(Node node) {
+    private BooleanProperty cmdCtrlKeyPressed = new SimpleBooleanProperty(false);
+
+    private void addKeyHandlers(Node node) {
+        node.setOnKeyReleased(ke -> {
+            var keyCode = ke.getCode();
+
+            if (keyCode.equals(KeyCode.CONTROL)) {
+                cmdCtrlKeyPressed.set(false);
+            }
+        });
+
         node.setOnKeyPressed(ke -> {
             var keyCode = ke.getCode();
+
+            if (keyCode.equals(KeyCode.CONTROL) || keyCode.equals(KeyCode.COMMAND)) {
+                cmdCtrlKeyPressed.set(true);
+                return;
+            }
+
             if (keyCode.equals(KeyCode.S)) {
                 gameManager.saveSession();
                 return;
             }
+
             if (keyCode.equals(KeyCode.R)) {
                 gameManager.restoreSession();
                 return;
             }
+
             if (keyCode.equals(KeyCode.P)) {
                 gameManager.pauseGame();
                 return;
             }
-            if (keyCode.equals(KeyCode.Q) || keyCode.equals(KeyCode.ESCAPE)) {
+
+            if (cmdCtrlKeyPressed.get() == false && (keyCode.equals(KeyCode.Q) || keyCode.equals(KeyCode.ESCAPE))) {
                 gameManager.quitGame();
                 return;
             }
+
             if (keyCode.isArrowKey()) {
                 var direction = Direction.valueFor(keyCode);
                 move(direction);
@@ -102,7 +124,9 @@ private HBox createToolBar() {
         var btItem4 = createButtonItem("mReplay", "Try Again", t -> gameManager.tryAgain());
         var btItem5 = createButtonItem("mInfo", "About the Game", t -> gameManager.aboutGame());
         toolbar.getChildren().setAll(btItem1, btItem2, btItem3, btItem4, btItem5);
-        var btItem6 = createButtonItem("mQuit", "Quit Game", t -> gameManager.quitGame());
+        var btItem6 = createButtonItem("mQuit", "Quit Game", t -> {
+            gameManager.quitGame();
+        });
         toolbar.getChildren().add(btItem6);
         return toolbar;
     }