summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/misc
diff options
context:
space:
mode:
authorWalker Selby <git@walkerselby.com>2023-12-08 07:59:28 -0800
committerGitHub <noreply@github.com>2023-12-08 16:59:28 +0100
commit9867f18f4c5b0f51a6ecc9274152a1fb9d1dedb5 (patch)
tree161f9ed28b70bedbec2de3d9a078ea40398c4ec2 /src/main/java/at/hannibal2/skyhanni/features/misc
parentf87b7f68cbbcfd7a940fc4e3888ac94545132543 (diff)
downloadskyhanni-9867f18f4c5b0f51a6ecc9274152a1fb9d1dedb5.tar.gz
skyhanni-9867f18f4c5b0f51a6ecc9274152a1fb9d1dedb5.tar.bz2
skyhanni-9867f18f4c5b0f51a6ecc9274152a1fb9d1dedb5.zip
Localize Keypresses (#754)
Fixed control/modifier key logic on apple devices. #754
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/misc')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/VisualWordGui.kt6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt
index 2eac62d1f..5598386f8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt
@@ -140,7 +140,7 @@ object AdvancedPlayerList {
}
fun ignoreCustomTabList(): Boolean {
- val denyKeyPressed = SkyHanniMod.feature.dev.debug.enabled && KeyboardManager.isControlKeyDown()
+ val denyKeyPressed = SkyHanniMod.feature.dev.debug.enabled && KeyboardManager.isModifierKeyDown()
return denyKeyPressed || !SkyHanniDebugsAndTests.globalRender
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/VisualWordGui.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/VisualWordGui.kt
index a996d7277..03cf21b1d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/VisualWordGui.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/VisualWordGui.kt
@@ -459,7 +459,7 @@ open class VisualWordGui : GuiScreen() {
super.keyTyped(typedChar, keyCode)
if (!currentlyEditing) {
if (keyCode == Keyboard.KEY_DOWN || keyCode == Keyboard.KEY_S) {
- if (KeyboardManager.isControlKeyDown()) {
+ if (KeyboardManager.isModifierKeyDown()) {
pageScroll = -(SkyHanniMod.feature.storage.modifiedWords.size * 30 - 100)
} else {
pageScroll -= 30
@@ -467,7 +467,7 @@ open class VisualWordGui : GuiScreen() {
scrollScreen()
}
if (keyCode == Keyboard.KEY_UP || keyCode == Keyboard.KEY_W) {
- if (KeyboardManager.isControlKeyDown()) {
+ if (KeyboardManager.isModifierKeyDown()) {
pageScroll = 0
} else {
pageScroll += 30
@@ -481,7 +481,7 @@ open class VisualWordGui : GuiScreen() {
if (keyCode == Keyboard.KEY_BACK) {
if (currentText.isNotEmpty()) {
- currentText = if (KeyboardManager.isControlKeyDown()) {
+ currentText = if (KeyboardManager.isModifierKeyDown()) {
""
} else if (KeyboardManager.isShiftKeyDown()) {
val lastSpaceIndex = currentText.lastIndexOf(' ')