summaryrefslogtreecommitdiffstats
path: root/modules/visual_script/visual_script_property_selector.h
diff options
context:
space:
mode:
authorK. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>2018-07-25 11:49:41 -0700
committerK. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>2018-07-26 06:18:23 -0700
commit00519debbe31a471c85a9756d49c552fdb9a3d44 (patch)
tree081e7b22bcebb652089697e9984c229454d11b18 /modules/visual_script/visual_script_property_selector.h
parent96d37769d90ed9aa52eb23e7672962049d31dfd8 (diff)
downloadredot-engine-00519debbe31a471c85a9756d49c552fdb9a3d44.tar.gz
Visualscript fix crash and generic search does not connect ports.
* Signal change requires function changes to _selected_new_virtual_method
Diffstat (limited to 'modules/visual_script/visual_script_property_selector.h')
-rw-r--r--modules/visual_script/visual_script_property_selector.h15
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);