Skip to content

Commit 4250d35

Browse files
committed
Merge pull request godotengine#119590 from YeldhamDev/unify_split_registration
Unify dock split registration
2 parents dd8c247 + a87f420 commit 4250d35

2 files changed

Lines changed: 9 additions & 17 deletions

File tree

editor/docks/editor_dock_manager.cpp

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -804,23 +804,13 @@ void EditorDockManager::set_tab_icon_max_width(int p_max_width) {
804804
}
805805
}
806806

807-
void EditorDockManager::add_vsplit(DockSplitContainer *p_split) {
808-
vsplits.push_back(p_split);
809-
p_split->connect("dragged", callable_mp(this, &EditorDockManager::_dock_split_dragged));
810-
}
811-
812-
void EditorDockManager::set_main_vsplit(DockSplitContainer *p_split) {
813-
main_vsplit = p_split;
807+
void EditorDockManager::_register_split(DockSplitContainer **p_var, DockSplitContainer *p_split) {
808+
*p_var = p_split;
814809
p_split->connect("dragged", callable_mp(this, &EditorDockManager::_dock_split_dragged));
815810
}
816811

817-
void EditorDockManager::set_main_hsplit(DockSplitContainer *p_split) {
818-
main_hsplit = p_split;
819-
p_split->connect("dragged", callable_mp(this, &EditorDockManager::_dock_split_dragged));
820-
}
821-
822-
void EditorDockManager::set_bottom_hsplit(DockSplitContainer *p_split) {
823-
bottom_hsplit = p_split;
812+
void EditorDockManager::add_vsplit(DockSplitContainer *p_split) {
813+
vsplits.push_back(p_split);
824814
p_split->connect("dragged", callable_mp(this, &EditorDockManager::_dock_split_dragged));
825815
}
826816

editor/docks/editor_dock_manager.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ class EditorDockManager : public Object {
126126
void _queue_update_tab_style(EditorDock *p_dock);
127127
void _update_dirty_dock_tabs();
128128

129+
void _register_split(DockSplitContainer **p_var, DockSplitContainer *p_split);
130+
129131
public:
130132
static EditorDockManager *get_singleton() { return singleton; }
131133

@@ -136,9 +138,9 @@ class EditorDockManager : public Object {
136138
void set_tab_icon_max_width(int p_max_width);
137139

138140
void add_vsplit(DockSplitContainer *p_split);
139-
void set_main_vsplit(DockSplitContainer *p_split);
140-
void set_main_hsplit(DockSplitContainer *p_split);
141-
void set_bottom_hsplit(DockSplitContainer *p_split);
141+
void set_main_vsplit(DockSplitContainer *p_split) { _register_split(&main_vsplit, p_split); }
142+
void set_main_hsplit(DockSplitContainer *p_split) { _register_split(&main_hsplit, p_split); }
143+
void set_bottom_hsplit(DockSplitContainer *p_split) { _register_split(&bottom_hsplit, p_split); }
142144
void register_dock_slot(DockTabContainer *p_tab_container);
143145
int get_vsplit_count() const;
144146
PopupMenu *get_docks_menu();

0 commit comments

Comments
 (0)