noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 2 Wiki Activity

Fix some issues with the editor dock tabs

Browse Source
This commit is contained in:
Michael Alexsander
2026-05-15 19:18:03 -03:00
parent ef02314f2b
commit a4ae048b73
3 changed files with 71 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/docks/editor_dock_manager.cpp
+61 -15
View File
@@ -123,6 +123,10 @@ void DockSplitContainer::remove_child_notify(Node *p_child) {
_update_visibility();
}
Control *DockSplitContainer::get_child_as_control(int p_index) const {
return Object::cast_to<Control>(get_child(p_index));
}
DockSplitContainer::DockSplitContainer() {
if (EDITOR_GET("interface/touchscreen/enable_touch_optimizations")) {
callable_mp((SplitContainer *)this, &SplitContainer::set_touch_dragger_enabled).call_deferred(true);
@@ -481,22 +485,40 @@ void EditorDockManager::save_docks_to_config(Ref<ConfigFile> p_layout, const Str
}
p_layout->set_value(p_section, "dock_closed", closed_docks_dump);
// Save SplitContainer offsets.
for (int i = 0; i < vsplits.size(); i++) {
if (vsplits[i]->is_visible_in_tree()) {
p_layout->set_value(p_section, "dock_split_" + itos(i + 1), vsplits[i]->get_split_offset());
}
}
// Distraction-free mode hides both the sides and lower docks, so skip to avoid overriding those values.
if (!EditorNode::get_singleton()->is_distraction_free_mode_enabled()) {
// Save SplitContainer offsets.
PackedInt32Array split_offsets = main_hsplit->get_split_offsets();
int index = 0;
for (int i = 0; i < vsplits.size(); i++) {
int value = 0;
if (vsplits[i]->is_visible() && index < split_offsets.size()) {
value = split_offsets[index] / EDSCALE;
index++;
for (int i = 0; i < vsplits.size(); i++) {
if (vsplits[i]->is_visible_in_tree()) {
p_layout->set_value(p_section, "dock_split_" + itos(i + 1), vsplits[i]->get_split_offset());
}
}
p_layout->set_value(p_section, "dock_hsplit_" + itos(i + 1), value);
PackedInt32Array split_offsets = main_hsplit->get_split_offsets();
int index = 0;
for (int i = 0; i < vsplits.size(); i++) {
int value = 0;
if (vsplits[i]->is_visible() && index < split_offsets.size()) {
value = split_offsets[index] / EDSCALE;
index++;
}
p_layout->set_value(p_section, "dock_hsplit_" + itos(i + 1), value);
}
// The main v-split contains only one singular split.
int value = 0;
if (main_vsplit->get_child_as_control(1)->is_visible()) {
value = main_vsplit->get_split_offsets()[0];
}
p_layout->set_value(p_section, "dock_main_split", value);
// Same for the bottom docks.
value = 0;
if (bottom_hsplit->get_child_as_control(1)->is_visible()) {
value = bottom_hsplit->get_split_offsets()[0];
}
p_layout->set_value(p_section, "dock_bottom_split", value);
}
}
@@ -562,7 +584,9 @@ void EditorDockManager::load_docks_from_config(Ref<ConfigFile> p_layout, const S
}
// Load SplitContainer offsets.
PackedInt32Array offsets;
for (int i = 0; i < vsplits.size(); i++) {
if (!p_layout->has_section_key(p_section, "dock_split_" + itos(i + 1))) {
continue;
@@ -578,6 +602,18 @@ void EditorDockManager::load_docks_from_config(Ref<ConfigFile> p_layout, const S
}
main_hsplit->set_split_offsets(offsets);
// The main v-split contains only one singular split.
if (main_vsplit->get_child_as_control(1)->is_visible()) {
offsets = { p_layout->get_value(p_section, "dock_main_split", 0) };
main_vsplit->set_split_offsets(offsets);
}
// Same for the bottom docks.
if (bottom_hsplit->get_child_as_control(1)->is_visible()) {
offsets = { p_layout->get_value(p_section, "dock_bottom_split", 0) };
bottom_hsplit->set_split_offsets(offsets);
}
update_docks_menu();
}
@@ -758,11 +794,21 @@ void EditorDockManager::add_vsplit(DockSplitContainer *p_split) {
p_split->connect("dragged", callable_mp(this, &EditorDockManager::_dock_split_dragged));
}
void EditorDockManager::set_hsplit(DockSplitContainer *p_split) {
void EditorDockManager::set_main_vsplit(DockSplitContainer *p_split) {
main_vsplit = p_split;
p_split->connect("dragged", callable_mp(this, &EditorDockManager::_dock_split_dragged));
}
void EditorDockManager::set_main_hsplit(DockSplitContainer *p_split) {
main_hsplit = p_split;
p_split->connect("dragged", callable_mp(this, &EditorDockManager::_dock_split_dragged));
}
void EditorDockManager::set_bottom_hsplit(DockSplitContainer *p_split) {
bottom_hsplit = p_split;
p_split->connect("dragged", callable_mp(this, &EditorDockManager::_dock_split_dragged));
}
void EditorDockManager::register_dock_slot(DockTabContainer *p_tab_container) {
ERR_FAIL_NULL(p_tab_container);
dock_slots[p_tab_container->dock_slot] = p_tab_container;
editor/docks/editor_dock_manager.h
+7 -1
View File
@@ -59,6 +59,8 @@ protected:
virtual void remove_child_notify(Node *p_child) override;
public:
Control *get_child_as_control(int p_index) const;
DockSplitContainer();
};
@@ -89,7 +91,9 @@ private:
// To access splits easily by index.
Vector<DockSplitContainer *> vsplits;
DockSplitContainer *main_vsplit = nullptr;
DockSplitContainer *main_hsplit = nullptr;
DockSplitContainer *bottom_hsplit = nullptr;
DockTabContainer *dock_slots[EditorDock::DOCK_SLOT_MAX];
Vector<WindowWrapper *> dock_windows;
@@ -130,7 +134,9 @@ public:
void set_tab_icon_max_width(int p_max_width);
void add_vsplit(DockSplitContainer *p_split);
void set_hsplit(DockSplitContainer *p_split);
void set_main_vsplit(DockSplitContainer *p_split);
void set_main_hsplit(DockSplitContainer *p_split);
void set_bottom_hsplit(DockSplitContainer *p_split);
void register_dock_slot(DockTabContainer *p_tab_container);
int get_vsplit_count() const;
PopupMenu *get_docks_menu();
editor/editor_node.cpp
+3 -1
View File
@@ -8813,7 +8813,9 @@ EditorNode::EditorNode() {
editor_dock_manager->add_vsplit(right_l_vsplit);
editor_dock_manager->add_vsplit(right_r_vsplit);
editor_dock_manager->set_hsplit(main_hsplit);
editor_dock_manager->set_main_vsplit(main_vsplit);
editor_dock_manager->set_main_hsplit(main_hsplit);
editor_dock_manager->set_bottom_hsplit(bottom_hsplit);
for (DockTabContainer *dock_container : dock_slots) {
editor_dock_manager->register_dock_slot(dock_container);