From 301a8fd559686ad9b617a89eba88eecb281bec7d Mon Sep 17 00:00:00 2001 From: HolonProduction Date: Fri, 7 Oct 2022 19:15:20 +0200 Subject: Fix a bug with moving dock left and right. Fixes #67039 `get_index` counts internal children by default but `move_child` ignores them therefore `move_child` had no effect. The call to `set_current_tab` is not needed anymore in Godot 4 since the current tab will change when calling `move_child`. --- editor/editor_node.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'editor') diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index f83ff598c5..288ee4fa8f 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -4678,8 +4678,7 @@ void EditorNode::_dock_move_left() { if (!current_ctl || !prev_ctl) { return; } - dock_slot[dock_popup_selected_idx]->move_child(current_ctl, prev_ctl->get_index()); - dock_slot[dock_popup_selected_idx]->set_current_tab(dock_slot[dock_popup_selected_idx]->get_current_tab() - 1); + dock_slot[dock_popup_selected_idx]->move_child(current_ctl, prev_ctl->get_index(false)); dock_select->queue_redraw(); _edit_current(); _save_docks(); @@ -4691,8 +4690,7 @@ void EditorNode::_dock_move_right() { if (!current_ctl || !next_ctl) { return; } - dock_slot[dock_popup_selected_idx]->move_child(next_ctl, current_ctl->get_index()); - dock_slot[dock_popup_selected_idx]->set_current_tab(dock_slot[dock_popup_selected_idx]->get_current_tab() + 1); + dock_slot[dock_popup_selected_idx]->move_child(next_ctl, current_ctl->get_index(false)); dock_select->queue_redraw(); _edit_current(); _save_docks(); -- cgit v1.2.3