Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-10 14:12:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make Animation's SceneTreeDialog filter nodes properly

Browse Source
This commit is contained in:
Dominik 'dreamsComeTrue' Jasiński 2021-03-12 16:40:17 +01:00
parent ec3f220098
commit 08a45ebfba
3 changed files with 75 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
editor/animation_track_editor.cpp
View File

@ -4439,6 +4439,8 @@ void AnimationTrackEditor::_add_track(int p_type) {
}
adding_track_type = p_type;
pick_track->popup_scenetree_dialog();
pick_track->get_filter_line_edit()->clear();
pick_track->get_filter_line_edit()->grab_focus();
}
void AnimationTrackEditor::_new_track_property_selected(String p_name) {
@ -5635,6 +5637,70 @@ void AnimationTrackEditor::_bind_methods() {
ADD_SIGNAL(MethodInfo("animation_step_changed", PropertyInfo(Variant::FLOAT, "step")));
}
void AnimationTrackEditor::_pick_track_filter_text_changed(const String &p_newtext) {
TreeItem *root_item = pick_track->get_scene_tree()->get_scene_tree()->get_root();
Vector<Node *> select_candidates;
Node *to_select = nullptr;
String filter = pick_track->get_filter_line_edit()->get_text();
_pick_track_select_recursive(root_item, filter, select_candidates);
if (!select_candidates.is_empty()) {
for (int i = 0; i < select_candidates.size(); ++i) {
Node *candidate = select_candidates[i];
if (((String)candidate->get_name()).to_lower().begins_with(filter.to_lower())) {
to_select = candidate;
break;
}
}
if (!to_select) {
to_select = select_candidates[0];
}
}
pick_track->get_scene_tree()->set_selected(to_select);
}
void AnimationTrackEditor::_pick_track_select_recursive(TreeItem *p_item, const String &p_filter, Vector<Node *> &p_select_candidates) {
if (!p_item) {
return;
}
NodePath np = p_item->get_metadata(0);
Node *node = get_node(np);
if (p_filter != String() && ((String)node->get_name()).findn(p_filter) != -1) {
p_select_candidates.push_back(node);
}
TreeItem *c = p_item->get_children();
while (c) {
_pick_track_select_recursive(c, p_filter, p_select_candidates);
c = c->get_next();
}
}
void AnimationTrackEditor::_pick_track_filter_input(const Ref<InputEvent> &p_ie) {
Ref<InputEventKey> k = p_ie;
if (k.is_valid()) {
switch (k->get_keycode()) {
case KEY_UP:
case KEY_DOWN:
case KEY_PAGEUP:
case KEY_PAGEDOWN: {
pick_track->get_scene_tree()->get_scene_tree()->call("_gui_input", k);
pick_track->get_filter_line_edit()->accept_event();
} break;
}
}
}
AnimationTrackEditor::AnimationTrackEditor() {
root = nullptr;
@ -5805,8 +5871,12 @@ AnimationTrackEditor::AnimationTrackEditor() {
pick_track = memnew(SceneTreeDialog);
add_child(pick_track);
pick_track->register_text_enter(pick_track->get_filter_line_edit());
pick_track->set_title(TTR("Pick a node to animate:"));
pick_track->connect("selected", callable_mp(this, &AnimationTrackEditor::_new_track_node_selected));
pick_track->get_filter_line_edit()->connect("text_changed", callable_mp(this, &AnimationTrackEditor::_pick_track_filter_text_changed));
pick_track->get_filter_line_edit()->connect("gui_input", callable_mp(this, &AnimationTrackEditor::_pick_track_filter_input));
prop_selector = memnew(PropertySelector);
add_child(prop_selector);
prop_selector->connect("selected", callable_mp(this, &AnimationTrackEditor::_new_track_property_selected));

4
editor/animation_track_editor.h
View File

@ -499,6 +499,10 @@ class AnimationTrackEditor : public VBoxContainer {
void _insert_animation_key(NodePath p_path, const Variant &p_value);
void _pick_track_filter_text_changed(const String &p_newtext);
void _pick_track_select_recursive(TreeItem *p_item, const String &p_filter, Vector<Node *> &p_select_candidates);
void _pick_track_filter_input(const Ref<InputEvent> &p_ie);
protected:
static void _bind_methods();
void _notification(int p_what);

1
editor/scene_tree_editor.h
View File

@ -181,6 +181,7 @@ protected:
public:
void popup_scenetree_dialog();
SceneTreeEditor *get_scene_tree() { return tree; }
LineEdit *get_filter_line_edit() { return filter; }
SceneTreeDialog();
~SceneTreeDialog();
};