asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3754 from akien-mga/pr-subtract

Browse source 
Rename KEY_KP_SUBSTRACT to KEY_KP_SUBTRACT
This commit is contained in:
Rémi Verschelde 2016-02-17 23:33:13 +01:00
commit 16b0cf8bcb
9 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/global_constants.cpp
View file

@ -106,7 +106,7 @@ static _GlobalConstant _global_constants[]={
BIND_GLOBAL_CONSTANT( KEY_KP_ENTER ),
BIND_GLOBAL_CONSTANT( KEY_KP_MULTIPLY ),
BIND_GLOBAL_CONSTANT( KEY_KP_DIVIDE ),
BIND_GLOBAL_CONSTANT( KEY_KP_SUBSTRACT ),
BIND_GLOBAL_CONSTANT( KEY_KP_SUBTRACT ),
BIND_GLOBAL_CONSTANT( KEY_KP_PERIOD ),
BIND_GLOBAL_CONSTANT( KEY_KP_ADD ),
BIND_GLOBAL_CONSTANT( KEY_KP_0 ),

2
core/os/keyboard.cpp
View file

@ -82,7 +82,7 @@ static const _KeyCodeText _keycodes[]={
{KEY_KP_ENTER ,"Kp Enter"},
{KEY_KP_MULTIPLY ,"Kp Multiply"},
{KEY_KP_DIVIDE ,"Kp Divide"},
{KEY_KP_SUBSTRACT ,"Kp Substract"},
{KEY_KP_SUBTRACT ,"Kp Subtract"},
{KEY_KP_PERIOD ,"Kp Period"},
{KEY_KP_ADD ,"Kp Add"},
{KEY_KP_0 ,"Kp 0"},

2
core/os/keyboard.h
View file

@ -98,7 +98,7 @@ enum KeyList {
KEY_KP_ENTER=SPKEY | 0x80,
KEY_KP_MULTIPLY=SPKEY | 0x81,
KEY_KP_DIVIDE=SPKEY | 0x82,
KEY_KP_SUBSTRACT=SPKEY | 0x83,
KEY_KP_SUBTRACT=SPKEY | 0x83,
KEY_KP_PERIOD=SPKEY | 0x84,
KEY_KP_ADD=SPKEY | 0x85,
KEY_KP_0=SPKEY | 0x86,

2
doc/base/classes.xml
View file

@ -851,7 +851,7 @@
</constant>
<constant name="KEY_KP_DIVIDE" value="16777346">
</constant>
<constant name="KEY_KP_SUBSTRACT" value="16777347">
<constant name="KEY_KP_SUBTRACT" value="16777347">
</constant>
<constant name="KEY_KP_PERIOD" value="16777348">
</constant>

2
platform/haiku/key_mapping_haiku.cpp
View file

@ -160,7 +160,7 @@ unsigned int KeyMappingHaiku::get_keysym(int32 raw_char, int32 key) {
if (raw_char == B_UP_ARROW && key == 0x38) { return KEY_KP_8; }
if (raw_char == B_PAGE_UP && key == 0x39) { return KEY_KP_9; }
if (raw_char == 0x2F && key == 0x23) { return KEY_KP_DIVIDE; }
if (raw_char == 0x2D && key == 0x25) { return KEY_KP_SUBSTRACT; }
if (raw_char == 0x2D && key == 0x25) { return KEY_KP_SUBTRACT; }
if (raw_char == B_DELETE && key == 0x65) { return KEY_KP_PERIOD; }
if (raw_char == 0x10) {

2
platform/nacl/nacl_keycodes.h
View file

@ -286,7 +286,7 @@ static uint32_t godot_key(uint32_t p_key, bool& is_char) {
case VKEY_MULTIPLY: return KEY_KP_MULTIPLY;
case VKEY_ADD: return KEY_KP_ADD;
// case VKEY_SEPARATOR: return KEY_SEPARATOR;
case VKEY_SUBTRACT: return KEY_KP_SUBSTRACT;
case VKEY_SUBTRACT: return KEY_KP_SUBTRACT;
case VKEY_DECIMAL: return KEY_KP_PERIOD;
case VKEY_DIVIDE: return KEY_KP_DIVIDE;
case VKEY_F1: return KEY_F1;

2
platform/osx/os_osx.mm
View file

@ -650,7 +650,7 @@ static int translateKey(unsigned int key)
/* 4b */ KEY_KP_DIVIDE,
/* 4c */ KEY_KP_ENTER,
/* 4d */ KEY_UNKNOWN,
/* 4e */ KEY_KP_SUBSTRACT,
/* 4e */ KEY_KP_SUBTRACT,
/* 4f */ KEY_UNKNOWN,
/* 50 */ KEY_UNKNOWN,
/* 51 */ KEY_EQUAL, //wtf equal?

2
platform/windows/key_mapping_win.cpp
View file

@ -145,7 +145,7 @@ static _WinTranslatePair _vk_to_keycode[]={
{ KEY_KP_MULTIPLY,VK_MULTIPLY},// (0x6A)
{ KEY_KP_ADD,VK_ADD},// (0x6B)
//VK_SEPARATOR (0x6C)
{ KEY_KP_SUBSTRACT,VK_SUBTRACT},// (0x6D)
{ KEY_KP_SUBTRACT,VK_SUBTRACT},// (0x6D)
{ KEY_KP_PERIOD,VK_DECIMAL},// (0x6E)
{ KEY_KP_DIVIDE,VK_DIVIDE},// (0x6F)
{ KEY_F1,VK_F1},// (0x70)

2
platform/x11/key_mapping_x11.cpp
View file

@ -97,7 +97,7 @@ static _XTranslatePair _xkeysym_to_keycode[]={
{ XK_KP_Enter, KEY_KP_ENTER },
{ XK_KP_Multiply, KEY_KP_MULTIPLY},
{ XK_KP_Divide, KEY_KP_DIVIDE},
{ XK_KP_Subtract, KEY_KP_SUBSTRACT},
{ XK_KP_Subtract, KEY_KP_SUBTRACT},
{ XK_KP_Add, KEY_KP_ADD},
{ XK_KP_0, KEY_KP_0},
{ XK_KP_1, KEY_KP_1},