From 800888878e76b6fc5be3a27079b92276a9f74f23 Mon Sep 17 00:00:00 2001
From: Bixilon <bixilon@bixilon.de>
Date: Mon, 24 Jan 2022 13:05:38 +0100
Subject: [PATCH] pause menu buttons, input handler: fix key skipping

---
 .../rendering/gui/gui/screen/menu/pause/PauseMenu.kt   |  7 +++++--
 .../rendering/input/key/RenderWindowInputHandler.kt    | 10 +---------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/pause/PauseMenu.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/pause/PauseMenu.kt
index f6de3d227..39175a73c 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/pause/PauseMenu.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/pause/PauseMenu.kt
@@ -16,11 +16,14 @@ package de.bixilon.minosoft.gui.rendering.gui.gui.screen.menu.pause
 import de.bixilon.minosoft.gui.rendering.gui.GUIRenderer
 import de.bixilon.minosoft.gui.rendering.gui.elements.button.ButtonElement
 import de.bixilon.minosoft.gui.rendering.gui.gui.screen.menu.Menu
+import de.bixilon.minosoft.util.ShutdownManager
 
 class PauseMenu(guiRenderer: GUIRenderer) : Menu(guiRenderer) {
 
     init {
-        addButton(ButtonElement(guiRenderer, "Print \"Hello\" message") { println("Hello") })
-        addButton(ButtonElement(guiRenderer, "Print \"World\" message") { println("World") })
+        addButton(ButtonElement(guiRenderer, "Back to game") { guiRenderer.gui.pause(false) })
+        addButton(ButtonElement(guiRenderer, "§cDisconnect") { guiRenderer.connection.network.disconnect() })
+        addButton(ButtonElement(guiRenderer, "§4Exit") { ShutdownManager.shutdown() })
+        // ToDo: Double click button to disconnect
     }
 }
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/input/key/RenderWindowInputHandler.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/input/key/RenderWindowInputHandler.kt
index cc2f8ab8f..45495f6b9 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/input/key/RenderWindowInputHandler.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/input/key/RenderWindowInputHandler.kt
@@ -62,7 +62,6 @@ class RenderWindowInputHandler(
                 CursorModes.NORMAL
             }
         }
-    private var skipKeyPress = false
     private var skipCharPress = false
     private var skipMouseMove = false
 
@@ -122,13 +121,7 @@ class RenderWindowInputHandler(
 
     private fun keyInput(keyCode: KeyCodes, keyChangeType: KeyChangeTypes) {
         val inputHandler = inputHandler
-        if (inputHandler != null) {
-            if (skipKeyPress) {
-                skipKeyPress = false
-                return
-            }
-            inputHandler.onKeyPress(keyChangeType, keyCode)
-        }
+        inputHandler?.onKeyPress(keyChangeType, keyCode)
 
         val keyDown = when (keyChangeType) {
             KeyChangeTypes.PRESS -> true
@@ -247,7 +240,6 @@ class RenderWindowInputHandler(
 
 
         if (inputHandler != this.inputHandler) {
-            skipKeyPress = true
             skipCharPress = true
             skipMouseMove = true
         }