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

Merge pull request #119590 from YeldhamDev/unify_split_registration

Browse Source 
Unify dock split registration
This commit is contained in:
Thaddeus Crews
2026-06-23 14:49:16 -05:00
parent 3d76d7d15e b5020b7646
commit 10d32f7859
2 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/docks/editor_dock_manager.cpp
+5 -15
View File
@@ -804,26 +804,16 @@ void EditorDockManager::set_tab_icon_max_width(int p_max_width) {
}
}
void EditorDockManager::_register_split(DockSplitContainer **p_var, DockSplitContainer *p_split) {
*p_var = p_split;
p_split->connect("dragged", callable_mp(this, &EditorDockManager::_dock_split_dragged));
}
void EditorDockManager::add_vsplit(DockSplitContainer *p_split) {
vsplits.push_back(p_split);
p_split->connect("dragged", callable_mp(this, &EditorDockManager::_dock_split_dragged));
}
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
+5 -3
View File
@@ -126,6 +126,8 @@ private:
void _queue_update_tab_style(EditorDock *p_dock);
void _update_dirty_dock_tabs();
void _register_split(DockSplitContainer **p_var, DockSplitContainer *p_split);
public:
static EditorDockManager *get_singleton() { return singleton; }
@@ -136,9 +138,9 @@ public:
void set_tab_icon_max_width(int p_max_width);
void add_vsplit(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 set_main_vsplit(DockSplitContainer *p_split) { _register_split(&main_vsplit, p_split); }
void set_main_hsplit(DockSplitContainer *p_split) { _register_split(&main_hsplit, p_split); }
void set_bottom_hsplit(DockSplitContainer *p_split) { _register_split(&bottom_hsplit, p_split); }
void register_dock_slot(DockTabContainer *p_tab_container);
int get_vsplit_count() const;
PopupMenu *get_docks_menu();