|
|
@@ -30,6 +30,7 @@
|
|
|
|
|
|
#include "line_edit.h"
|
|
|
|
|
|
+#include "core/input/input_map.h"
|
|
|
#include "core/object/message_queue.h"
|
|
|
#include "core/os/keyboard.h"
|
|
|
#include "core/os/os.h"
|
|
|
@@ -44,6 +45,175 @@
|
|
|
#endif
|
|
|
#include "scene/main/window.h"
|
|
|
|
|
|
+void LineEdit::_swap_current_input_direction() {
|
|
|
+ if (input_direction == TEXT_DIRECTION_LTR) {
|
|
|
+ input_direction = TEXT_DIRECTION_RTL;
|
|
|
+ } else {
|
|
|
+ input_direction = TEXT_DIRECTION_LTR;
|
|
|
+ }
|
|
|
+ set_cursor_position(get_cursor_position());
|
|
|
+ update();
|
|
|
+}
|
|
|
+
|
|
|
+void LineEdit::_move_cursor_left(bool p_select, bool p_move_by_word) {
|
|
|
+ if (selection.enabled && !p_select) {
|
|
|
+ set_cursor_position(selection.begin);
|
|
|
+ deselect();
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ shift_selection_check_pre(p_select);
|
|
|
+
|
|
|
+ if (p_move_by_word) {
|
|
|
+ int cc = cursor_pos;
|
|
|
+
|
|
|
+ Vector<Vector2i> words = TS->shaped_text_get_word_breaks(text_rid);
|
|
|
+ for (int i = words.size() - 1; i >= 0; i--) {
|
|
|
+ if (words[i].x < cc) {
|
|
|
+ cc = words[i].x;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ set_cursor_position(cc);
|
|
|
+ } else {
|
|
|
+ if (mid_grapheme_caret_enabled) {
|
|
|
+ set_cursor_position(get_cursor_position() - 1);
|
|
|
+ } else {
|
|
|
+ set_cursor_position(TS->shaped_text_prev_grapheme_pos(text_rid, get_cursor_position()));
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ shift_selection_check_post(p_select);
|
|
|
+}
|
|
|
+
|
|
|
+void LineEdit::_move_cursor_right(bool p_select, bool p_move_by_word) {
|
|
|
+ if (selection.enabled && !p_select) {
|
|
|
+ set_cursor_position(selection.end);
|
|
|
+ deselect();
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ shift_selection_check_pre(p_select);
|
|
|
+
|
|
|
+ if (p_move_by_word) {
|
|
|
+ int cc = cursor_pos;
|
|
|
+
|
|
|
+ Vector<Vector2i> words = TS->shaped_text_get_word_breaks(text_rid);
|
|
|
+ for (int i = 0; i < words.size(); i++) {
|
|
|
+ if (words[i].y > cc) {
|
|
|
+ cc = words[i].y;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ set_cursor_position(cc);
|
|
|
+ } else {
|
|
|
+ if (mid_grapheme_caret_enabled) {
|
|
|
+ set_cursor_position(get_cursor_position() + 1);
|
|
|
+ } else {
|
|
|
+ set_cursor_position(TS->shaped_text_next_grapheme_pos(text_rid, get_cursor_position()));
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ shift_selection_check_post(p_select);
|
|
|
+}
|
|
|
+
|
|
|
+void LineEdit::_move_cursor_start(bool p_select) {
|
|
|
+ shift_selection_check_pre(p_select);
|
|
|
+ set_cursor_position(0);
|
|
|
+ shift_selection_check_post(p_select);
|
|
|
+}
|
|
|
+
|
|
|
+void LineEdit::_move_cursor_end(bool p_select) {
|
|
|
+ shift_selection_check_pre(p_select);
|
|
|
+ set_cursor_position(text.length());
|
|
|
+ shift_selection_check_post(p_select);
|
|
|
+}
|
|
|
+
|
|
|
+void LineEdit::_backspace(bool p_word, bool p_all_to_left) {
|
|
|
+ if (!editable) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (p_all_to_left) {
|
|
|
+ deselect();
|
|
|
+ text = text.substr(0, cursor_pos);
|
|
|
+ _text_changed();
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (selection.enabled) {
|
|
|
+ selection_delete();
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (p_word) {
|
|
|
+ int cc = cursor_pos;
|
|
|
+
|
|
|
+ Vector<Vector2i> words = TS->shaped_text_get_word_breaks(text_rid);
|
|
|
+ for (int i = words.size() - 1; i >= 0; i--) {
|
|
|
+ if (words[i].x < cc) {
|
|
|
+ cc = words[i].x;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ delete_text(cc, cursor_pos);
|
|
|
+
|
|
|
+ set_cursor_position(cc);
|
|
|
+ } else {
|
|
|
+ delete_char();
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+void LineEdit::_delete(bool p_word, bool p_all_to_right) {
|
|
|
+ if (!editable) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (p_all_to_right) {
|
|
|
+ deselect();
|
|
|
+ text = text.substr(cursor_pos, text.length() - cursor_pos);
|
|
|
+ _shape();
|
|
|
+ set_cursor_position(0);
|
|
|
+ _text_changed();
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (selection.enabled) {
|
|
|
+ selection_delete();
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ int text_len = text.length();
|
|
|
+
|
|
|
+ if (cursor_pos == text_len) {
|
|
|
+ return; // Nothing to do.
|
|
|
+ }
|
|
|
+
|
|
|
+ if (p_word) {
|
|
|
+ int cc = cursor_pos;
|
|
|
+ Vector<Vector2i> words = TS->shaped_text_get_word_breaks(text_rid);
|
|
|
+ for (int i = 0; i < words.size(); i++) {
|
|
|
+ if (words[i].y > cc) {
|
|
|
+ cc = words[i].y;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ delete_text(cursor_pos, cc);
|
|
|
+ } else {
|
|
|
+ if (mid_grapheme_caret_enabled) {
|
|
|
+ set_cursor_position(cursor_pos + 1);
|
|
|
+ delete_char();
|
|
|
+ } else {
|
|
|
+ int cc = cursor_pos;
|
|
|
+ set_cursor_position(TS->shaped_text_next_grapheme_pos(text_rid, cursor_pos));
|
|
|
+ delete_text(cc, cursor_pos);
|
|
|
+ }
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
void LineEdit::_gui_input(Ref<InputEvent> p_event) {
|
|
|
Ref<InputEventMouseButton> b = p_event;
|
|
|
|
|
|
@@ -55,7 +225,7 @@ void LineEdit::_gui_input(Ref<InputEvent> p_event) {
|
|
|
if (b->is_pressed() && b->get_button_index() == BUTTON_RIGHT && context_menu_enabled) {
|
|
|
menu->set_position(get_screen_transform().xform(get_local_mouse_position()));
|
|
|
menu->set_size(Vector2(1, 1));
|
|
|
- //menu->set_scale(get_global_transform().get_scale());
|
|
|
+ _generate_context_menu();
|
|
|
menu->popup();
|
|
|
grab_focus();
|
|
|
accept_event();
|
|
|
@@ -153,453 +323,163 @@ void LineEdit::_gui_input(Ref<InputEvent> p_event) {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
-#ifdef APPLE_STYLE_KEYS
|
|
|
- if (k->get_control() && !k->get_shift() && !k->get_alt() && !k->get_command()) {
|
|
|
- uint32_t remap_key = KEY_UNKNOWN;
|
|
|
- switch (k->get_keycode()) {
|
|
|
- case KEY_F: {
|
|
|
- remap_key = KEY_RIGHT;
|
|
|
- } break;
|
|
|
- case KEY_B: {
|
|
|
- remap_key = KEY_LEFT;
|
|
|
- } break;
|
|
|
- case KEY_P: {
|
|
|
- remap_key = KEY_UP;
|
|
|
- } break;
|
|
|
- case KEY_N: {
|
|
|
- remap_key = KEY_DOWN;
|
|
|
- } break;
|
|
|
- case KEY_D: {
|
|
|
- remap_key = KEY_DELETE;
|
|
|
- } break;
|
|
|
- case KEY_H: {
|
|
|
- remap_key = KEY_BACKSPACE;
|
|
|
- } break;
|
|
|
- case KEY_A: {
|
|
|
- remap_key = KEY_HOME;
|
|
|
- } break;
|
|
|
- case KEY_E: {
|
|
|
- remap_key = KEY_END;
|
|
|
- } break;
|
|
|
+ if (context_menu_enabled) {
|
|
|
+ if (k->is_action("ui_menu", true)) {
|
|
|
+ Point2 pos = Point2(get_cursor_pixel_pos().x, (get_size().y + get_theme_font("font")->get_height(get_theme_font_size("font_size"))) / 2);
|
|
|
+ menu->set_position(get_global_transform().xform(pos));
|
|
|
+ menu->set_size(Vector2(1, 1));
|
|
|
+ _generate_context_menu();
|
|
|
+ menu->popup();
|
|
|
+ menu->grab_focus();
|
|
|
}
|
|
|
+ }
|
|
|
|
|
|
- if (remap_key != KEY_UNKNOWN) {
|
|
|
- k->set_keycode(remap_key);
|
|
|
- k->set_control(false);
|
|
|
+ // Default is ENTER, KP_ENTER. Cannot use ui_accept as default includes SPACE
|
|
|
+ if (k->is_action("ui_text_newline", true)) {
|
|
|
+ emit_signal("text_entered", text);
|
|
|
+ if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_VIRTUAL_KEYBOARD) && virtual_keyboard_enabled) {
|
|
|
+ DisplayServer::get_singleton()->virtual_keyboard_hide();
|
|
|
}
|
|
|
}
|
|
|
-#endif
|
|
|
-
|
|
|
- unsigned int code = k->get_keycode();
|
|
|
-
|
|
|
- if (k->get_command() && is_shortcut_keys_enabled()) {
|
|
|
- bool handled = true;
|
|
|
-
|
|
|
- switch (code) {
|
|
|
- case (KEY_QUOTELEFT): { // Swap current input direction (primary cursor)
|
|
|
-
|
|
|
- if (input_direction == TEXT_DIRECTION_LTR) {
|
|
|
- input_direction = TEXT_DIRECTION_RTL;
|
|
|
- } else {
|
|
|
- input_direction = TEXT_DIRECTION_LTR;
|
|
|
- }
|
|
|
- set_cursor_position(get_cursor_position());
|
|
|
- update();
|
|
|
-
|
|
|
- } break;
|
|
|
-
|
|
|
- case (KEY_X): { // CUT.
|
|
|
-
|
|
|
- if (editable) {
|
|
|
- cut_text();
|
|
|
- }
|
|
|
-
|
|
|
- } break;
|
|
|
-
|
|
|
- case (KEY_C): { // COPY.
|
|
|
-
|
|
|
- copy_text();
|
|
|
-
|
|
|
- } break;
|
|
|
-
|
|
|
- case (KEY_Y): // PASTE (Yank for unix users).
|
|
|
- case (KEY_V): { // PASTE.
|
|
|
-
|
|
|
- if (editable) {
|
|
|
- paste_text();
|
|
|
- }
|
|
|
-
|
|
|
- } break;
|
|
|
-
|
|
|
- case (KEY_Z): { // Undo/redo.
|
|
|
- if (editable) {
|
|
|
- if (k->get_shift()) {
|
|
|
- redo();
|
|
|
- } else {
|
|
|
- undo();
|
|
|
- }
|
|
|
- }
|
|
|
- } break;
|
|
|
-
|
|
|
- case (KEY_U): { // Delete from start to cursor.
|
|
|
-
|
|
|
- if (editable) {
|
|
|
- deselect();
|
|
|
- text = text.substr(cursor_pos, text.length() - cursor_pos);
|
|
|
- _shape();
|
|
|
- set_cursor_position(0);
|
|
|
- _text_changed();
|
|
|
- }
|
|
|
|
|
|
- } break;
|
|
|
-
|
|
|
- case (KEY_K): { // Delete from cursor_pos to end.
|
|
|
-
|
|
|
- if (editable) {
|
|
|
- deselect();
|
|
|
- text = text.substr(0, cursor_pos);
|
|
|
- _text_changed();
|
|
|
- }
|
|
|
+ if (is_shortcut_keys_enabled()) {
|
|
|
+ if (k->is_action("ui_copy", true)) {
|
|
|
+ copy_text();
|
|
|
+ accept_event();
|
|
|
+ return;
|
|
|
+ }
|
|
|
|
|
|
- } break;
|
|
|
- case (KEY_A): { // Select all.
|
|
|
- select();
|
|
|
+ if (k->is_action("ui_text_select_all", true)) {
|
|
|
+ select();
|
|
|
+ accept_event();
|
|
|
+ return;
|
|
|
+ }
|
|
|
|
|
|
- } break;
|
|
|
-#ifdef APPLE_STYLE_KEYS
|
|
|
- case (KEY_LEFT): { // Go to start of text - like HOME key.
|
|
|
- shift_selection_check_pre(k->get_shift());
|
|
|
- set_cursor_position(0);
|
|
|
- shift_selection_check_post(k->get_shift());
|
|
|
- } break;
|
|
|
- case (KEY_RIGHT): { // Go to end of text - like END key.
|
|
|
- shift_selection_check_pre(k->get_shift());
|
|
|
- set_cursor_position(text.length());
|
|
|
- shift_selection_check_post(k->get_shift());
|
|
|
- } break;
|
|
|
- case (KEY_BACKSPACE): {
|
|
|
- if (!editable)
|
|
|
- break;
|
|
|
+ // Cut / Paste
|
|
|
+ if (k->is_action("ui_cut", true)) {
|
|
|
+ cut_text();
|
|
|
+ accept_event();
|
|
|
+ return;
|
|
|
+ }
|
|
|
|
|
|
- // If selected, delete the selection
|
|
|
- if (selection.enabled) {
|
|
|
- selection_delete();
|
|
|
- break;
|
|
|
- }
|
|
|
+ if (k->is_action("ui_paste", true)) {
|
|
|
+ paste_text();
|
|
|
+ accept_event();
|
|
|
+ return;
|
|
|
+ }
|
|
|
|
|
|
- // Otherwise delete from cursor to beginning of text edit
|
|
|
- int current_pos = get_cursor_position();
|
|
|
- if (current_pos != 0) {
|
|
|
- delete_text(0, current_pos);
|
|
|
- }
|
|
|
- } break;
|
|
|
-#endif
|
|
|
- default: {
|
|
|
- handled = false;
|
|
|
- }
|
|
|
+ // Undo / Redo
|
|
|
+ if (k->is_action("ui_undo", true)) {
|
|
|
+ undo();
|
|
|
+ accept_event();
|
|
|
+ return;
|
|
|
}
|
|
|
|
|
|
- if (handled) {
|
|
|
+ if (k->is_action("ui_redo", true)) {
|
|
|
+ redo();
|
|
|
accept_event();
|
|
|
return;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- _reset_caret_blink_timer();
|
|
|
- if (!k->get_metakey()) {
|
|
|
- bool handled = true;
|
|
|
- switch (code) {
|
|
|
- case KEY_KP_ENTER:
|
|
|
- case KEY_ENTER: {
|
|
|
- emit_signal("text_entered", text);
|
|
|
- if (DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_VIRTUAL_KEYBOARD) && virtual_keyboard_enabled) {
|
|
|
- DisplayServer::get_singleton()->virtual_keyboard_hide();
|
|
|
- }
|
|
|
-
|
|
|
- } break;
|
|
|
-
|
|
|
- case KEY_BACKSPACE: {
|
|
|
- if (!editable) {
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- if (selection.enabled) {
|
|
|
- selection_delete();
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
-#ifdef APPLE_STYLE_KEYS
|
|
|
- if (k->get_alt()) {
|
|
|
-#else
|
|
|
- if (k->get_alt()) {
|
|
|
- handled = false;
|
|
|
- break;
|
|
|
- } else if (k->get_command()) {
|
|
|
-#endif
|
|
|
- int cc = cursor_pos;
|
|
|
-
|
|
|
- Vector<Vector2i> words = TS->shaped_text_get_word_breaks(text_rid);
|
|
|
- for (int i = words.size() - 1; i >= 0; i--) {
|
|
|
- if (words[i].x < cc) {
|
|
|
- cc = words[i].x;
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- delete_text(cc, cursor_pos);
|
|
|
-
|
|
|
- set_cursor_position(cc);
|
|
|
-
|
|
|
- } else {
|
|
|
- delete_char();
|
|
|
- }
|
|
|
-
|
|
|
- } break;
|
|
|
- case KEY_KP_4: {
|
|
|
- if (k->get_unicode() != 0) {
|
|
|
- handled = false;
|
|
|
- break;
|
|
|
- }
|
|
|
- [[fallthrough]];
|
|
|
- }
|
|
|
- case KEY_LEFT: {
|
|
|
-#ifndef APPLE_STYLE_KEYS
|
|
|
- if (!k->get_alt()) {
|
|
|
-#endif
|
|
|
- if (selection.enabled && !k->get_shift()) {
|
|
|
- set_cursor_position(selection.begin);
|
|
|
- deselect();
|
|
|
- handled = true;
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- shift_selection_check_pre(k->get_shift());
|
|
|
-#ifndef APPLE_STYLE_KEYS
|
|
|
- }
|
|
|
-#endif
|
|
|
-
|
|
|
-#ifdef APPLE_STYLE_KEYS
|
|
|
- if (k->get_command()) {
|
|
|
- set_cursor_position(0);
|
|
|
- } else if (k->get_alt()) {
|
|
|
-#else
|
|
|
- if (k->get_alt()) {
|
|
|
- handled = false;
|
|
|
- break;
|
|
|
- } else if (k->get_command()) {
|
|
|
-#endif
|
|
|
- int cc = cursor_pos;
|
|
|
-
|
|
|
- Vector<Vector2i> words = TS->shaped_text_get_word_breaks(text_rid);
|
|
|
- for (int i = words.size() - 1; i >= 0; i--) {
|
|
|
- if (words[i].x < cc) {
|
|
|
- cc = words[i].x;
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- set_cursor_position(cc);
|
|
|
-
|
|
|
- } else {
|
|
|
- if (mid_grapheme_caret_enabled) {
|
|
|
- set_cursor_position(get_cursor_position() - 1);
|
|
|
- } else {
|
|
|
- set_cursor_position(TS->shaped_text_prev_grapheme_pos(text_rid, get_cursor_position()));
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- shift_selection_check_post(k->get_shift());
|
|
|
-
|
|
|
- } break;
|
|
|
- case KEY_KP_6: {
|
|
|
- if (k->get_unicode() != 0) {
|
|
|
- handled = false;
|
|
|
- break;
|
|
|
- }
|
|
|
- [[fallthrough]];
|
|
|
- }
|
|
|
- case KEY_RIGHT: {
|
|
|
-#ifndef APPLE_STYLE_KEYS
|
|
|
- if (!k->get_alt()) {
|
|
|
-#endif
|
|
|
- if (selection.enabled && !k->get_shift()) {
|
|
|
- set_cursor_position(selection.end);
|
|
|
- deselect();
|
|
|
- handled = true;
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- shift_selection_check_pre(k->get_shift());
|
|
|
-#ifndef APPLE_STYLE_KEYS
|
|
|
- }
|
|
|
-#endif
|
|
|
-
|
|
|
-#ifdef APPLE_STYLE_KEYS
|
|
|
- if (k->get_command()) {
|
|
|
- set_cursor_position(text.length());
|
|
|
- } else if (k->get_alt()) {
|
|
|
-#else
|
|
|
- if (k->get_alt()) {
|
|
|
- handled = false;
|
|
|
- break;
|
|
|
- } else if (k->get_command()) {
|
|
|
-#endif
|
|
|
- int cc = cursor_pos;
|
|
|
-
|
|
|
- Vector<Vector2i> words = TS->shaped_text_get_word_breaks(text_rid);
|
|
|
- for (int i = 0; i < words.size(); i++) {
|
|
|
- if (words[i].y > cc) {
|
|
|
- cc = words[i].y;
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- set_cursor_position(cc);
|
|
|
-
|
|
|
- } else {
|
|
|
- if (mid_grapheme_caret_enabled) {
|
|
|
- set_cursor_position(get_cursor_position() + 1);
|
|
|
- } else {
|
|
|
- set_cursor_position(TS->shaped_text_next_grapheme_pos(text_rid, get_cursor_position()));
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- shift_selection_check_post(k->get_shift());
|
|
|
-
|
|
|
- } break;
|
|
|
- case KEY_UP: {
|
|
|
- shift_selection_check_pre(k->get_shift());
|
|
|
- if (get_cursor_position() == 0) {
|
|
|
- handled = false;
|
|
|
- }
|
|
|
- set_cursor_position(0);
|
|
|
- shift_selection_check_post(k->get_shift());
|
|
|
- } break;
|
|
|
- case KEY_DOWN: {
|
|
|
- shift_selection_check_pre(k->get_shift());
|
|
|
- if (get_cursor_position() == text.length()) {
|
|
|
- handled = false;
|
|
|
- }
|
|
|
- set_cursor_position(text.length());
|
|
|
- shift_selection_check_post(k->get_shift());
|
|
|
- } break;
|
|
|
- case KEY_DELETE: {
|
|
|
- if (!editable) {
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- if (k->get_shift() && !k->get_command() && !k->get_alt()) {
|
|
|
- cut_text();
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- if (selection.enabled) {
|
|
|
- selection_delete();
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- int text_len = text.length();
|
|
|
+ // BACKSPACE
|
|
|
+ if (k->is_action("ui_text_backspace_all_to_left", true)) {
|
|
|
+ _backspace(false, true);
|
|
|
+ accept_event();
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (k->is_action("ui_text_backspace_word", true)) {
|
|
|
+ _backspace(true);
|
|
|
+ accept_event();
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (k->is_action("ui_text_backspace", true)) {
|
|
|
+ _backspace();
|
|
|
+ accept_event();
|
|
|
+ return;
|
|
|
+ }
|
|
|
|
|
|
- if (cursor_pos == text_len) {
|
|
|
- break; // Nothing to do.
|
|
|
- }
|
|
|
+ // DELETE
|
|
|
+ if (k->is_action("ui_text_delete_all_to_right", true)) {
|
|
|
+ _delete(false, true);
|
|
|
+ accept_event();
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (k->is_action("ui_text_delete_word", true)) {
|
|
|
+ _delete(true);
|
|
|
+ accept_event();
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (k->is_action("ui_text_delete", true)) {
|
|
|
+ _delete();
|
|
|
+ accept_event();
|
|
|
+ return;
|
|
|
+ }
|
|
|
|
|
|
-#ifdef APPLE_STYLE_KEYS
|
|
|
- if (k->get_alt()) {
|
|
|
-#else
|
|
|
- if (k->get_alt()) {
|
|
|
- handled = false;
|
|
|
- break;
|
|
|
- } else if (k->get_command()) {
|
|
|
-#endif
|
|
|
- int cc = cursor_pos;
|
|
|
+ // Cursor Movement
|
|
|
|
|
|
- Vector<Vector2i> words = TS->shaped_text_get_word_breaks(text_rid);
|
|
|
- for (int i = 0; i < words.size(); i++) {
|
|
|
- if (words[i].y > cc) {
|
|
|
- cc = words[i].y;
|
|
|
- break;
|
|
|
- }
|
|
|
- }
|
|
|
+ k = k->duplicate();
|
|
|
+ bool shift_pressed = k->get_shift();
|
|
|
+ // Remove shift or else actions will not match. Use above variable for selection.
|
|
|
+ k->set_shift(false);
|
|
|
|
|
|
- delete_text(cursor_pos, cc);
|
|
|
+ if (k->is_action("ui_text_caret_word_left", true)) {
|
|
|
+ _move_cursor_left(shift_pressed, true);
|
|
|
+ accept_event();
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (k->is_action("ui_text_caret_left", true)) {
|
|
|
+ _move_cursor_left(shift_pressed);
|
|
|
+ accept_event();
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (k->is_action("ui_text_caret_word_right", true)) {
|
|
|
+ _move_cursor_right(shift_pressed, true);
|
|
|
+ accept_event();
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (k->is_action("ui_text_caret_right", true)) {
|
|
|
+ _move_cursor_right(shift_pressed, false);
|
|
|
+ accept_event();
|
|
|
+ return;
|
|
|
+ }
|
|
|
|
|
|
- } else {
|
|
|
- if (mid_grapheme_caret_enabled) {
|
|
|
- set_cursor_position(cursor_pos + 1);
|
|
|
- delete_char();
|
|
|
- } else {
|
|
|
- int cc = cursor_pos;
|
|
|
- set_cursor_position(TS->shaped_text_next_grapheme_pos(text_rid, cursor_pos));
|
|
|
- delete_text(cc, cursor_pos);
|
|
|
- }
|
|
|
- }
|
|
|
+ // Up = Home, Down = End
|
|
|
+ if (k->is_action("ui_text_caret_up", true) || k->is_action("ui_text_caret_line_start", true) || k->is_action("ui_text_caret_page_up", true)) {
|
|
|
+ _move_cursor_start(shift_pressed);
|
|
|
+ accept_event();
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if (k->is_action("ui_text_caret_down", true) || k->is_action("ui_text_caret_line_end", true) || k->is_action("ui_text_caret_page_down", true)) {
|
|
|
+ _move_cursor_end(shift_pressed);
|
|
|
+ accept_event();
|
|
|
+ return;
|
|
|
+ }
|
|
|
|
|
|
- } break;
|
|
|
- case KEY_KP_7: {
|
|
|
- if (k->get_unicode() != 0) {
|
|
|
- handled = false;
|
|
|
- break;
|
|
|
- }
|
|
|
- [[fallthrough]];
|
|
|
- }
|
|
|
- case KEY_HOME: {
|
|
|
- shift_selection_check_pre(k->get_shift());
|
|
|
- set_cursor_position(0);
|
|
|
- shift_selection_check_post(k->get_shift());
|
|
|
- } break;
|
|
|
- case KEY_KP_1: {
|
|
|
- if (k->get_unicode() != 0) {
|
|
|
- handled = false;
|
|
|
- break;
|
|
|
- }
|
|
|
- [[fallthrough]];
|
|
|
- }
|
|
|
- case KEY_END: {
|
|
|
- shift_selection_check_pre(k->get_shift());
|
|
|
- set_cursor_position(text.length());
|
|
|
- shift_selection_check_post(k->get_shift());
|
|
|
- } break;
|
|
|
- case KEY_MENU: {
|
|
|
- if (context_menu_enabled) {
|
|
|
- Point2 pos = Point2(get_cursor_pixel_pos().x, (get_size().y + get_theme_font("font")->get_height(get_theme_font_size("font_size"))) / 2);
|
|
|
- menu->set_position(get_global_transform().xform(pos));
|
|
|
- menu->set_size(Vector2(1, 1));
|
|
|
- //menu->set_scale(get_global_transform().get_scale());
|
|
|
- menu->popup();
|
|
|
- menu->grab_focus();
|
|
|
- }
|
|
|
- } break;
|
|
|
+ // Misc
|
|
|
+ if (k->is_action("ui_swap_input_direction", true)) {
|
|
|
+ _swap_current_input_direction();
|
|
|
+ accept_event();
|
|
|
+ return;
|
|
|
+ }
|
|
|
|
|
|
- default: {
|
|
|
- handled = false;
|
|
|
- } break;
|
|
|
- }
|
|
|
+ _reset_caret_blink_timer();
|
|
|
|
|
|
- if (handled) {
|
|
|
- accept_event();
|
|
|
- } else if (!k->get_command()) {
|
|
|
- if (k->get_unicode() >= 32 && k->get_keycode() != KEY_DELETE) {
|
|
|
- if (editable) {
|
|
|
- selection_delete();
|
|
|
- char32_t ucodestr[2] = { (char32_t)k->get_unicode(), 0 };
|
|
|
- int prev_len = text.length();
|
|
|
- append_at_cursor(ucodestr);
|
|
|
- if (text.length() != prev_len) {
|
|
|
- _text_changed();
|
|
|
- }
|
|
|
- accept_event();
|
|
|
- }
|
|
|
+ // Allow unicode handling if:
|
|
|
+ // * No Modifiers are pressed (except shift)
|
|
|
+ bool allow_unicode_handling = !(k->get_command() || k->get_control() || k->get_alt() || k->get_metakey());
|
|
|
|
|
|
- } else {
|
|
|
- return;
|
|
|
- }
|
|
|
+ if (allow_unicode_handling && editable && k->get_unicode() >= 32) {
|
|
|
+ // Handle Unicode (if no modifiers active)
|
|
|
+ selection_delete();
|
|
|
+ char32_t ucodestr[2] = { (char32_t)k->get_unicode(), 0 };
|
|
|
+ int prev_len = text.length();
|
|
|
+ append_at_cursor(ucodestr);
|
|
|
+ if (text.length() != prev_len) {
|
|
|
+ _text_changed();
|
|
|
}
|
|
|
-
|
|
|
- update();
|
|
|
+ accept_event();
|
|
|
}
|
|
|
-
|
|
|
- return;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -1013,13 +893,17 @@ void LineEdit::copy_text() {
|
|
|
}
|
|
|
|
|
|
void LineEdit::cut_text() {
|
|
|
- if (selection.enabled && !pass) {
|
|
|
+ if (editable && selection.enabled && !pass) {
|
|
|
DisplayServer::get_singleton()->clipboard_set(text.substr(selection.begin, selection.end - selection.begin));
|
|
|
selection_delete();
|
|
|
}
|
|
|
}
|
|
|
|
|
|
void LineEdit::paste_text() {
|
|
|
+ if (!editable) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
// Strip escape characters like \n and \t as they can't be displayed on LineEdit.
|
|
|
String paste_buffer = DisplayServer::get_singleton()->clipboard_get().strip_escapes();
|
|
|
|
|
|
@@ -1040,6 +924,10 @@ void LineEdit::paste_text() {
|
|
|
}
|
|
|
|
|
|
void LineEdit::undo() {
|
|
|
+ if (!editable) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
if (undo_stack_pos == nullptr) {
|
|
|
if (undo_stack.size() <= 1) {
|
|
|
return;
|
|
|
@@ -1059,6 +947,10 @@ void LineEdit::undo() {
|
|
|
}
|
|
|
|
|
|
void LineEdit::redo() {
|
|
|
+ if (!editable) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
if (undo_stack_pos == nullptr) {
|
|
|
return;
|
|
|
}
|
|
|
@@ -2060,25 +1952,50 @@ void LineEdit::_create_undo_state() {
|
|
|
undo_stack.push_back(op);
|
|
|
}
|
|
|
|
|
|
+int LineEdit::_get_menu_action_accelerator(const String &p_action) {
|
|
|
+ const List<Ref<InputEvent>> *events = InputMap::get_singleton()->action_get_events(p_action);
|
|
|
+ if (!events) {
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+
|
|
|
+ // Use first event in the list for the accelerator.
|
|
|
+ const List<Ref<InputEvent>>::Element *first_event = events->front();
|
|
|
+ if (!first_event) {
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+
|
|
|
+ const Ref<InputEventKey> event = first_event->get();
|
|
|
+ if (event.is_null()) {
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+
|
|
|
+ // Use physical keycode if non-zero
|
|
|
+ if (event->get_physical_keycode() != 0) {
|
|
|
+ return event->get_physical_keycode_with_modifiers();
|
|
|
+ } else {
|
|
|
+ return event->get_keycode_with_modifiers();
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
void LineEdit::_generate_context_menu() {
|
|
|
// Reorganize context menu.
|
|
|
menu->clear();
|
|
|
if (editable) {
|
|
|
- menu->add_item(RTR("Cut"), MENU_CUT, is_shortcut_keys_enabled() ? KEY_MASK_CMD | KEY_X : 0);
|
|
|
+ menu->add_item(RTR("Cut"), MENU_CUT, is_shortcut_keys_enabled() ? _get_menu_action_accelerator("ui_cut") : 0);
|
|
|
}
|
|
|
- menu->add_item(RTR("Copy"), MENU_COPY, is_shortcut_keys_enabled() ? KEY_MASK_CMD | KEY_C : 0);
|
|
|
+ menu->add_item(RTR("Copy"), MENU_COPY, is_shortcut_keys_enabled() ? _get_menu_action_accelerator("ui_copy") : 0);
|
|
|
if (editable) {
|
|
|
- menu->add_item(RTR("Paste"), MENU_PASTE, is_shortcut_keys_enabled() ? KEY_MASK_CMD | KEY_V : 0);
|
|
|
+ menu->add_item(RTR("Paste"), MENU_PASTE, is_shortcut_keys_enabled() ? _get_menu_action_accelerator("ui_paste") : 0);
|
|
|
}
|
|
|
menu->add_separator();
|
|
|
if (is_selecting_enabled()) {
|
|
|
- menu->add_item(RTR("Select All"), MENU_SELECT_ALL, is_shortcut_keys_enabled() ? KEY_MASK_CMD | KEY_A : 0);
|
|
|
+ menu->add_item(RTR("Select All"), MENU_SELECT_ALL, is_shortcut_keys_enabled() ? _get_menu_action_accelerator("ui_text_select_all") : 0);
|
|
|
}
|
|
|
if (editable) {
|
|
|
menu->add_item(RTR("Clear"), MENU_CLEAR);
|
|
|
menu->add_separator();
|
|
|
- menu->add_item(RTR("Undo"), MENU_UNDO, is_shortcut_keys_enabled() ? KEY_MASK_CMD | KEY_Z : 0);
|
|
|
- menu->add_item(RTR("Redo"), MENU_REDO, is_shortcut_keys_enabled() ? KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_Z : 0);
|
|
|
+ menu->add_item(RTR("Undo"), MENU_UNDO, is_shortcut_keys_enabled() ? _get_menu_action_accelerator("ui_undo") : 0);
|
|
|
+ menu->add_item(RTR("Redo"), MENU_REDO, is_shortcut_keys_enabled() ? _get_menu_action_accelerator("ui_redo") : 0);
|
|
|
}
|
|
|
menu->add_separator();
|
|
|
menu->add_submenu_item(RTR("Text writing direction"), "DirMenu");
|
Eric M