asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #48920 from aaronfranke/accept

Browse source
This commit is contained in:
Rémi Verschelde 2021-06-04 16:13:25 +02:00 committed by GitHub
commit 766c6dbb24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/classes/AcceptDialog.xml
View file

@ -49,7 +49,7 @@
<method name="register_text_enter"> <method name="register_text_enter">
<return type="void"> <return type="void">
</return> </return>
<argument index="0" name="line_edit" type="Node"> <argument index="0" name="line_edit" type="Control">
</argument> </argument>
<description> <description>
Registers a [LineEdit] in the dialog. When the enter key is pressed, the dialog will be accepted. Registers a [LineEdit] in the dialog. When the enter key is pressed, the dialog will be accepted.

2
scene/gui/dialogs.cpp
View file

@ -155,7 +155,7 @@ bool AcceptDialog::has_autowrap() {
return label->has_autowrap(); return label->has_autowrap();
} }
void AcceptDialog::register_text_enter(Node *p_line_edit) { void AcceptDialog::register_text_enter(Control *p_line_edit) {
ERR_FAIL_NULL(p_line_edit); ERR_FAIL_NULL(p_line_edit);
LineEdit *line_edit = Object::cast_to<LineEdit>(p_line_edit); LineEdit *line_edit = Object::cast_to<LineEdit>(p_line_edit);
if (line_edit) { if (line_edit) {

2
scene/gui/dialogs.h
View file

@ -77,7 +77,7 @@ public:
Label *get_label() { return label; } Label *get_label() { return label; }
static void set_swap_cancel_ok(bool p_swap); static void set_swap_cancel_ok(bool p_swap);
void register_text_enter(Node *p_line_edit); void register_text_enter(Control *p_line_edit);
Button *get_ok_button() { return ok; } Button *get_ok_button() { return ok; }
Button *add_button(const String &p_text, bool p_right = false, const String &p_action = ""); Button *add_button(const String &p_text, bool p_right = false, const String &p_action = "");