godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add editor property type so that inspector can search for objects. This is a regression.

This commit is contained in:
K. S. Ernest (iFire) Lee 2018-07-18 21:58:40 -07:00
parent 41a0ecb59b
commit 23744d8064
2 changed files with 68 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
editor/editor_properties.cpp
View File

@ -258,6 +258,51 @@ EditorPropertyPath::EditorPropertyPath() {
global = false; global = false;
} }
///////////////////// CLASS NAME /////////////////////////
void EditorPropertyClassName::setup(const String &p_base_type, const String &p_selected_type) {
base_type = p_base_type;
dialog->set_base_type(base_type);
selected_type = p_selected_type;
property->set_text(selected_type);
}
void EditorPropertyClassName::update_property() {
String s = get_edited_object()->get(get_edited_property());
property->set_text(s);
selected_type = s;
}
void EditorPropertyClassName::_property_selected() {
dialog->popup_create(true);
}
void EditorPropertyClassName::_dialog_created() {
selected_type = dialog->get_selected_type();
emit_signal("property_changed", get_edited_property(), selected_type);
update_property();
}
void EditorPropertyClassName::_bind_methods() {
ClassDB::bind_method(D_METHOD("_dialog_created"), &EditorPropertyClassName::_dialog_created);
ClassDB::bind_method(D_METHOD("_property_selected"), &EditorPropertyClassName::_property_selected);
}
EditorPropertyClassName::EditorPropertyClassName() {
property = memnew(Button);
property->set_clip_text(true);
add_child(property);
add_focusable(property);
property->set_text(selected_type);
property->connect("pressed", this, "_property_selected");
dialog = memnew(CreateDialog);
dialog->set_base_type(base_type);
dialog->connect("create", this, "_dialog_created");
add_child(dialog);
}
///////////////////// MEMBER ///////////////////////// ///////////////////// MEMBER /////////////////////////
void EditorPropertyMember::_property_selected(const String &p_selected) { void EditorPropertyMember::_property_selected(const String &p_selected) {
@ -2607,6 +2652,10 @@ bool EditorInspectorDefaultPlugin::parse_property(Object *p_object, Variant::Typ
} else if (p_hint == PROPERTY_HINT_MULTILINE_TEXT) { } else if (p_hint == PROPERTY_HINT_MULTILINE_TEXT) {
EditorPropertyMultilineText *editor = memnew(EditorPropertyMultilineText); EditorPropertyMultilineText *editor = memnew(EditorPropertyMultilineText);
add_property_editor(p_path, editor); add_property_editor(p_path, editor);
} else if (p_hint == PROPERTY_HINT_TYPE_STRING) {
EditorPropertyClassName *editor = memnew(EditorPropertyClassName);
editor->setup("Object", p_hint_text);
add_property_editor(p_path, editor);
} else if (p_hint == PROPERTY_HINT_DIR || p_hint == PROPERTY_HINT_FILE || p_hint == PROPERTY_HINT_GLOBAL_DIR || p_hint == PROPERTY_HINT_GLOBAL_FILE) { } else if (p_hint == PROPERTY_HINT_DIR || p_hint == PROPERTY_HINT_FILE || p_hint == PROPERTY_HINT_GLOBAL_DIR || p_hint == PROPERTY_HINT_GLOBAL_FILE) {
Vector<String> extensions = p_hint_text.split(","); Vector<String> extensions = p_hint_text.split(",");

19
editor/editor_properties.h
View File

@ -119,6 +119,25 @@ public:
EditorPropertyPath(); EditorPropertyPath();
}; };
class EditorPropertyClassName : public EditorProperty {
GDCLASS(EditorPropertyClassName, EditorProperty)
private:
CreateDialog *dialog;
Button *property;
String selected_type;
String base_type;
void _property_selected();
void _dialog_created();
protected:
static void _bind_methods();
public:
void setup(const String &p_base_type, const String &p_selected_type);
virtual void update_property();
EditorPropertyClassName();
};
class EditorPropertyMember : public EditorProperty { class EditorPropertyMember : public EditorProperty {
GDCLASS(EditorPropertyMember, EditorProperty) GDCLASS(EditorPropertyMember, EditorProperty)
public: public: