mirror of
https://github.com/godotengine/godot
synced 2024-09-05 12:28:27 +00:00
Inspect hovered node while dragging
This commit is contained in:
parent
e5b4ef8e95
commit
0ba1adfaf9
|
@ -160,6 +160,7 @@ public:
|
|||
|
||||
void set_marked(const HashSet<Node *> &p_marked, bool p_selectable = true, bool p_children_selectable = true);
|
||||
void set_marked(Node *p_marked, bool p_selectable = true, bool p_children_selectable = true);
|
||||
bool has_marked() const { return !marked.is_empty(); }
|
||||
void set_selected(Node *p_node, bool p_emit_selected = true);
|
||||
Node *get_selected();
|
||||
void set_can_rename(bool p_can_rename) { can_rename = p_can_rename; }
|
||||
|
|
|
@ -76,6 +76,43 @@ void SceneTreeDock::_quick_open() {
|
|||
instantiate_scenes(quick_open->get_selected_files(), scene_tree->get_selected());
|
||||
}
|
||||
|
||||
void SceneTreeDock::_inspect_hovered_node() {
|
||||
scene_tree->set_selected(node_hovered_now);
|
||||
scene_tree->set_marked(node_hovered_now);
|
||||
Tree *tree = scene_tree->get_scene_tree();
|
||||
TreeItem *item = tree->get_item_at_position(tree->get_local_mouse_position());
|
||||
if (item) {
|
||||
item->set_as_cursor(0);
|
||||
}
|
||||
InspectorDock::get_inspector_singleton()->edit(node_hovered_now);
|
||||
InspectorDock::get_inspector_singleton()->propagate_notification(NOTIFICATION_DRAG_BEGIN); // Enable inspector drag preview after it updated.
|
||||
InspectorDock::get_singleton()->update(node_hovered_now);
|
||||
EditorNode::get_singleton()->hide_unused_editors();
|
||||
}
|
||||
|
||||
void SceneTreeDock::_handle_hover_to_inspect() {
|
||||
Tree *tree = scene_tree->get_scene_tree();
|
||||
TreeItem *item = tree->get_item_at_position(tree->get_local_mouse_position());
|
||||
|
||||
if (item) {
|
||||
const NodePath &np = item->get_metadata(0);
|
||||
node_hovered_now = get_node_or_null(np);
|
||||
if (node_hovered_previously != node_hovered_now) {
|
||||
inspect_hovered_node_delay->start();
|
||||
}
|
||||
node_hovered_previously = node_hovered_now;
|
||||
} else {
|
||||
_reset_hovering_timer();
|
||||
}
|
||||
}
|
||||
|
||||
void SceneTreeDock::_reset_hovering_timer() {
|
||||
if (!inspect_hovered_node_delay->is_stopped()) {
|
||||
inspect_hovered_node_delay->stop();
|
||||
}
|
||||
node_hovered_previously = nullptr;
|
||||
}
|
||||
|
||||
void SceneTreeDock::input(const Ref<InputEvent> &p_event) {
|
||||
ERR_FAIL_COND(p_event.is_null());
|
||||
|
||||
|
@ -92,6 +129,17 @@ void SceneTreeDock::input(const Ref<InputEvent> &p_event) {
|
|||
_push_item(pending_click_select);
|
||||
pending_click_select = nullptr;
|
||||
}
|
||||
|
||||
if (mb->is_released()) {
|
||||
if (scene_tree->has_marked()) {
|
||||
scene_tree->set_marked(nullptr);
|
||||
}
|
||||
_reset_hovering_timer();
|
||||
}
|
||||
}
|
||||
|
||||
if (tree_clicked && get_viewport()->gui_is_dragging()) {
|
||||
_handle_hover_to_inspect();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1539,6 +1587,10 @@ void SceneTreeDock::_notification(int p_what) {
|
|||
}
|
||||
}
|
||||
} break;
|
||||
|
||||
case NOTIFICATION_DRAG_END: {
|
||||
_reset_hovering_timer();
|
||||
} break;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -4300,6 +4352,7 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec
|
|||
scene_tree->connect("files_dropped", callable_mp(this, &SceneTreeDock::_files_dropped));
|
||||
scene_tree->connect("script_dropped", callable_mp(this, &SceneTreeDock::_script_dropped));
|
||||
scene_tree->connect("nodes_dragged", callable_mp(this, &SceneTreeDock::_nodes_drag_begin));
|
||||
scene_tree->connect("mouse_exited", callable_mp(this, &SceneTreeDock::_reset_hovering_timer));
|
||||
|
||||
scene_tree->get_scene_tree()->connect("gui_input", callable_mp(this, &SceneTreeDock::_scene_tree_gui_input));
|
||||
scene_tree->get_scene_tree()->connect("item_icon_double_clicked", callable_mp(this, &SceneTreeDock::_focus_node));
|
||||
|
@ -4309,6 +4362,11 @@ SceneTreeDock::SceneTreeDock(Node *p_scene_root, EditorSelection *p_editor_selec
|
|||
scene_tree->set_as_scene_tree_dock();
|
||||
scene_tree->set_editor_selection(editor_selection);
|
||||
|
||||
inspect_hovered_node_delay = memnew(Timer);
|
||||
inspect_hovered_node_delay->connect("timeout", callable_mp(this, &SceneTreeDock::_inspect_hovered_node));
|
||||
inspect_hovered_node_delay->set_one_shot(true);
|
||||
add_child(inspect_hovered_node_delay);
|
||||
|
||||
create_dialog = memnew(CreateDialog);
|
||||
create_dialog->set_base_type("Node");
|
||||
add_child(create_dialog);
|
||||
|
|
|
@ -234,6 +234,14 @@ class SceneTreeDock : public VBoxContainer {
|
|||
void _node_prerenamed(Node *p_node, const String &p_new_name);
|
||||
|
||||
void _nodes_drag_begin();
|
||||
|
||||
void _handle_hover_to_inspect();
|
||||
void _inspect_hovered_node();
|
||||
void _reset_hovering_timer();
|
||||
Timer *inspect_hovered_node_delay = nullptr;
|
||||
Node *node_hovered_now = nullptr;
|
||||
Node *node_hovered_previously = nullptr;
|
||||
|
||||
virtual void input(const Ref<InputEvent> &p_event) override;
|
||||
virtual void shortcut_input(const Ref<InputEvent> &p_event) override;
|
||||
void _scene_tree_gui_input(Ref<InputEvent> p_event);
|
||||
|
|
Loading…
Reference in a new issue