Skip to content

Commit e89c196

Browse files
committedJan 2, 2025
LineEdit add member keep_editing_on_text_submit.
Allow users to exit edit mode when Enter is pressed.
1 parent aa8d9b8 commit e89c196

File tree

4 files changed

+21
-5
lines changed

4 files changed

+21
-5
lines changed
 

‎doc/classes/LineEdit.xml

+5-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<description>
77
[LineEdit] provides an input field for editing a single line of text.
88
- When the [LineEdit] control is focused using the keyboard arrow keys, it will only gain focus and not enter edit mode.
9-
- To enter edit mode, click on the control with the mouse or press the [code]ui_text_submit[/code] action (by default [kbd]Enter[/kbd] or [kbd]Kp Enter[/kbd]).
9+
- To enter edit mode, click on the control with the mouse, see also [member keep_editing_on_text_submit].
1010
- To exit edit mode, press [code]ui_text_submit[/code] or [code]ui_cancel[/code] (by default [kbd]Escape[/kbd]) actions.
1111
- Check [method edit], [method unedit], [method is_editing], and [signal editing_toggled] for more information.
1212
[b]Important:[/b]
@@ -80,7 +80,7 @@
8080
<return type="void" />
8181
<description>
8282
Allows entering edit mode whether the [LineEdit] is focused or not.
83-
Use [method Callable.call_deferred] if you want to enter edit mode on [signal text_submitted].
83+
See also [member keep_editing_on_text_submit].
8484
</description>
8585
</method>
8686
<method name="get_menu" qualifiers="const">
@@ -283,6 +283,9 @@
283283
If [code]true[/code], the [LineEdit] doesn't display decoration.
284284
</member>
285285
<member name="focus_mode" type="int" setter="set_focus_mode" getter="get_focus_mode" overrides="Control" enum="Control.FocusMode" default="2" />
286+
<member name="keep_editing_on_text_submit" type="bool" setter="set_keep_editing_on_text_submit" getter="is_editing_kept_on_text_submit" default="false">
287+
If [code]true[/code], the [LineEdit] will not exit edit mode when text is submitted by pressing [code]ui_text_submit[/code] action (by default: [kbd]Enter[/kbd] or [kbd]Kp Enter[/kbd]).
288+
</member>
286289
<member name="language" type="String" setter="set_language" getter="get_language" default="&quot;&quot;">
287290
Language code used for line-breaking and text shaping algorithms. If left empty, current locale is used instead.
288291
</member>

‎editor/code_editor.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -644,8 +644,6 @@ void FindReplaceBar::_search_text_submitted(const String &p_text) {
644644
} else {
645645
search_next();
646646
}
647-
648-
callable_mp(search_text, &LineEdit::edit).call_deferred();
649647
}
650648

651649
void FindReplaceBar::_replace_text_submitted(const String &p_text) {
@@ -753,6 +751,7 @@ FindReplaceBar::FindReplaceBar() {
753751

754752
// Search toolbar
755753
search_text = memnew(LineEdit);
754+
search_text->set_keep_editing_on_text_submit(true);
756755
vbc_lineedit->add_child(search_text);
757756
search_text->set_placeholder(TTR("Find"));
758757
search_text->set_tooltip_text(TTR("Find"));

‎scene/gui/line_edit.cpp

+12-1
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,14 @@ bool LineEdit::is_editing() const {
9999
return editing;
100100
}
101101

102+
void LineEdit::set_keep_editing_on_text_submit(bool p_enabled) {
103+
keep_editing_on_text_submit = p_enabled;
104+
}
105+
106+
bool LineEdit::is_editing_kept_on_text_submit() const {
107+
return keep_editing_on_text_submit;
108+
}
109+
102110
void LineEdit::_close_ime_window() {
103111
DisplayServer::WindowID wid = get_window() ? get_window()->get_window_id() : DisplayServer::INVALID_WINDOW_ID;
104112
if (wid == DisplayServer::INVALID_WINDOW_ID || !DisplayServer::get_singleton()->has_feature(DisplayServer::FEATURE_IME)) {
@@ -773,7 +781,7 @@ void LineEdit::gui_input(const Ref<InputEvent> &p_event) {
773781
DisplayServer::get_singleton()->virtual_keyboard_hide();
774782
}
775783

776-
if (editing) {
784+
if (editing && !keep_editing_on_text_submit) {
777785
unedit();
778786
emit_signal(SNAME("editing_toggled"), false);
779787
}
@@ -2791,6 +2799,8 @@ void LineEdit::_bind_methods() {
27912799
ClassDB::bind_method(D_METHOD("edit"), &LineEdit::edit);
27922800
ClassDB::bind_method(D_METHOD("unedit"), &LineEdit::unedit);
27932801
ClassDB::bind_method(D_METHOD("is_editing"), &LineEdit::is_editing);
2802+
ClassDB::bind_method(D_METHOD("set_keep_editing_on_text_submit", "enable"), &LineEdit::set_keep_editing_on_text_submit);
2803+
ClassDB::bind_method(D_METHOD("is_editing_kept_on_text_submit"), &LineEdit::is_editing_kept_on_text_submit);
27942804
ClassDB::bind_method(D_METHOD("clear"), &LineEdit::clear);
27952805
ClassDB::bind_method(D_METHOD("select", "from", "to"), &LineEdit::select, DEFVAL(0), DEFVAL(-1));
27962806
ClassDB::bind_method(D_METHOD("select_all"), &LineEdit::select_all);
@@ -2921,6 +2931,7 @@ void LineEdit::_bind_methods() {
29212931
ADD_PROPERTY(PropertyInfo(Variant::INT, "alignment", PROPERTY_HINT_ENUM, "Left,Center,Right,Fill"), "set_horizontal_alignment", "get_horizontal_alignment");
29222932
ADD_PROPERTY(PropertyInfo(Variant::INT, "max_length", PROPERTY_HINT_RANGE, "0,1000,1,or_greater"), "set_max_length", "get_max_length");
29232933
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "editable"), "set_editable", "is_editable");
2934+
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "keep_editing_on_text_submit"), "set_keep_editing_on_text_submit", "is_editing_kept_on_text_submit");
29242935
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "expand_to_text_length"), "set_expand_to_text_length_enabled", "is_expand_to_text_length_enabled");
29252936
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "context_menu_enabled"), "set_context_menu_enabled", "is_context_menu_enabled");
29262937
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "virtual_keyboard_enabled"), "set_virtual_keyboard_enabled", "is_virtual_keyboard_enabled");

‎scene/gui/line_edit.h

+3
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ class LineEdit : public Control {
8787
HorizontalAlignment alignment = HORIZONTAL_ALIGNMENT_LEFT;
8888

8989
bool editing = false;
90+
bool keep_editing_on_text_submit = false;
9091
bool editable = false;
9192
bool pass = false;
9293
bool text_changed_dirty = false;
@@ -266,6 +267,8 @@ class LineEdit : public Control {
266267
void edit();
267268
void unedit();
268269
bool is_editing() const;
270+
void set_keep_editing_on_text_submit(bool p_enabled);
271+
bool is_editing_kept_on_text_submit() const;
269272

270273
bool has_ime_text() const;
271274
void cancel_ime();

0 commit comments

Comments
 (0)