summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorHolonProduction <holonproduction@gmail.com>2022-10-07 19:15:20 +0200
committerHolonProduction <holonproduction@gmail.com>2022-10-07 19:15:20 +0200
commit301a8fd559686ad9b617a89eba88eecb281bec7d (patch)
treed5d943a0c9eea3e594919937056806fff58777c8 /editor
parent1baefceababe8a0d63434a231c3799555a45d8e3 (diff)
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`.
Diffstat (limited to 'editor')
-rw-r--r--editor/editor_node.cpp6
1 files changed, 2 insertions, 4 deletions
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();