asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[3.x] Prevent docks to be reset to first tab when switching dock visibility

Browse source
This commit is contained in:
Jean-Michel Bernard 2022-11-03 13:02:11 +01:00
parent 8f7508ca4d
commit 79ebba0f6b
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
editor/editor_node.cpp
View file

@ -4535,7 +4535,7 @@ void EditorNode::_load_docks() {
editor_data.set_plugin_window_layout(config); editor_data.set_plugin_window_layout(config);
} }
void EditorNode::_update_dock_slots_visibility() { void EditorNode::_update_dock_slots_visibility(bool p_keep_selected_tabs) {
if (!docks_visible) { if (!docks_visible) {
for (int i = 0; i < DOCK_SLOT_MAX; i++) { for (int i = 0; i < DOCK_SLOT_MAX; i++) {
dock_slot[i]->hide(); dock_slot[i]->hide();
@ -4570,9 +4570,11 @@ void EditorNode::_update_dock_slots_visibility() {
} }
} }
for (int i = 0; i < DOCK_SLOT_MAX; i++) { if (!p_keep_selected_tabs) {
if (dock_slot[i]->is_visible() && dock_slot[i]->get_tab_count()) { for (int i = 0; i < DOCK_SLOT_MAX; i++) {
dock_slot[i]->set_current_tab(0); if (dock_slot[i]->is_visible() && dock_slot[i]->get_tab_count()) {
dock_slot[i]->set_current_tab(0);
}
} }
} }
@ -5173,7 +5175,7 @@ void EditorNode::_bottom_panel_switch(bool p_enable, int p_idx) {
void EditorNode::set_docks_visible(bool p_show) { void EditorNode::set_docks_visible(bool p_show) {
docks_visible = p_show; docks_visible = p_show;
_update_dock_slots_visibility(); _update_dock_slots_visibility(true);
} }
bool EditorNode::get_docks_visible() const { bool EditorNode::get_docks_visible() const {

2
editor/editor_node.h
View file

@ -616,7 +616,7 @@ private:
void _load_docks(); void _load_docks();
void _save_docks_to_config(Ref<ConfigFile> p_layout, const String &p_section); void _save_docks_to_config(Ref<ConfigFile> p_layout, const String &p_section);
void _load_docks_from_config(Ref<ConfigFile> p_layout, const String &p_section); void _load_docks_from_config(Ref<ConfigFile> p_layout, const String &p_section);
void _update_dock_slots_visibility(); void _update_dock_slots_visibility(bool p_keep_selected_tabs = false);
void _dock_tab_changed(int p_tab); void _dock_tab_changed(int p_tab);
bool restoring_scenes; bool restoring_scenes;