godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3269 from neikeq/numpad_arrows 

TextEdit/LineEdit: Handle numpad when NumLock is disabled
This commit is contained in:
Rémi Verschelde 2016-01-07 23:11:05 +01:00
parent 20e395def6 6541f6418e
commit 79c1392d17
2 changed files with 115 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
scene/gui/line_edit.cpp
View File

@ -245,12 +245,26 @@ void LineEdit::_input_event(InputEvent p_event) {
delete_char(); delete_char();
} }
} break; } break;
case KEY_KP_4: {
if (k.unicode != 0) {
handled = false;
break;
}
// numlock disabled. fallthrough to key_left
}
case KEY_LEFT: { case KEY_LEFT: {
shift_selection_check_pre(k.mod.shift); shift_selection_check_pre(k.mod.shift);
set_cursor_pos(get_cursor_pos()-1); set_cursor_pos(get_cursor_pos()-1);
shift_selection_check_post(k.mod.shift); shift_selection_check_post(k.mod.shift);
} break; } break;
case KEY_KP_6: {
if (k.unicode != 0) {
handled = false;
break;
}
// numlock disabled. fallthrough to key_right
}
case KEY_RIGHT: { case KEY_RIGHT: {
shift_selection_check_pre(k.mod.shift); shift_selection_check_pre(k.mod.shift);
@ -271,12 +285,26 @@ void LineEdit::_input_event(InputEvent p_event) {
} }
} break; } break;
case KEY_KP_7: {
if (k.unicode != 0) {
handled = false;
break;
}
// numlock disabled. fallthrough to key_home
}
case KEY_HOME: { case KEY_HOME: {
shift_selection_check_pre(k.mod.shift); shift_selection_check_pre(k.mod.shift);
set_cursor_pos(0); set_cursor_pos(0);
shift_selection_check_post(k.mod.shift); shift_selection_check_post(k.mod.shift);
} break; } break;
case KEY_KP_1: {
if (k.unicode != 0) {
handled = false;
break;
}
// numlock disabled. fallthrough to key_end
}
case KEY_END: { case KEY_END: {
shift_selection_check_pre(k.mod.shift); shift_selection_check_pre(k.mod.shift);
@ -287,6 +315,13 @@ void LineEdit::_input_event(InputEvent p_event) {
default: { default: {
handled=false;
} break;
}
if (handled) {
accept_event();
} else {
if (k.unicode>=32 && k.scancode!=KEY_DELETE) { if (k.unicode>=32 && k.scancode!=KEY_DELETE) {
if (editable) { if (editable) {
@ -298,15 +333,9 @@ void LineEdit::_input_event(InputEvent p_event) {
} }
} else { } else {
handled=false;
}
} break;
}
if (handled)
accept_event();
else
return; return;
}
}
selection.old_shift=k.mod.shift; selection.old_shift=k.mod.shift;

82
scene/gui/text_edit.cpp
View File

@ -1740,6 +1740,13 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
} }
} break; } break;
case KEY_KP_4: {
if (k.unicode != 0) {
scancode_handled = false;
break;
}
// numlock disabled. fallthrough to key_left
}
case KEY_LEFT: { case KEY_LEFT: {
if (k.mod.shift) if (k.mod.shift)
@ -1786,6 +1793,13 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
_post_shift_selection(); _post_shift_selection();
} break; } break;
case KEY_KP_6: {
if (k.unicode != 0) {
scancode_handled = false;
break;
}
// numlock disabled. fallthrough to key_right
}
case KEY_RIGHT: { case KEY_RIGHT: {
if (k.mod.shift) if (k.mod.shift)
@ -1829,6 +1843,13 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
_post_shift_selection(); _post_shift_selection();
} break; } break;
case KEY_KP_8: {
if (k.unicode != 0) {
scancode_handled = false;
break;
}
// numlock disabled. fallthrough to key_up
}
case KEY_UP: { case KEY_UP: {
if (k.mod.shift) if (k.mod.shift)
@ -1849,6 +1870,13 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
_cancel_code_hint(); _cancel_code_hint();
} break; } break;
case KEY_KP_2: {
if (k.unicode != 0) {
scancode_handled = false;
break;
}
// numlock disabled. fallthrough to key_down
}
case KEY_DOWN: { case KEY_DOWN: {
if (k.mod.shift) if (k.mod.shift)
@ -1937,6 +1965,13 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
update(); update();
} break; } break;
case KEY_KP_7: {
if (k.unicode != 0) {
scancode_handled = false;
break;
}
// numlock disabled. fallthrough to key_home
}
#ifdef APPLE_STYLE_KEYS #ifdef APPLE_STYLE_KEYS
case KEY_HOME: { case KEY_HOME: {
@ -1950,18 +1985,6 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
_post_shift_selection(); _post_shift_selection();
} break; } break;
case KEY_END: {
if (k.mod.shift)
_pre_shift_selection();
cursor_set_line(text.size()-1);
if (k.mod.shift)
_post_shift_selection();
} break;
#else #else
case KEY_HOME: { case KEY_HOME: {
@ -1992,6 +2015,27 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
completion_hint=""; completion_hint="";
} break; } break;
#endif
case KEY_KP_1: {
if (k.unicode != 0) {
scancode_handled = false;
break;
}
// numlock disabled. fallthrough to key_end
}
#ifdef APPLE_STYLE_KEYS
case KEY_END: {
if (k.mod.shift)
_pre_shift_selection();
cursor_set_line(text.size()-1);
if (k.mod.shift)
_post_shift_selection();
} break;
#else
case KEY_END: { case KEY_END: {
if (k.mod.shift) if (k.mod.shift)
@ -2009,6 +2053,13 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
} break; } break;
#endif #endif
case KEY_KP_9: {
if (k.unicode != 0) {
scancode_handled = false;
break;
}
// numlock disabled. fallthrough to key_pageup
}
case KEY_PAGEUP: { case KEY_PAGEUP: {
if (k.mod.shift) if (k.mod.shift)
@ -2024,6 +2075,13 @@ void TextEdit::_input_event(const InputEvent& p_input_event) {
} break; } break;
case KEY_KP_3: {
if (k.unicode != 0) {
scancode_handled = false;
break;
}
// numlock disabled. fallthrough to key_pageup
}
case KEY_PAGEDOWN: { case KEY_PAGEDOWN: {
if (k.mod.shift) if (k.mod.shift)