1 files changed, 113 insertions, 122 deletions

diff --git a/modules/visual_script/visual_script_property_selector.cpp b/modules/visual_script/visual_script_property_selector.cpp
index 99d7ffd05f..3c44faab90 100644
--- a/modules/visual_script/visual_script_property_selector.cpp
+++ b/modules/visual_script/visual_script_property_selector.cpp
@@ -39,30 +39,28 @@
 #include "modules/visual_script/visual_script_func_nodes.h"
 #include "modules/visual_script/visual_script_nodes.h"
 #include "scene/main/node.h"
-#include "scene/main/viewport.h"
+#include "scene/main/window.h"
 
 void VisualScriptPropertySelector::_text_changed(const String &p_newtext) {
 	_update_search();
 }
 
 void VisualScriptPropertySelector::_sbox_input(const Ref<InputEvent> &p_ie) {
-
 	Ref<InputEventKey> k = p_ie;
 
 	if (k.is_valid()) {
-
-		switch (k->get_scancode()) {
+		switch (k->get_keycode()) {
 			case KEY_UP:
 			case KEY_DOWN:
 			case KEY_PAGEUP:
 			case KEY_PAGEDOWN: {
-
 				search_options->call("_gui_input", k);
 				search_box->accept_event();
 
 				TreeItem *root = search_options->get_root();
-				if (!root->get_children())
+				if (!root->get_children()) {
 					break;
+				}
 
 				TreeItem *current = search_options->get_selected();
 
@@ -97,35 +95,37 @@ void VisualScriptPropertySelector::_update_search() {
 	for (List<StringName>::Element *E = base_list.front(); E; E = E->next()) {
 		List<MethodInfo> methods;
 		List<PropertyInfo> props;
-		TreeItem *category = NULL;
-		Ref<Texture> type_icons[Variant::VARIANT_MAX] = {
-			Control::get_icon("Variant", "EditorIcons"),
-			Control::get_icon("bool", "EditorIcons"),
-			Control::get_icon("int", "EditorIcons"),
-			Control::get_icon("float", "EditorIcons"),
-			Control::get_icon("String", "EditorIcons"),
-			Control::get_icon("Vector2", "EditorIcons"),
-			Control::get_icon("Rect2", "EditorIcons"),
-			Control::get_icon("Vector3", "EditorIcons"),
-			Control::get_icon("Transform2D", "EditorIcons"),
-			Control::get_icon("Plane", "EditorIcons"),
-			Control::get_icon("Quat", "EditorIcons"),
-			Control::get_icon("AABB", "EditorIcons"),
-			Control::get_icon("Basis", "EditorIcons"),
-			Control::get_icon("Transform", "EditorIcons"),
-			Control::get_icon("Color", "EditorIcons"),
-			Control::get_icon("Path", "EditorIcons"),
-			Control::get_icon("RID", "EditorIcons"),
-			Control::get_icon("Object", "EditorIcons"),
-			Control::get_icon("Dictionary", "EditorIcons"),
-			Control::get_icon("Array", "EditorIcons"),
-			Control::get_icon("PoolByteArray", "EditorIcons"),
-			Control::get_icon("PoolIntArray", "EditorIcons"),
-			Control::get_icon("PoolRealArray", "EditorIcons"),
-			Control::get_icon("PoolStringArray", "EditorIcons"),
-			Control::get_icon("PoolVector2Array", "EditorIcons"),
-			Control::get_icon("PoolVector3Array", "EditorIcons"),
-			Control::get_icon("PoolColorArray", "EditorIcons")
+		TreeItem *category = nullptr;
+		Ref<Texture2D> type_icons[Variant::VARIANT_MAX] = {
+			vbc->get_theme_icon("Variant", "EditorIcons"),
+			vbc->get_theme_icon("bool", "EditorIcons"),
+			vbc->get_theme_icon("int", "EditorIcons"),
+			vbc->get_theme_icon("float", "EditorIcons"),
+			vbc->get_theme_icon("String", "EditorIcons"),
+			vbc->get_theme_icon("Vector2", "EditorIcons"),
+			vbc->get_theme_icon("Rect2", "EditorIcons"),
+			vbc->get_theme_icon("Vector3", "EditorIcons"),
+			vbc->get_theme_icon("Transform2D", "EditorIcons"),
+			vbc->get_theme_icon("Plane", "EditorIcons"),
+			vbc->get_theme_icon("Quat", "EditorIcons"),
+			vbc->get_theme_icon("AABB", "EditorIcons"),
+			vbc->get_theme_icon("Basis", "EditorIcons"),
+			vbc->get_theme_icon("Transform", "EditorIcons"),
+			vbc->get_theme_icon("Color", "EditorIcons"),
+			vbc->get_theme_icon("Path", "EditorIcons"),
+			vbc->get_theme_icon("RID", "EditorIcons"),
+			vbc->get_theme_icon("Object", "EditorIcons"),
+			vbc->get_theme_icon("Dictionary", "EditorIcons"),
+			vbc->get_theme_icon("Array", "EditorIcons"),
+			vbc->get_theme_icon("PackedByteArray", "EditorIcons"),
+			vbc->get_theme_icon("PackedInt32Array", "EditorIcons"),
+			vbc->get_theme_icon("PackedFloat32Array", "EditorIcons"),
+			vbc->get_theme_icon("PackedInt64Array", "EditorIcons"),
+			vbc->get_theme_icon("PackedFloat64Array", "EditorIcons"),
+			vbc->get_theme_icon("PackedStringArray", "EditorIcons"),
+			vbc->get_theme_icon("PackedVector2Array", "EditorIcons"),
+			vbc->get_theme_icon("PackedVector3Array", "EditorIcons"),
+			vbc->get_theme_icon("PackedColorArray", "EditorIcons")
 		};
 		{
 			String b = String(E->get());
@@ -133,7 +133,7 @@ void VisualScriptPropertySelector::_update_search() {
 			if (category) {
 				category->set_text(0, b.replace_first("*", ""));
 				category->set_selectable(0, false);
-				Ref<Texture> icon;
+				Ref<Texture2D> icon;
 				String rep = b.replace("*", "");
 				icon = EditorNode::get_singleton()->get_class_icon(rep);
 				category->set_icon(0, icon);
@@ -151,11 +151,13 @@ void VisualScriptPropertySelector::_update_search() {
 				}
 			}
 			for (List<PropertyInfo>::Element *F = props.front(); F; F = F->next()) {
-				if (!(F->get().usage & PROPERTY_USAGE_EDITOR) && !(F->get().usage & PROPERTY_USAGE_SCRIPT_VARIABLE))
+				if (!(F->get().usage & PROPERTY_USAGE_EDITOR) && !(F->get().usage & PROPERTY_USAGE_SCRIPT_VARIABLE)) {
 					continue;
+				}
 
-				if (type_filter.size() && type_filter.find(F->get().type) == -1)
+				if (type_filter.size() && type_filter.find(F->get().type) == -1) {
 					continue;
+				}
 
 				// capitalize() also converts underscore to space, we'll match again both possible styles
 				String get_text_raw = String(vformat(TTR("Get %s"), F->get().name));
@@ -170,7 +172,7 @@ void VisualScriptPropertySelector::_update_search() {
 					item->set_metadata(0, F->get().name);
 					item->set_icon(0, type_icons[F->get().type]);
 					item->set_metadata(1, "get");
-					item->set_collapsed(1);
+					item->set_collapsed(true);
 					item->set_selectable(0, true);
 					item->set_selectable(1, false);
 					item->set_selectable(2, false);
@@ -193,11 +195,10 @@ void VisualScriptPropertySelector::_update_search() {
 		{
 			if (type != Variant::NIL) {
 				Variant v;
-				Variant::CallError ce;
-				v = Variant::construct(type, NULL, 0, ce);
+				Callable::CallError ce;
+				v = Variant::construct(type, nullptr, 0, ce);
 				v.get_method_list(&methods);
 			} else {
-
 				Object *obj = ObjectDB::get_instance(script);
 				if (Object::cast_to<Script>(obj)) {
 					Object::cast_to<Script>(obj)->get_script_method_list(&methods);
@@ -207,23 +208,24 @@ void VisualScriptPropertySelector::_update_search() {
 			}
 		}
 		for (List<MethodInfo>::Element *M = methods.front(); M; M = M->next()) {
-
 			String name = M->get().name.get_slice(":", 0);
-			if (name.begins_with("_") && !(M->get().flags & METHOD_FLAG_VIRTUAL))
+			if (name.begins_with("_") && !(M->get().flags & METHOD_FLAG_VIRTUAL)) {
 				continue;
+			}
 
-			if (virtuals_only && !(M->get().flags & METHOD_FLAG_VIRTUAL))
+			if (virtuals_only && !(M->get().flags & METHOD_FLAG_VIRTUAL)) {
 				continue;
+			}
 
-			if (!virtuals_only && (M->get().flags & METHOD_FLAG_VIRTUAL))
+			if (!virtuals_only && (M->get().flags & METHOD_FLAG_VIRTUAL)) {
 				continue;
+			}
 
 			MethodInfo mi = M->get();
 			String desc_arguments;
 			if (mi.arguments.size() > 0) {
 				desc_arguments = "(";
 				for (int i = 0; i < mi.arguments.size(); i++) {
-
 					if (i > 0) {
 						desc_arguments += ", ";
 					}
@@ -250,19 +252,19 @@ void VisualScriptPropertySelector::_update_search() {
 
 			TreeItem *item = search_options->create_item(category ? category : root);
 			item->set_text(0, desc);
-			item->set_icon(0, get_icon("MemberMethod", "EditorIcons"));
+			item->set_icon(0, vbc->get_theme_icon("MemberMethod", "EditorIcons"));
 			item->set_metadata(0, name);
 			item->set_selectable(0, true);
 
 			item->set_metadata(1, "method");
-			item->set_collapsed(1);
+			item->set_collapsed(true);
 			item->set_selectable(1, false);
 
 			item->set_selectable(2, false);
 			item->set_metadata(2, connecting);
 		}
 
-		if (category && category->get_children() == NULL) {
+		if (category && category->get_children() == nullptr) {
 			memdelete(category); //old category was unused
 		}
 	}
@@ -279,7 +281,7 @@ void VisualScriptPropertySelector::_update_search() {
 			if (type == Variant::BOOL) {
 				get_visual_node_names("operators/logic/", Set<String>(), found, root, search_box);
 			}
-			if (type == Variant::BOOL || type == Variant::INT || type == Variant::REAL || type == Variant::VECTOR2 || type == Variant::VECTOR3) {
+			if (type == Variant::BOOL || type == Variant::INT || type == Variant::FLOAT || type == Variant::VECTOR2 || type == Variant::VECTOR3) {
 				get_visual_node_names("operators/math/", Set<String>(), found, root, search_box);
 			}
 		}
@@ -302,23 +304,23 @@ void VisualScriptPropertySelector::_update_search() {
 	}
 
 	TreeItem *selected_item = search_options->search_item_text(search_box->get_text());
-	if (!found && selected_item != NULL) {
+	if (!found && selected_item != nullptr) {
 		selected_item->select(0);
 		found = true;
 	}
 
-	get_ok()->set_disabled(root->get_children() == NULL);
+	get_ok()->set_disabled(root->get_children() == nullptr);
 }
 
 void VisualScriptPropertySelector::create_visualscript_item(const String &name, TreeItem *const root, const String &search_input, const String &text) {
 	if (search_input == String() || text.findn(search_input) != -1) {
 		TreeItem *item = search_options->create_item(root);
 		item->set_text(0, text);
-		item->set_icon(0, get_icon("VisualScript", "EditorIcons"));
+		item->set_icon(0, vbc->get_theme_icon("VisualScript", "EditorIcons"));
 		item->set_metadata(0, name);
 		item->set_metadata(1, "action");
 		item->set_selectable(0, true);
-		item->set_collapsed(1);
+		item->set_collapsed(true);
 		item->set_selectable(1, false);
 		item->set_selectable(2, false);
 		item->set_metadata(2, connecting);
@@ -355,10 +357,11 @@ void VisualScriptPropertySelector::get_visual_node_names(const String &root_filt
 			continue;
 		}
 
-		bool in_modifier = false | p_modifiers.empty();
+		bool in_modifier = p_modifiers.empty();
 		for (Set<String>::Element *F = p_modifiers.front(); F && in_modifier; F = F->next()) {
-			if (E->get().findn(F->get()) != -1)
+			if (E->get().findn(F->get()) != -1) {
 				in_modifier = true;
+			}
 		}
 		if (!in_modifier) {
 			continue;
@@ -397,7 +400,7 @@ void VisualScriptPropertySelector::get_visual_node_names(const String &root_filt
 		}
 
 		item->set_text(0, type_name + String("").join(desc));
-		item->set_icon(0, get_icon("VisualScript", "EditorIcons"));
+		item->set_icon(0, vbc->get_theme_icon("VisualScript", "EditorIcons"));
 		item->set_selectable(0, true);
 		item->set_metadata(0, E->get());
 		item->set_selectable(0, true);
@@ -409,21 +412,21 @@ void VisualScriptPropertySelector::get_visual_node_names(const String &root_filt
 }
 
 void VisualScriptPropertySelector::_confirmed() {
-
 	TreeItem *ti = search_options->get_selected();
-	if (!ti)
+	if (!ti) {
 		return;
+	}
 	emit_signal("selected", ti->get_metadata(0), ti->get_metadata(1), ti->get_metadata(2));
-	hide();
+	set_visible(false);
 }
 
 void VisualScriptPropertySelector::_item_selected() {
-
 	help_bit->set_text("");
 
 	TreeItem *item = search_options->get_selected();
-	if (!item)
+	if (!item) {
 		return;
+	}
 	String name = item->get_metadata(0);
 
 	String class_type;
@@ -440,12 +443,11 @@ void VisualScriptPropertySelector::_item_selected() {
 	String at_class = class_type;
 
 	while (at_class != String()) {
-
 		Map<String, DocData::ClassDoc>::Element *E = dd->class_list.find(at_class);
 		if (E) {
 			for (int i = 0; i < E->get().properties.size(); i++) {
 				if (E->get().properties[i].name == name) {
-					text = E->get().properties[i].description;
+					text = DTR(E->get().properties[i].description);
 				}
 			}
 		}
@@ -455,12 +457,11 @@ void VisualScriptPropertySelector::_item_selected() {
 	at_class = class_type;
 
 	while (at_class != String()) {
-
 		Map<String, DocData::ClassDoc>::Element *C = dd->class_list.find(at_class);
 		if (C) {
 			for (int i = 0; i < C->get().methods.size(); i++) {
 				if (C->get().methods[i].name == name) {
-					text = C->get().methods[i].description;
+					text = DTR(C->get().methods[i].description);
 				}
 			}
 		}
@@ -472,14 +473,14 @@ void VisualScriptPropertySelector::_item_selected() {
 		for (int i = 0; i < T->get().methods.size(); i++) {
 			Vector<String> functions = name.rsplit("/", false, 1);
 			if (T->get().methods[i].name == functions[functions.size() - 1]) {
-				text = T->get().methods[i].description;
+				text = DTR(T->get().methods[i].description);
 			}
 		}
 	}
 
 	List<String> *names = memnew(List<String>);
 	VisualScriptLanguage::singleton->get_registered_node_names(names);
-	if (names->find(name) != NULL) {
+	if (names->find(name) != nullptr) {
 		Ref<VisualScriptOperator> operator_node = VisualScriptLanguage::singleton->create_node_from_name(name);
 		if (operator_node.is_valid()) {
 			Map<String, DocData::ClassDoc>::Element *F = dd->class_list.find(operator_node->get_class_name());
@@ -491,7 +492,7 @@ void VisualScriptPropertySelector::_item_selected() {
 		if (typecast_node.is_valid()) {
 			Map<String, DocData::ClassDoc>::Element *F = dd->class_list.find(typecast_node->get_class_name());
 			if (F) {
-				text = F->get().description;
+				text = DTR(F->get().description);
 			}
 		}
 
@@ -501,7 +502,7 @@ void VisualScriptPropertySelector::_item_selected() {
 			if (F) {
 				for (int i = 0; i < F->get().constants.size(); i++) {
 					if (F->get().constants[i].value.to_int() == int(builtin_node->get_func())) {
-						text = F->get().constants[i].description;
+						text = DTR(F->get().constants[i].description);
 					}
 				}
 			}
@@ -510,35 +511,37 @@ void VisualScriptPropertySelector::_item_selected() {
 
 	memdelete(names);
 
-	if (text == String())
+	if (text == String()) {
 		return;
+	}
 
 	help_bit->set_text(text);
 }
 
-void VisualScriptPropertySelector::_notification(int p_what) {
+void VisualScriptPropertySelector::_hide_requested() {
+	_cancel_pressed(); // From AcceptDialog.
+}
 
+void VisualScriptPropertySelector::_notification(int p_what) {
 	if (p_what == NOTIFICATION_ENTER_TREE) {
-
-		connect("confirmed", this, "_confirmed");
+		connect("confirmed", callable_mp(this, &VisualScriptPropertySelector::_confirmed));
 	}
 }
 
 void VisualScriptPropertySelector::select_method_from_base_type(const String &p_base, const String &p_current, const bool p_virtuals_only, const bool p_connecting, bool clear_text) {
-
 	base_type = p_base;
 	selected = p_current;
 	type = Variant::NIL;
-	script = 0;
 	properties = false;
-	instance = NULL;
+	instance = nullptr;
 	virtuals_only = p_virtuals_only;
 
 	show_window(.5f);
-	if (clear_text)
+	if (clear_text) {
 		search_box->set_text("");
-	else
+	} else {
 		search_box->select_all();
+	}
 	search_box->grab_focus();
 	connecting = p_connecting;
 
@@ -550,21 +553,20 @@ void VisualScriptPropertySelector::set_type_filter(const Vector<Variant::Type> &
 }
 
 void VisualScriptPropertySelector::select_from_base_type(const String &p_base, const String &p_current, bool p_virtuals_only, bool p_seq_connect, const bool p_connecting, bool clear_text) {
-
 	base_type = p_base;
 	selected = p_current;
 	type = Variant::NIL;
-	script = 0;
 	properties = true;
 	visual_script_generic = false;
-	instance = NULL;
+	instance = nullptr;
 	virtuals_only = p_virtuals_only;
 
 	show_window(.5f);
-	if (clear_text)
+	if (clear_text) {
 		search_box->set_text("");
-	else
+	} else {
 		search_box->select_all();
+	}
 	search_box->grab_focus();
 	seq_connect = p_seq_connect;
 	connecting = p_connecting;
@@ -581,14 +583,15 @@ void VisualScriptPropertySelector::select_from_script(const Ref<Script> &p_scrip
 	script = p_script->get_instance_id();
 	properties = true;
 	visual_script_generic = false;
-	instance = NULL;
+	instance = nullptr;
 	virtuals_only = false;
 
 	show_window(.5f);
-	if (clear_text)
+	if (clear_text) {
 		search_box->set_text("");
-	else
+	} else {
 		search_box->select_all();
+	}
 	search_box->grab_focus();
 	seq_connect = false;
 	connecting = p_connecting;
@@ -601,17 +604,17 @@ void VisualScriptPropertySelector::select_from_basic_type(Variant::Type p_type,
 	base_type = "";
 	selected = p_current;
 	type = p_type;
-	script = 0;
 	properties = true;
 	visual_script_generic = false;
-	instance = NULL;
+	instance = nullptr;
 	virtuals_only = false;
 
 	show_window(.5f);
-	if (clear_text)
+	if (clear_text) {
 		search_box->set_text("");
-	else
+	} else {
 		search_box->select_all();
+	}
 	search_box->grab_focus();
 	seq_connect = false;
 	connecting = p_connecting;
@@ -623,17 +626,17 @@ void VisualScriptPropertySelector::select_from_action(const String &p_type, cons
 	base_type = p_type;
 	selected = p_current;
 	type = Variant::NIL;
-	script = 0;
 	properties = false;
 	visual_script_generic = false;
-	instance = NULL;
+	instance = nullptr;
 	virtuals_only = false;
 
 	show_window(.5f);
-	if (clear_text)
+	if (clear_text) {
 		search_box->set_text("");
-	else
+	} else {
 		search_box->select_all();
+	}
 	search_box->grab_focus();
 	seq_connect = true;
 	connecting = p_connecting;
@@ -645,17 +648,17 @@ void VisualScriptPropertySelector::select_from_instance(Object *p_instance, cons
 	base_type = p_basetype;
 	selected = p_current;
 	type = Variant::NIL;
-	script = 0;
 	properties = true;
 	visual_script_generic = false;
 	instance = p_instance;
 	virtuals_only = false;
 
 	show_window(.5f);
-	if (clear_text)
+	if (clear_text) {
 		search_box->set_text("");
-	else
+	} else {
 		search_box->select_all();
+	}
 	search_box->grab_focus();
 	seq_connect = false;
 	connecting = p_connecting;
@@ -667,16 +670,16 @@ void VisualScriptPropertySelector::select_from_visual_script(const String &p_bas
 	base_type = p_base;
 	selected = "";
 	type = Variant::NIL;
-	script = 0;
 	properties = true;
 	visual_script_generic = true;
-	instance = NULL;
+	instance = nullptr;
 	virtuals_only = false;
 	show_window(.5f);
-	if (clear_text)
+	if (clear_text) {
 		search_box->set_text("");
-	else
+	} else {
 		search_box->select_all();
+	}
 	search_box->grab_focus();
 	connecting = p_connecting;
 
@@ -684,48 +687,36 @@ void VisualScriptPropertySelector::select_from_visual_script(const String &p_bas
 }
 
 void VisualScriptPropertySelector::show_window(float p_screen_ratio) {
-	Rect2 rect;
-	Point2 window_size = get_viewport_rect().size;
-	rect.size = (window_size * p_screen_ratio).floor();
-	rect.size.x = rect.size.x / 2.2f;
-	rect.position = ((window_size - rect.size) / 2.0f).floor();
-	popup(rect);
+	popup_centered_ratio(p_screen_ratio);
 }
 
 void VisualScriptPropertySelector::_bind_methods() {
-
-	ClassDB::bind_method(D_METHOD("_text_changed"), &VisualScriptPropertySelector::_text_changed);
-	ClassDB::bind_method(D_METHOD("_confirmed"), &VisualScriptPropertySelector::_confirmed);
-	ClassDB::bind_method(D_METHOD("_sbox_input"), &VisualScriptPropertySelector::_sbox_input);
-	ClassDB::bind_method(D_METHOD("_item_selected"), &VisualScriptPropertySelector::_item_selected);
-
 	ADD_SIGNAL(MethodInfo("selected", PropertyInfo(Variant::STRING, "name"), PropertyInfo(Variant::STRING, "category"), PropertyInfo(Variant::BOOL, "connecting")));
 }
 
 VisualScriptPropertySelector::VisualScriptPropertySelector() {
-
-	VBoxContainer *vbc = memnew(VBoxContainer);
+	vbc = memnew(VBoxContainer);
 	add_child(vbc);
 	//set_child_rect(vbc);
 	search_box = memnew(LineEdit);
 	vbc->add_margin_child(TTR("Search:"), search_box);
-	search_box->connect("text_changed", this, "_text_changed");
-	search_box->connect("gui_input", this, "_sbox_input");
+	search_box->connect("text_changed", callable_mp(this, &VisualScriptPropertySelector::_text_changed));
+	search_box->connect("gui_input", callable_mp(this, &VisualScriptPropertySelector::_sbox_input));
 	search_options = memnew(Tree);
 	vbc->add_margin_child(TTR("Matches:"), search_options, true);
 	get_ok()->set_text(TTR("Open"));
 	get_ok()->set_disabled(true);
 	register_text_enter(search_box);
 	set_hide_on_ok(false);
-	search_options->connect("item_activated", this, "_confirmed");
-	search_options->connect("cell_selected", this, "_item_selected");
+	search_options->connect("item_activated", callable_mp(this, &VisualScriptPropertySelector::_confirmed));
+	search_options->connect("cell_selected", callable_mp(this, &VisualScriptPropertySelector::_item_selected));
 	search_options->set_hide_root(true);
 	search_options->set_hide_folding(true);
 	virtuals_only = false;
 	seq_connect = false;
 	help_bit = memnew(EditorHelpBit);
 	vbc->add_margin_child(TTR("Description:"), help_bit);
-	help_bit->connect("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);