2
0
ncannasse 8 жил өмнө
parent
commit
8980be9cd6

+ 1 - 1
h2d/Console.hx

@@ -153,7 +153,7 @@ class Console extends h2d.Sprite {
 		if( !bg.visible )
 		if( !bg.visible )
 			return;
 			return;
 		switch( e.keyCode ) {
 		switch( e.keyCode ) {
-		case Key.ENTER:
+		case Key.ENTER, Key.NUMPAD_ENTER:
 			var cmd = tf.text;
 			var cmd = tf.text;
 			tf.text = "";
 			tf.text = "";
 			handleCommand(cmd);
 			handleCommand(cmd);

+ 1 - 1
h2d/TextInput.hx

@@ -108,7 +108,7 @@ class TextInput extends Text {
 					cursorIndex--;
 					cursorIndex--;
 					onChange();
 					onChange();
 				}
 				}
-			case K.ENTER:
+			case K.ENTER, K.NUMPAD_ENTER:
 				cursorIndex = -1;
 				cursorIndex = -1;
 				interactive.blur();
 				interactive.blur();
 				return;
 				return;

+ 8 - 8
hxd/System.hx

@@ -625,16 +625,16 @@ class System {
 			addKey(1058 + i, K.F1 + i);
 			addKey(1058 + i, K.F1 + i);
 
 
 		// NUMPAD
 		// NUMPAD
-		CHARMAP[1098] = "0".code;
-		CHARMAP[1085] = "*".code;
-		CHARMAP[1087] = "+".code;
-		CHARMAP[1088] = 13;
-		CHARMAP[1086] = "-".code;
-		CHARMAP[1084] = "/".code;
-		CHARMAP[1099] = ".".code;
-		addKey(1088, K.NUMPAD_0, "0".code);
+
+		addKey(1084, K.NUMPAD_DIV, "/".code);
+		addKey(1085, K.NUMPAD_MULT, "*".code);
+		addKey(1086, K.NUMPAD_SUB, "-".code);
+		addKey(1087, K.NUMPAD_ADD, "+".code);
+		addKey(1088, K.NUMPAD_ENTER, 13);
 		for( i in 0...9 )
 		for( i in 0...9 )
 			addKey(1089 + i, K.NUMPAD_1 + i, "1".code + i);
 			addKey(1089 + i, K.NUMPAD_1 + i, "1".code + i);
+		addKey(1098, K.NUMPAD_0, "0".code);
+		addKey(1099, K.NUMPAD_DOT, ".".code);
 
 
 		// EXTRA
 		// EXTRA
 		var keys = [
 		var keys = [