From 522d6fed70bd36f7eec40616b34992ef40f8cb37 Mon Sep 17 00:00:00 2001 From: havi05 Date: Mon, 20 Jan 2025 17:23:26 +0100 Subject: [PATCH] Tree - fix `ui_select` --- scene/gui/tree.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index ef7fda4fc6d..2cab802ec67 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -3680,15 +3680,6 @@ void Tree::gui_input(const Ref &p_event) { prev->select(selected_col); } ensure_cursor_is_visible(); - } else if (p_event->is_action("ui_accept") && p_event->is_pressed()) { - if (selected_item) { - //bring up editor if possible - if (!edit_selected()) { - emit_signal(SNAME("item_activated")); - incr_search.clear(); - } - } - accept_event(); } else if (p_event->is_action("ui_select") && p_event->is_pressed()) { if (select_mode == SELECT_MULTI) { if (!selected_item) { @@ -3703,6 +3694,15 @@ void Tree::gui_input(const Ref &p_event) { } } accept_event(); + } else if (p_event->is_action("ui_accept") && p_event->is_pressed()) { + if (selected_item) { + //bring up editor if possible + if (!edit_selected()) { + emit_signal(SNAME("item_activated")); + incr_search.clear(); + } + } + accept_event(); } if (allow_search && k.is_valid()) { // Incremental search