Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-21 00:43:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Signals: Port more uses of connect_compat

Browse source 
Those were problematic as they call a method of their parent class,
but callable_mp does not allow that unless it's public.

To solve it, we declare a local class that calls the parent class'
method, which now needs to be protected to be accessible in the
derived class.
This commit is contained in:
Rémi Verschelde 2020-02-27 22:49:16 +01:00
parent b8f08b42e7
commit 09a6a2d8f8
19 changed files with 79 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/visual_script/visual_script_property_selector.cpp
View file

@ -518,6 +518,10 @@ void VisualScriptPropertySelector::_item_selected() {
help_bit->set_text(text);
}
void VisualScriptPropertySelector::_hide_requested() {
_closed(); // From WindowDialog.
}
void VisualScriptPropertySelector::_notification(int p_what) {
if (p_what == NOTIFICATION_ENTER_TREE) {
@ -716,7 +720,7 @@ VisualScriptPropertySelector::VisualScriptPropertySelector() {
seq_connect = false;
help_bit = memnew(EditorHelpBit);
vbc->add_margin_child(TTR("Description:"), help_bit);
help_bit->connect_compat("request_hide", this, "_closed");
help_bit->connect("request_hide", callable_mp(this, &VisualScriptPropertySelector::_hide_requested));
search_options->set_columns(3);
search_options->set_column_expand(1, false);
search_options->set_column_expand(2, false);