diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-07-27 21:38:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-27 21:38:11 +0200 |
| commit | aecc3a444b122efd1001b25893ea7622918e2e22 (patch) | |
| tree | 54f89d3e699a58f489c889d7f50ce83df32b449d /modules/visual_script/visual_script_property_selector.h | |
| parent | 33f1ca89a50d25551e9a5928baf356d2e3b2f03b (diff) | |
| parent | 00519debbe31a471c85a9756d49c552fdb9a3d44 (diff) | |
Merge pull request #20457 from fire/vs_generic_search_crash_and_connecting
Visualscript: misc generic search changes
Diffstat (limited to 'modules/visual_script/visual_script_property_selector.h')
| -rw-r--r-- | modules/visual_script/visual_script_property_selector.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/modules/visual_script/visual_script_property_selector.h b/modules/visual_script/visual_script_property_selector.h index ec536f86a8..917ef9ae6d 100644 --- a/modules/visual_script/visual_script_property_selector.h +++ b/modules/visual_script/visual_script_property_selector.h @@ -56,6 +56,7 @@ class VisualScriptPropertySelector : public ConfirmationDialog { bool properties; bool visual_script_generic; + bool connecting; String selected; Variant::Type type; String base_type; @@ -74,13 +75,13 @@ protected: static void _bind_methods(); public: - void select_method_from_base_type(const String &p_base, const String &p_current = "", bool p_virtuals_only = false); - void select_from_base_type(const String &p_base, const String &p_current = "", bool p_virtuals_only = false, bool p_seq_connect = false); - void select_from_script(const Ref<Script> &p_script, const String &p_current /*= ""*/); - void select_from_basic_type(Variant::Type p_type, const String &p_current = ""); - void select_from_action(const String &p_type, const String &p_current = ""); - void select_from_instance(Object *p_instance, const String &p_current = ""); - void select_from_visual_script(const String &p_base); + void select_method_from_base_type(const String &p_base, const String &p_current = "", const bool p_virtuals_only = false, const bool p_connecting = true); + void select_from_base_type(const String &p_base, const String &p_current = "", bool p_virtuals_only = false, bool p_seq_connect = false, const bool p_connecting = true); + void select_from_script(const Ref<Script> &p_script, const String &p_current = "", const bool p_connecting = true); + void select_from_basic_type(Variant::Type p_type, const String &p_current = "", const bool p_connecting = true); + void select_from_action(const String &p_type, const String &p_current = "", const bool p_connecting = true); + void select_from_instance(Object *p_instance, const String &p_current = "", const bool p_connecting = true); + void select_from_visual_script(const String &p_base, const bool p_connecting = true); void show_window(float p_screen_ratio); |