From 20081af74fd53f35746ab0d5c974bb5db92bec3b Mon Sep 17 00:00:00 2001
From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
Date: Fri, 13 Sep 2024 20:16:41 +0200
Subject: Fix: Mouse Keys in Wardrobe (#2506)

---
 .../java/at/hannibal2/skyhanni/utils/KeyboardManager.kt     | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/main/java/at/hannibal2/skyhanni/utils')

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/KeyboardManager.kt b/src/main/java/at/hannibal2/skyhanni/utils/KeyboardManager.kt
index dbdccb72a..f56ba4f0b 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/KeyboardManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/KeyboardManager.kt
@@ -108,16 +108,15 @@ object KeyboardManager {
         return this.isKeyDown || this.isPressed
     }
 
-    fun Int.isKeyHeld(): Boolean {
-        if (this == 0) return false
-        return if (this < 0) {
-            Mouse.isButtonDown(this + 100)
-        } else if (this >= Keyboard.KEYBOARD_SIZE) {
+    fun Int.isKeyHeld(): Boolean = when {
+        this == 0 -> false
+        this < 0 -> Mouse.isButtonDown(this + 100)
+        this >= Keyboard.KEYBOARD_SIZE -> {
             val pressedKey = if (Keyboard.getEventKey() == 0) Keyboard.getEventCharacter().code + 256 else Keyboard.getEventKey()
             Keyboard.getEventKeyState() && this == pressedKey
-        } else {
-            Keyboard.isKeyDown(this)
         }
+
+        else -> Keyboard.isKeyDown(this)
     }
 
     private val pressedKeys = mutableMapOf<Int, Boolean>()
-- 
cgit