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

Fix signal arguments shadowing member variables

Browse Source 
Fixes #10212.
This commit is contained in:
Rémi Verschelde 2018-01-09 16:39:43 +01:00
parent 29ae3e5f33
commit 4b6bef6524
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/classes/BaseButton.xml
View File

@ -21,7 +21,7 @@
<method name="_toggled" qualifiers="virtual"> <method name="_toggled" qualifiers="virtual">
<return type="void"> <return type="void">
</return> </return>
<argument index="0" name="pressed" type="bool"> <argument index="0" name="button_pressed" type="bool">
</argument> </argument>
<description> <description>
Called when button is toggled (only if toggle_mode is active). Called when button is toggled (only if toggle_mode is active).
@ -82,7 +82,7 @@
</description> </description>
</signal> </signal>
<signal name="toggled"> <signal name="toggled">
<argument index="0" name="pressed" type="bool"> <argument index="0" name="button_pressed" type="bool">
</argument> </argument>
<description> <description>
This signal is emitted when the button was just toggled between pressed and normal states (only if toggle_mode is active). The new state is contained in the [i]pressed[/i] argument. This signal is emitted when the button was just toggled between pressed and normal states (only if toggle_mode is active). The new state is contained in the [i]pressed[/i] argument.

4
doc/classes/LineEdit.xml
View File

@ -131,14 +131,14 @@
</members> </members>
<signals> <signals>
<signal name="text_changed"> <signal name="text_changed">
<argument index="0" name="text" type="String"> <argument index="0" name="new_text" type="String">
</argument> </argument>
<description> <description>
Emitted when the text changes. Emitted when the text changes.
</description> </description>
</signal> </signal>
<signal name="text_entered"> <signal name="text_entered">
<argument index="0" name="text" type="String"> <argument index="0" name="new_text" type="String">
</argument> </argument>
<description> <description>
Emitted when the user presses KEY_ENTER on the [code]LineEdit[/code]. Emitted when the user presses KEY_ENTER on the [code]LineEdit[/code].

4
scene/gui/base_button.cpp
View File

@ -504,12 +504,12 @@ void BaseButton::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_button_group"), &BaseButton::get_button_group); ClassDB::bind_method(D_METHOD("get_button_group"), &BaseButton::get_button_group);
BIND_VMETHOD(MethodInfo("_pressed")); BIND_VMETHOD(MethodInfo("_pressed"));
BIND_VMETHOD(MethodInfo("_toggled", PropertyInfo(Variant::BOOL, "pressed"))); BIND_VMETHOD(MethodInfo("_toggled", PropertyInfo(Variant::BOOL, "button_pressed")));
ADD_SIGNAL(MethodInfo("pressed")); ADD_SIGNAL(MethodInfo("pressed"));
ADD_SIGNAL(MethodInfo("button_up")); ADD_SIGNAL(MethodInfo("button_up"));
ADD_SIGNAL(MethodInfo("button_down")); ADD_SIGNAL(MethodInfo("button_down"));
ADD_SIGNAL(MethodInfo("toggled", PropertyInfo(Variant::BOOL, "pressed"))); ADD_SIGNAL(MethodInfo("toggled", PropertyInfo(Variant::BOOL, "button_pressed")));
ADD_PROPERTYNZ(PropertyInfo(Variant::BOOL, "disabled"), "set_disabled", "is_disabled"); ADD_PROPERTYNZ(PropertyInfo(Variant::BOOL, "disabled"), "set_disabled", "is_disabled");
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "toggle_mode"), "set_toggle_mode", "is_toggle_mode"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "toggle_mode"), "set_toggle_mode", "is_toggle_mode");
ADD_PROPERTYNZ(PropertyInfo(Variant::BOOL, "pressed"), "set_pressed", "is_pressed"); ADD_PROPERTYNZ(PropertyInfo(Variant::BOOL, "pressed"), "set_pressed", "is_pressed");

4
scene/gui/line_edit.cpp
View File

@ -1413,8 +1413,8 @@ void LineEdit::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_context_menu_enabled", "enable"), &LineEdit::set_context_menu_enabled); ClassDB::bind_method(D_METHOD("set_context_menu_enabled", "enable"), &LineEdit::set_context_menu_enabled);
ClassDB::bind_method(D_METHOD("is_context_menu_enabled"), &LineEdit::is_context_menu_enabled); ClassDB::bind_method(D_METHOD("is_context_menu_enabled"), &LineEdit::is_context_menu_enabled);
ADD_SIGNAL(MethodInfo("text_changed", PropertyInfo(Variant::STRING, "text"))); ADD_SIGNAL(MethodInfo("text_changed", PropertyInfo(Variant::STRING, "new_text")));
ADD_SIGNAL(MethodInfo("text_entered", PropertyInfo(Variant::STRING, "text"))); ADD_SIGNAL(MethodInfo("text_entered", PropertyInfo(Variant::STRING, "new_text")));
BIND_ENUM_CONSTANT(ALIGN_LEFT); BIND_ENUM_CONSTANT(ALIGN_LEFT);
BIND_ENUM_CONSTANT(ALIGN_CENTER); BIND_ENUM_CONSTANT(ALIGN_CENTER);