Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-25 21:52:51 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Prevent docks to be reset to first tab when switching dock visibility

Browse Source
This commit is contained in:
jmb462 2022-02-13 14:16:12 +01:00 committed by Jean-Michel Bernard
parent 4654de5474
commit d047504601
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

@ -4639,7 +4639,7 @@ void EditorNode::_load_docks() {
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) {
for (int i = 0; i < DOCK_SLOT_MAX; i++) {
dock_slot[i]->hide();
@ -4674,9 +4674,11 @@ void EditorNode::_update_dock_slots_visibility() {
}
}
for (int i = 0; i < DOCK_SLOT_MAX; i++) {
if (dock_slot[i]->is_visible() && dock_slot[i]->get_tab_count()) {
dock_slot[i]->set_current_tab(0);
if (!p_keep_selected_tabs) {
for (int i = 0; i < DOCK_SLOT_MAX; i++) {
if (dock_slot[i]->is_visible() && dock_slot[i]->get_tab_count()) {
dock_slot[i]->set_current_tab(0);
}
}
}
@ -5303,7 +5305,7 @@ void EditorNode::_bottom_panel_switch(bool p_enable, int p_idx) {
void EditorNode::set_docks_visible(bool p_show) {
docks_visible = p_show;
_update_dock_slots_visibility();
_update_dock_slots_visibility(true);
}
bool EditorNode::get_docks_visible() const {

2
editor/editor_node.h
View File

@ -633,7 +633,7 @@ private:
void _load_docks();
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 _update_dock_slots_visibility();
void _update_dock_slots_visibility(bool p_keep_selected_tabs = false);
void _dock_tab_changed(int p_tab);
void _save_open_scenes_to_config(Ref<ConfigFile> p_layout, const String &p_section);