Skip to content

Commit da7bf4a

Browse files
committed
UKeyboard: Add KEY_NUMPADENTER and isEnterKey method
1 parent 2d38021 commit da7bf4a

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

api/UniversalCraft.api

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,7 @@ public final class gg/essential/universal/UKeyboard {
483483
public static final field KEY_NUMPAD7 I
484484
public static final field KEY_NUMPAD8 I
485485
public static final field KEY_NUMPAD9 I
486+
public static final field KEY_NUMPADENTER I
486487
public static final field KEY_O I
487488
public static final field KEY_P I
488489
public static final field KEY_PERIOD I
@@ -523,6 +524,7 @@ public final class gg/essential/universal/UKeyboard {
523524
public static final fun getModifiers ()Lgg/essential/universal/UKeyboard$Modifiers;
524525
public static final fun isAltKeyDown ()Z
525526
public static final fun isCtrlKeyDown ()Z
527+
public static final fun isEnterKey (I)Z
526528
public static final fun isKeyComboCtrlA (I)Z
527529
public static final fun isKeyComboCtrlC (I)Z
528530
public static final fun isKeyComboCtrlShiftZ (I)Z

src/main/kotlin/gg/essential/universal/UKeyboard.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ object UKeyboard {
7676
//$$ @JvmField val KEY_NUMPAD7: Int = noInline { GLFW.GLFW_KEY_KP_7 }
7777
//$$ @JvmField val KEY_NUMPAD8: Int = noInline { GLFW.GLFW_KEY_KP_8 }
7878
//$$ @JvmField val KEY_NUMPAD9: Int = noInline { GLFW.GLFW_KEY_KP_9 }
79+
//$$ @JvmField val KEY_NUMPADENTER: Int = noInline { GLFW.GLFW_KEY_KP_ENTER }
7980
//$$ @JvmField val KEY_A: Int = noInline { GLFW.GLFW_KEY_A }
8081
//$$ @JvmField val KEY_B: Int = noInline { GLFW.GLFW_KEY_B }
8182
//$$ @JvmField val KEY_C: Int = noInline { GLFW.GLFW_KEY_C }
@@ -183,6 +184,7 @@ object UKeyboard {
183184
@JvmField val KEY_NUMPAD7: Int = noInline { Keyboard.KEY_NUMPAD7 }
184185
@JvmField val KEY_NUMPAD8: Int = noInline { Keyboard.KEY_NUMPAD8 }
185186
@JvmField val KEY_NUMPAD9: Int = noInline { Keyboard.KEY_NUMPAD9 }
187+
@JvmField val KEY_NUMPADENTER: Int = noInline { Keyboard.KEY_NUMPADENTER }
186188
@JvmField val KEY_A: Int = noInline { Keyboard.KEY_A }
187189
@JvmField val KEY_B: Int = noInline { Keyboard.KEY_B }
188190
@JvmField val KEY_C: Int = noInline { Keyboard.KEY_C }
@@ -311,6 +313,9 @@ object UKeyboard {
311313
//$$ return key in keysDown
312314
//$$ }
313315
//#else
316+
@JvmStatic
317+
fun isEnterKey(key: Int) = key == KEY_ENTER || key == KEY_NUMPADENTER
318+
314319
@JvmStatic
315320
fun isKeyDown(key: Int): Boolean {
316321
if (key == KEY_NONE) return false

0 commit comments

Comments
 (0)