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

Merge pull request #48500 from groud/add_buttongroup_pressed_signal

Browse source 
Adds a pressed signal to ButtonGroup
This commit is contained in:
Rémi Verschelde 2021-05-06 23:20:33 +02:00 committed by GitHub
commit 89e6f6ca2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
doc/classes/ButtonGroup.xml
View file

@ -28,6 +28,15 @@
<members> <members>
<member name="resource_local_to_scene" type="bool" setter="set_local_to_scene" getter="is_local_to_scene" override="true" default="true" /> <member name="resource_local_to_scene" type="bool" setter="set_local_to_scene" getter="is_local_to_scene" override="true" default="true" />
</members> </members>
<signals>
<signal name="pressed">
<argument index="0" name="button" type="Object">
</argument>
<description>
Emitted when one of the buttons of the group is pressed.
</description>
</signal>
</signals>
<constants> <constants>
</constants> </constants>
</class> </class>

7
scene/gui/base_button.cpp
View file

@ -155,6 +155,9 @@ void BaseButton::on_action_event(Ref<InputEvent> p_event) {
} }
status.pressed = !status.pressed; status.pressed = !status.pressed;
_unpress_group(); _unpress_group();
if (button_group.is_valid()) {
button_group->emit_signal("pressed", this);
}
_toggled(status.pressed); _toggled(status.pressed);
_pressed(); _pressed();
} }
@ -218,6 +221,9 @@ void BaseButton::set_pressed(bool p_pressed) {
if (p_pressed) { if (p_pressed) {
_unpress_group(); _unpress_group();
if (button_group.is_valid()) {
button_group->emit_signal("pressed", this);
}
} }
_toggled(status.pressed); _toggled(status.pressed);
@ -487,6 +493,7 @@ BaseButton *ButtonGroup::get_pressed_button() {
void ButtonGroup::_bind_methods() { void ButtonGroup::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_pressed_button"), &ButtonGroup::get_pressed_button); ClassDB::bind_method(D_METHOD("get_pressed_button"), &ButtonGroup::get_pressed_button);
ClassDB::bind_method(D_METHOD("get_buttons"), &ButtonGroup::_get_buttons); ClassDB::bind_method(D_METHOD("get_buttons"), &ButtonGroup::_get_buttons);
ADD_SIGNAL(MethodInfo("pressed", PropertyInfo(Variant::OBJECT, "button")));
} }
ButtonGroup::ButtonGroup() { ButtonGroup::ButtonGroup() {