diff options
Diffstat (limited to 'editor/property_selector.cpp')
-rw-r--r-- | editor/property_selector.cpp | 64 |
1 files changed, 41 insertions, 23 deletions
diff --git a/editor/property_selector.cpp b/editor/property_selector.cpp index 870bf52a91..6888ebdc71 100644 --- a/editor/property_selector.cpp +++ b/editor/property_selector.cpp @@ -51,8 +51,9 @@ void PropertySelector::_sbox_input(const Ref<InputEvent> &p_ie) { 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(); @@ -70,12 +71,13 @@ void PropertySelector::_sbox_input(const Ref<InputEvent> &p_ie) { } void PropertySelector::_update_search() { - if (properties) + if (properties) { set_title(TTR("Select Property")); - else if (virtuals_only) + } else if (virtuals_only) { set_title(TTR("Select Virtual Method")); - else + } else { set_title(TTR("Select Method")); + } search_options->clear(); help_bit->set_text(""); @@ -161,14 +163,17 @@ void PropertySelector::_update_search() { continue; } - if (!(E->get().usage & PROPERTY_USAGE_EDITOR) && !(E->get().usage & PROPERTY_USAGE_SCRIPT_VARIABLE)) + if (!(E->get().usage & PROPERTY_USAGE_EDITOR) && !(E->get().usage & PROPERTY_USAGE_SCRIPT_VARIABLE)) { continue; + } - if (search_box->get_text() != String() && E->get().name.find(search_box->get_text()) == -1) + if (search_box->get_text() != String() && E->get().name.find(search_box->get_text()) == -1) { continue; + } - if (type_filter.size() && type_filter.find(E->get().type) == -1) + if (type_filter.size() && type_filter.find(E->get().type) == -1) { continue; + } TreeItem *item = search_options->create_item(category ? category : root); item->set_text(0, E->get().name); @@ -238,17 +243,21 @@ void PropertySelector::_update_search() { } String name = E->get().name.get_slice(":", 0); - if (!script_methods && name.begins_with("_") && !(E->get().flags & METHOD_FLAG_VIRTUAL)) + if (!script_methods && name.begins_with("_") && !(E->get().flags & METHOD_FLAG_VIRTUAL)) { continue; + } - if (virtuals_only && !(E->get().flags & METHOD_FLAG_VIRTUAL)) + if (virtuals_only && !(E->get().flags & METHOD_FLAG_VIRTUAL)) { continue; + } - if (!virtuals_only && (E->get().flags & METHOD_FLAG_VIRTUAL)) + if (!virtuals_only && (E->get().flags & METHOD_FLAG_VIRTUAL)) { continue; + } - if (search_box->get_text() != String() && name.find(search_box->get_text()) == -1) + if (search_box->get_text() != String() && name.find(search_box->get_text()) == -1) { continue; + } TreeItem *item = search_options->create_item(category ? category : root); @@ -258,35 +267,40 @@ void PropertySelector::_update_search() { if (mi.name.find(":") != -1) { desc = mi.name.get_slice(":", 1) + " "; mi.name = mi.name.get_slice(":", 0); - } else if (mi.return_val.type != Variant::NIL) + } else if (mi.return_val.type != Variant::NIL) { desc = Variant::get_type_name(mi.return_val.type); - else + } else { desc = "void "; + } desc += " " + mi.name + " ( "; for (int i = 0; i < mi.arguments.size(); i++) { - if (i > 0) + if (i > 0) { desc += ", "; + } - if (mi.arguments[i].type == Variant::NIL) + if (mi.arguments[i].type == Variant::NIL) { desc += "var "; - else if (mi.arguments[i].name.find(":") != -1) { + } else if (mi.arguments[i].name.find(":") != -1) { desc += mi.arguments[i].name.get_slice(":", 1) + " "; mi.arguments[i].name = mi.arguments[i].name.get_slice(":", 0); - } else + } else { desc += Variant::get_type_name(mi.arguments[i].type) + " "; + } desc += mi.arguments[i].name; } desc += " )"; - if (E->get().flags & METHOD_FLAG_CONST) + if (E->get().flags & METHOD_FLAG_CONST) { desc += " const"; + } - if (E->get().flags & METHOD_FLAG_VIRTUAL) + if (E->get().flags & METHOD_FLAG_VIRTUAL) { desc += " virtual"; + } item->set_text(0, desc); item->set_metadata(0, name); @@ -308,8 +322,9 @@ void PropertySelector::_update_search() { void PropertySelector::_confirmed() { TreeItem *ti = search_options->get_selected(); - if (!ti) + if (!ti) { return; + } emit_signal("selected", ti->get_metadata(0)); hide(); } @@ -318,8 +333,9 @@ void PropertySelector::_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; @@ -365,8 +381,9 @@ void PropertySelector::_item_selected() { } } - if (text == String()) + if (text == String()) { return; + } help_bit->set_text(text); } @@ -437,8 +454,9 @@ void PropertySelector::select_method_from_instance(Object *p_instance, const Str script = ObjectID(); { Ref<Script> scr = p_instance->get_script(); - if (scr.is_valid()) + if (scr.is_valid()) { script = scr->get_instance_id(); + } } properties = false; instance = nullptr; |