mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2024-12-03 21:59:15 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Docking: Simplify logic of moving tabs between nodes. Amends 0abe7d. (#5515)

Browse Source 
The idea is that in the absence of a tab bar, as new one gets created new tabs will be sorted based on window->DockOrder so this may work but we're not 100% sure.
This commit is contained in:
Rokas Kupstys 2022-08-05 12:49:31 +03:00 committed by ocornut
parent e9f50fb87c
commit ff1567e240
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
imgui.cpp
View File

@ -14749,19 +14749,12 @@ static void ImGui::DockNodeMoveWindows(ImGuiDockNode* dst_node, ImGuiDockNode* s
src_node->TabBar = NULL;
}
for (int n_from_node = 0, n_from_tab_bar = 0; n_from_node < src_node->Windows.Size; n_from_node++, n_from_tab_bar++)
// Tab order is not important here, it is preserved by sorting in DockNodeUpdateTabBar().
for (ImGuiWindow* window : src_node->Windows)
{
// DockNode's TabBar may have non-window Tabs manually appended by user
while (src_tab_bar && src_tab_bar->Tabs[n_from_tab_bar].Window == NULL)
n_from_tab_bar++;
// Using TabBar order (FIXME: Why? Clarify + add tests for it)
if (ImGuiWindow* window = src_tab_bar ? src_tab_bar->Tabs[n_from_tab_bar].Window : src_node->Windows[n_from_node])
{
window->DockNode = NULL;
window->DockIsActive = false;
DockNodeAddWindow(dst_node, window, move_tab_bar ? false : true);
}
window->DockNode = NULL;
window->DockIsActive = false;
DockNodeAddWindow(dst_node, window, !move_tab_bar);
}
src_node->Windows.clear();