diff options
| author | Walker Selby <git@walkerselby.com> | 2023-12-08 07:59:28 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-08 16:59:28 +0100 |
| commit | 9867f18f4c5b0f51a6ecc9274152a1fb9d1dedb5 (patch) | |
| tree | 161f9ed28b70bedbec2de3d9a078ea40398c4ec2 /src/main/java/at/hannibal2/skyhanni/utils | |
| parent | f87b7f68cbbcfd7a940fc4e3888ac94545132543 (diff) | |
| download | skyhanni-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/utils')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/utils/KeyboardManager.kt | 11 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/KeyboardManager.kt b/src/main/java/at/hannibal2/skyhanni/utils/KeyboardManager.kt index 5078a492f..a776de1b9 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/KeyboardManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/KeyboardManager.kt @@ -16,15 +16,16 @@ object KeyboardManager { private var lastClickedMouseButton = -1 // A mac-only key, represents Windows key on windows (but different key code) - fun isCommandKeyDown() = Keyboard.KEY_LMETA.isKeyHeld() || Keyboard.KEY_RMETA.isKeyHeld() - fun isControlKeyDown() = Keyboard.KEY_LCONTROL.isKeyHeld() || Keyboard.KEY_RCONTROL.isKeyHeld() + private fun isCommandKeyDown() = Keyboard.KEY_LMETA.isKeyHeld() || Keyboard.KEY_RMETA.isKeyHeld() + private fun isControlKeyDown() = Keyboard.KEY_LCONTROL.isKeyHeld() || Keyboard.KEY_RCONTROL.isKeyHeld() fun isShiftKeyDown() = Keyboard.KEY_LSHIFT.isKeyHeld() || Keyboard.KEY_RSHIFT.isKeyHeld() - fun isPastingKeysDown() = isModifierHeld() && Keyboard.KEY_V.isKeyHeld() + fun isPastingKeysDown() = isModifierKeyDown() && Keyboard.KEY_V.isKeyHeld() - fun isCopyingKeysDown() = isModifierHeld() && Keyboard.KEY_C.isKeyHeld() + fun isCopyingKeysDown() = isModifierKeyDown() && Keyboard.KEY_C.isKeyHeld() - private fun isModifierHeld() = if (SystemUtils.IS_OS_MAC) isCommandKeyDown() else isControlKeyDown() + fun isModifierKeyDown() = if (SystemUtils.IS_OS_MAC) isCommandKeyDown() else isControlKeyDown() + fun getModifierKeyName(): String = if (SystemUtils.IS_OS_MAC) "Command" else "Control" @SubscribeEvent fun onTick(event: LorenzTickEvent) { diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt index 7ea533166..2ca14d2cb 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt @@ -96,7 +96,7 @@ class SkyHanniItemTracker<Data : ItemTrackerData>( val renderable = if (isInventoryOpen()) Renderable.clickAndHover(displayName, lore) { if (System.currentTimeMillis() > lastClickDelay + 150) { - if (KeyboardManager.isControlKeyDown()) { + if (KeyboardManager.isModifierKeyDown()) { data.items.remove(internalName) LorenzUtils.chat("Removed $cleanName §efrom Fishing Frofit Tracker.") lastClickDelay = System.currentTimeMillis() + 500 |