godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-17 14:11:06 +00:00
Code Releases Wiki Activity

Merge pull request #58049 from jmb462/fix-distraction-mode-docks-tab

Browse Source 
Prevent docks to be reset to first tab when switching dock visibility
This commit is contained in:
Rémi Verschelde
2022-09-28 00:16:08 +02:00
parent 0f1efa7c55 d047504601
commit 73f5683c34
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
editor/editor_node.cpp
View File

@@ -4878,7 +4878,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();
@@ -4913,9 +4913,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);
}
} }
} }
@@ -5528,7 +5530,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

@@ -651,7 +651,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);
void _save_open_scenes_to_config(Ref<ConfigFile> p_layout, const String &p_section); void _save_open_scenes_to_config(Ref<ConfigFile> p_layout, const String &p_section);