Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-10-23 13:41:43 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #88265 from Calinou/tree-fix-recursive-expand-collapse-shortcuts

Browse Source 
Fix recursive Tree expand/collapse shortcuts not working
This commit is contained in:
Rémi Verschelde 2024-02-13 17:24:25 +01:00
commit ace0aeaf4f
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/classes/Tree.xml
View File

@ -353,7 +353,7 @@
This controls the drop sections, i.e. the decision and drawing of possible drop locations based on the mouse position. This controls the drop sections, i.e. the decision and drawing of possible drop locations based on the mouse position.
</member> </member>
<member name="enable_recursive_folding" type="bool" setter="set_enable_recursive_folding" getter="is_recursive_folding_enabled" default="true"> <member name="enable_recursive_folding" type="bool" setter="set_enable_recursive_folding" getter="is_recursive_folding_enabled" default="true">
If [code]true[/code], recursive folding is enabled for this [Tree]. Holding down Shift while clicking the fold arrow collapses or uncollapses the [TreeItem] and all its descendants. If [code]true[/code], recursive folding is enabled for this [Tree]. Holding down [kbd]Shift[/kbd] while clicking the fold arrow or using [code]ui_right[/code]/[code]ui_left[/code] shortcuts collapses or uncollapses the [TreeItem] and all its descendants.
</member> </member>
<member name="focus_mode" type="int" setter="set_focus_mode" getter="get_focus_mode" overrides="Control" enum="Control.FocusMode" default="2" /> <member name="focus_mode" type="int" setter="set_focus_mode" getter="get_focus_mode" overrides="Control" enum="Control.FocusMode" default="2" />
<member name="hide_folding" type="bool" setter="set_hide_folding" getter="is_folding_hidden" default="false"> <member name="hide_folding" type="bool" setter="set_hide_folding" getter="is_folding_hidden" default="false">

34
scene/gui/tree.cpp
View File

@ -3394,7 +3394,7 @@ void Tree::gui_input(const Ref<InputEvent> &p_event) {
Ref<InputEventKey> k = p_event; Ref<InputEventKey> k = p_event;
bool is_command = k.is_valid() && k->is_command_or_control_pressed(); bool is_command = k.is_valid() && k->is_command_or_control_pressed();
if (p_event->is_action("ui_right", true) && p_event->is_pressed()) { if (p_event->is_action("ui_right") && p_event->is_pressed()) {
if (!cursor_can_exit_tree) { if (!cursor_can_exit_tree) {
accept_event(); accept_event();
} }
@ -3402,17 +3402,12 @@ void Tree::gui_input(const Ref<InputEvent> &p_event) {
if (!selected_item || select_mode == SELECT_ROW || selected_col > (columns.size() - 1)) { if (!selected_item || select_mode == SELECT_ROW || selected_col > (columns.size() - 1)) {
return; return;
} }
if (k.is_valid() && k->is_alt_pressed()) { if (k.is_valid() && k->is_shift_pressed()) {
selected_item->set_collapsed(false); selected_item->set_collapsed_recursive(false);
TreeItem *next = selected_item->get_first_child();
while (next && next != selected_item->next) {
next->set_collapsed(false);
next = next->get_next_visible();
}
} else { } else {
_go_right(); _go_right();
} }
} else if (p_event->is_action("ui_left", true) && p_event->is_pressed()) { } else if (p_event->is_action("ui_left") && p_event->is_pressed()) {
if (!cursor_can_exit_tree) { if (!cursor_can_exit_tree) {
accept_event(); accept_event();
} }
@ -3421,32 +3416,27 @@ void Tree::gui_input(const Ref<InputEvent> &p_event) {
return; return;
} }
if (k.is_valid() && k->is_alt_pressed()) { if (k.is_valid() && k->is_shift_pressed()) {
selected_item->set_collapsed(true); selected_item->set_collapsed_recursive(true);
TreeItem *next = selected_item->get_first_child();
while (next && next != selected_item->next) {
next->set_collapsed(true);
next = next->get_next_visible();
}
} else { } else {
_go_left(); _go_left();
} }
} else if (p_event->is_action("ui_up", true) && p_event->is_pressed() && !is_command) { } else if (p_event->is_action("ui_up") && p_event->is_pressed() && !is_command) {
if (!cursor_can_exit_tree) { if (!cursor_can_exit_tree) {
accept_event(); accept_event();
} }
_go_up(); _go_up();
} else if (p_event->is_action("ui_down", true) && p_event->is_pressed() && !is_command) { } else if (p_event->is_action("ui_down") && p_event->is_pressed() && !is_command) {
if (!cursor_can_exit_tree) { if (!cursor_can_exit_tree) {
accept_event(); accept_event();
} }
_go_down(); _go_down();
} else if (p_event->is_action("ui_page_down", true) && p_event->is_pressed()) { } else if (p_event->is_action("ui_page_down") && p_event->is_pressed()) {
if (!cursor_can_exit_tree) { if (!cursor_can_exit_tree) {
accept_event(); accept_event();
} }
@ -3484,7 +3474,7 @@ void Tree::gui_input(const Ref<InputEvent> &p_event) {
} }
ensure_cursor_is_visible(); ensure_cursor_is_visible();
} else if (p_event->is_action("ui_page_up", true) && p_event->is_pressed()) { } else if (p_event->is_action("ui_page_up") && p_event->is_pressed()) {
if (!cursor_can_exit_tree) { if (!cursor_can_exit_tree) {
accept_event(); accept_event();
} }
@ -3521,7 +3511,7 @@ void Tree::gui_input(const Ref<InputEvent> &p_event) {
prev->select(selected_col); prev->select(selected_col);
} }
ensure_cursor_is_visible(); ensure_cursor_is_visible();
} else if (p_event->is_action("ui_accept", true) && p_event->is_pressed()) { } else if (p_event->is_action("ui_accept") && p_event->is_pressed()) {
if (selected_item) { if (selected_item) {
//bring up editor if possible //bring up editor if possible
if (!edit_selected()) { if (!edit_selected()) {
@ -3530,7 +3520,7 @@ void Tree::gui_input(const Ref<InputEvent> &p_event) {
} }
} }
accept_event(); accept_event();
} else if (p_event->is_action("ui_select", true) && p_event->is_pressed()) { } else if (p_event->is_action("ui_select") && p_event->is_pressed()) {
if (select_mode == SELECT_MULTI) { if (select_mode == SELECT_MULTI) {
if (!selected_item) { if (!selected_item) {
return; return;