Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename tree item double-click signal to match the actual behaviour #44185

Closed
wants to merge 1 commit into from
Closed

Rename tree item double-click signal to match the actual behaviour #44185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions doc/classes/Tree.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@
</signal>
<signal name="item_activated">
<description>
Emitted when an item's label is double-clicked.
Emitted when an item is activated either by double-clicking the item, or by pressing a [code]ui_accept[/code] action when it is selected.
</description>
</signal>
<signal name="item_collapsed">
Expand All @@ -396,9 +396,10 @@
Emitted when a custom button is pressed (i.e. in a [constant TreeItem.CELL_MODE_CUSTOM] mode cell).
</description>
</signal>
<signal name="item_double_clicked">
<signal name="item_editable_icon_clicked">
<description>
Emitted when an item's icon is double-clicked.
Emitted when an editable item's icon is clicked. See [method TreeItem.set_editable].
[b]Note:[/b] Requires the item to be editable. Will be emitted when any non-editable portion of an editable item is clicked; not just the icon. If [member select_mode] is [code]SELECT_MULTI[/code] ([code]2[/code]), requires an editable item to first be selected and then clicked.
</description>
</signal>
<signal name="item_edited">
Expand Down
2 changes: 1 addition & 1 deletion editor/scene_tree_dock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2917,7 +2917,7 @@ SceneTreeDock::SceneTreeDock(EditorNode *p_editor, Node *p_scene_root, EditorSel
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->get_scene_tree()->connect("item_double_clicked", callable_mp(this, &SceneTreeDock::_focus_node));
scene_tree->get_scene_tree()->connect("item_editable_icon_clicked", callable_mp(this, &SceneTreeDock::_focus_node));

scene_tree->set_undo_redo(&editor_data->get_undo_redo());
scene_tree->set_editor_selection(editor_selection);
Expand Down
7 changes: 3 additions & 4 deletions scene/gui/tree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2732,10 +2732,10 @@ void Tree::_gui_input(Ref<InputEvent> p_event) {
}
if (rect.has_point(mpos)) {
if (!edit_selected()) {
emit_signal("item_double_clicked");
emit_signal("item_editable_icon_clicked");
}
} else {
emit_signal("item_double_clicked");
emit_signal("item_editable_icon_clicked");
}
}
pressing_for_editor = false;
Expand Down Expand Up @@ -4204,9 +4204,8 @@ void Tree::_bind_methods() {
ADD_SIGNAL(MethodInfo("item_edited"));
ADD_SIGNAL(MethodInfo("item_rmb_edited"));
ADD_SIGNAL(MethodInfo("item_custom_button_pressed"));
ADD_SIGNAL(MethodInfo("item_double_clicked"));
ADD_SIGNAL(MethodInfo("item_editable_icon_clicked"));
ADD_SIGNAL(MethodInfo("item_collapsed", PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "TreeItem")));
//ADD_SIGNAL( MethodInfo("item_doubleclicked" ) );
ADD_SIGNAL(MethodInfo("button_pressed", PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "TreeItem"), PropertyInfo(Variant::INT, "column"), PropertyInfo(Variant::INT, "id")));
ADD_SIGNAL(MethodInfo("custom_popup_edited", PropertyInfo(Variant::BOOL, "arrow_clicked")));
ADD_SIGNAL(MethodInfo("item_activated"));
Expand Down