summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/utils
diff options
context:
space:
mode:
authorJ10a1n15 <45315647+j10a1n15@users.noreply.github.com>2024-09-13 20:16:41 +0200
committerGitHub <noreply@github.com>2024-09-13 20:16:41 +0200
commit20081af74fd53f35746ab0d5c974bb5db92bec3b (patch)
tree8c297eb0a6fd36487e97b21eb1f34b2239ebb43a /src/main/java/at/hannibal2/skyhanni/utils
parent326c632ed18b7677c72d86497e54086c9b409e9c (diff)
downloadskyhanni-20081af74fd53f35746ab0d5c974bb5db92bec3b.tar.gz
skyhanni-20081af74fd53f35746ab0d5c974bb5db92bec3b.tar.bz2
skyhanni-20081af74fd53f35746ab0d5c974bb5db92bec3b.zip
Fix: Mouse Keys in Wardrobe (#2506)
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/utils')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/KeyboardManager.kt13
1 files changed, 6 insertions, 7 deletions
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>()