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

Fix Mac OS move cursor behaviour

Browse Source
This commit is contained in:
megalike 2019-05-02 20:57:37 +03:00
parent 262924296b
commit 39398f173e
1 changed files with 24 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
scene/gui/text_edit.cpp
View File

@ -2275,6 +2275,30 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
k->set_command(true); k->set_command(true);
k->set_shift(false); k->set_shift(false);
} }
#ifdef APPLE_STYLE_KEYS
if (k->get_control() && !k->get_shift() && !k->get_alt() && !k->get_command()) {
uint32_t move_cursor_key = KEY_UNKNOWN;
switch (k->get_scancode()) {
case KEY_F: {
move_cursor_key = KEY_RIGHT;
} break;
case KEY_B: {
move_cursor_key = KEY_LEFT;
} break;
case KEY_P: {
move_cursor_key = KEY_UP;
} break;
case KEY_N: {
move_cursor_key = KEY_DOWN;
} break;
}
if (move_cursor_key != KEY_UNKNOWN) {
k->set_scancode(move_cursor_key);
k->set_control(false);
}
}
#endif
_reset_caret_blink_timer(); _reset_caret_blink_timer();
@ -2596,15 +2620,6 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
} }
FALLTHROUGH; FALLTHROUGH;
} }
#ifdef APPLE_STYLE_KEYS
case KEY_B: {
if (!k->get_control()) {
scancode_handled = false;
break;
}
FALLTHROUGH;
}
#endif
case KEY_LEFT: { case KEY_LEFT: {
if (k->get_shift()) if (k->get_shift())
@ -2681,15 +2696,6 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
} }
FALLTHROUGH; FALLTHROUGH;
} }
#ifdef APPLE_STYLE_KEYS
case KEY_F: {
if (!k->get_control()) {
scancode_handled = false;
break;
}
FALLTHROUGH;
}
#endif
case KEY_RIGHT: { case KEY_RIGHT: {
if (k->get_shift()) if (k->get_shift())
@ -2751,15 +2757,6 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
} }
FALLTHROUGH; FALLTHROUGH;
} }
#ifdef APPLE_STYLE_KEYS
case KEY_P: {
if (!k->get_control()) {
scancode_handled = false;
break;
}
FALLTHROUGH;
}
#endif
case KEY_UP: { case KEY_UP: {
if (k->get_alt()) { if (k->get_alt()) {
@ -2813,15 +2810,6 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) {
} }
FALLTHROUGH; FALLTHROUGH;
} }
#ifdef APPLE_STYLE_KEYS
case KEY_N: {
if (!k->get_control()) {
scancode_handled = false;
break;
}
FALLTHROUGH;
}
#endif
case KEY_DOWN: { case KEY_DOWN: {
if (k->get_alt()) { if (k->get_alt()) {