aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/utils/KeyboardManager.kt
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/utils/KeyboardManager.kt')
-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>()