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

Merge pull request #79064 from MewPurPur/rename-button-pressed-THIS-IS-NOT-A-COMPAT-BREAK

Browse Source 
Rename `button_pressed` default signal binding to avoid shadowing
This commit is contained in:
Rémi Verschelde 2023-08-03 14:46:39 +02:00
commit ae8f1015e0
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/classes/BaseButton.xml
View File

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

4
scene/gui/base_button.cpp
View File

@ -468,12 +468,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);
GDVIRTUAL_BIND(_pressed); GDVIRTUAL_BIND(_pressed);
GDVIRTUAL_BIND(_toggled, "button_pressed"); GDVIRTUAL_BIND(_toggled, "toggled_on");
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, "button_pressed"))); ADD_SIGNAL(MethodInfo("toggled", PropertyInfo(Variant::BOOL, "toggled_on")));
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "disabled"), "set_disabled", "is_disabled"); ADD_PROPERTY(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");