Skip to content

Commit

Permalink
Merge pull request godotengine#99822 from havi05/lineedit-shortcuts
Browse files Browse the repository at this point in the history
Allow copy/select shortcuts when `editable` is false in `LineEdit`
  • Loading branch information
akien-mga committed Dec 2, 2024
2 parents d7515dd + 4b735d9 commit 6c01b73
Showing 1 changed file with 39 additions and 34 deletions.
73 changes: 39 additions & 34 deletions scene/gui/line_edit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,45 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
return;
}

// Open context menu.
if (context_menu_enabled) {
if (k->is_action("ui_menu", true)) {
_update_context_menu();
Point2 pos = Point2(get_caret_pixel_pos().x, (get_size().y + theme_cache.font->get_height(theme_cache.font_size)) / 2);
menu->set_position(get_screen_position() + pos);
menu->reset_size();
menu->popup();
menu->grab_focus();

accept_event();
return;
}
}

if (is_shortcut_keys_enabled()) {
if (k->is_action("ui_copy", true)) {
copy_text();
accept_event();
return;
}

if (k->is_action("ui_text_select_all", true)) {
select();
accept_event();
return;
}

if (k->is_action("ui_cut", true)) {
if (editable) {
cut_text();
} else {
copy_text();
}
accept_event();
return;
}
}

if (!editing) {
return;
}
Expand Down Expand Up @@ -727,21 +766,6 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
return;
}

// Open context menu.
if (context_menu_enabled) {
if (k->is_action("ui_menu", true)) {
_update_context_menu();
Point2 pos = Point2(get_caret_pixel_pos().x, (get_size().y + theme_cache.font->get_height(theme_cache.font_size)) / 2);
menu->set_position(get_screen_position() + pos);
menu->reset_size();
menu->popup();
menu->grab_focus();

accept_event();
return;
}
}

// Default is ENTER and KP_ENTER. Cannot use ui_accept as default includes SPACE.
if (k->is_action_pressed("ui_text_submit")) {
emit_signal(SceneStringName(text_submitted), text);
Expand Down Expand Up @@ -769,25 +793,6 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
}

if (is_shortcut_keys_enabled()) {
if (k->is_action("ui_copy", true)) {
copy_text();
accept_event();
return;
}

if (k->is_action("ui_text_select_all", true)) {
select();
accept_event();
return;
}

// Cut / Paste
if (k->is_action("ui_cut", true)) {
cut_text();
accept_event();
return;
}

if (k->is_action("ui_paste", true)) {
paste_text();
accept_event();
Expand Down

0 comments on commit 6c01b73

Please sign in to comment.