mirror of
https://github.com/godotengine/godot
synced 2024-09-05 18:19:34 +00:00
Merge pull request #26487 from matzebond/master
Auto-expand current node type when changing node type
This commit is contained in:
commit
6273e4d76d
|
@ -38,7 +38,7 @@
|
|||
#include "editor_settings.h"
|
||||
#include "scene/gui/box_container.h"
|
||||
|
||||
void CreateDialog::popup_create(bool p_dont_clear, bool p_replace_mode) {
|
||||
void CreateDialog::popup_create(bool p_dont_clear, bool p_replace_mode, const String &p_select_type) {
|
||||
|
||||
type_list.clear();
|
||||
ClassDB::get_class_list(&type_list);
|
||||
|
@ -109,6 +109,7 @@ void CreateDialog::popup_create(bool p_dont_clear, bool p_replace_mode) {
|
|||
is_replace_mode = p_replace_mode;
|
||||
|
||||
if (p_replace_mode) {
|
||||
select_type(p_select_type);
|
||||
set_title(vformat(TTR("Change %s Type"), base_type));
|
||||
get_ok()->set_text(TTR("Change"));
|
||||
} else {
|
||||
|
@ -251,6 +252,27 @@ bool CreateDialog::_is_class_disabled_by_feature_profile(const StringName &p_cla
|
|||
return false;
|
||||
}
|
||||
|
||||
void CreateDialog::select_type(const String &p_type) {
|
||||
TreeItem *to_select;
|
||||
if (search_options_types.has(p_type)) {
|
||||
to_select = search_options_types[p_type];
|
||||
} else {
|
||||
to_select = search_options->get_root();
|
||||
}
|
||||
|
||||
// uncollapse from selected type to top level
|
||||
// TODO: should this be in tree?
|
||||
TreeItem *cur = to_select;
|
||||
while (cur) {
|
||||
cur->set_collapsed(false);
|
||||
cur = cur->get_parent();
|
||||
}
|
||||
|
||||
to_select->select(0);
|
||||
|
||||
search_options->scroll_to_item(to_select);
|
||||
}
|
||||
|
||||
void CreateDialog::_update_search() {
|
||||
|
||||
search_options->clear();
|
||||
|
@ -262,7 +284,7 @@ void CreateDialog::_update_search() {
|
|||
_parse_fs(EditorFileSystem::get_singleton()->get_filesystem());
|
||||
*/
|
||||
|
||||
HashMap<String, TreeItem *> types;
|
||||
search_options_types.clear();
|
||||
|
||||
TreeItem *root = search_options->create_item();
|
||||
EditorData &ed = EditorNode::get_editor_data();
|
||||
|
@ -300,7 +322,7 @@ void CreateDialog::_update_search() {
|
|||
}
|
||||
|
||||
if (search_box->get_text() == "") {
|
||||
add_type(type, types, root, &to_select);
|
||||
add_type(type, search_options_types, root, &to_select);
|
||||
} else {
|
||||
|
||||
bool found = false;
|
||||
|
@ -316,7 +338,7 @@ void CreateDialog::_update_search() {
|
|||
}
|
||||
|
||||
if (found)
|
||||
add_type(I->get(), types, root, &to_select);
|
||||
add_type(I->get(), search_options_types, root, &to_select);
|
||||
}
|
||||
|
||||
if (EditorNode::get_editor_data().get_custom_types().has(type) && ClassDB::is_parent_class(type, base_type)) {
|
||||
|
@ -330,12 +352,12 @@ void CreateDialog::_update_search() {
|
|||
if (!show)
|
||||
continue;
|
||||
|
||||
if (!types.has(type))
|
||||
add_type(type, types, root, &to_select);
|
||||
if (!search_options_types.has(type))
|
||||
add_type(type, search_options_types, root, &to_select);
|
||||
|
||||
TreeItem *ti;
|
||||
if (types.has(type))
|
||||
ti = types[type];
|
||||
if (search_options_types.has(type))
|
||||
ti = search_options_types[type];
|
||||
else
|
||||
ti = search_options->get_root();
|
||||
|
||||
|
|
|
@ -53,6 +53,7 @@ class CreateDialog : public ConfirmationDialog {
|
|||
Button *favorite;
|
||||
LineEdit *search_box;
|
||||
Tree *search_options;
|
||||
HashMap<String, TreeItem *> search_options_types;
|
||||
bool is_replace_mode;
|
||||
String base_type;
|
||||
String preferred_search_result_type;
|
||||
|
@ -82,6 +83,8 @@ class CreateDialog : public ConfirmationDialog {
|
|||
|
||||
void add_type(const String &p_type, HashMap<String, TreeItem *> &p_types, TreeItem *p_root, TreeItem **to_select);
|
||||
|
||||
void select_type(const String &p_type);
|
||||
|
||||
Variant get_drag_data_fw(const Point2 &p_point, Control *p_from);
|
||||
bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const;
|
||||
void drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from);
|
||||
|
@ -104,7 +107,7 @@ public:
|
|||
void set_preferred_search_result_type(const String &p_preferred_type);
|
||||
String get_preferred_search_result_type();
|
||||
|
||||
void popup_create(bool p_dont_clear, bool p_replace_mode = false);
|
||||
void popup_create(bool p_dont_clear, bool p_replace_mode = false, const String &p_select_type = "Node");
|
||||
|
||||
CreateDialog();
|
||||
};
|
||||
|
|
|
@ -347,7 +347,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
|
|||
if (!profile_allow_editing) {
|
||||
break;
|
||||
}
|
||||
create_dialog->popup_create(false, true);
|
||||
create_dialog->popup_create(false, true, scene_tree->get_selected()->get_class());
|
||||
} break;
|
||||
case TOOL_ATTACH_SCRIPT: {
|
||||
|
||||
|
|
Loading…
Reference in a new issue