From 9867f18f4c5b0f51a6ecc9274152a1fb9d1dedb5 Mon Sep 17 00:00:00 2001
From: Walker Selby <git@walkerselby.com>
Date: Fri, 8 Dec 2023 07:59:28 -0800
Subject: Localize Keypresses (#754)

Fixed control/modifier key logic on apple devices. #754
---
 .../skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt     | 2 +-
 .../hannibal2/skyhanni/features/misc/visualwords/VisualWordGui.kt   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

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

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(' ')
-- 
cgit