Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-15 09:27:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Docking: Reorganizing some of the tab-bar selection and window focus related code.

Browse Source
This commit is contained in:
omar 2018-09-30 22:57:04 +02:00
parent 9cfc40c2cc
commit ed3c015f4e
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
imgui.cpp
View File

@ -5700,6 +5700,10 @@ void ImGui::FocusWindow(ImGuiWindow* window)
if (!window) if (!window)
return; return;
// Select in dock node
if (window->DockNode && window->DockNode->TabBar)
window->DockNode->TabBar->SelectedTabId = window->ID;
// Move the root window to the top of the pile // Move the root window to the top of the pile
if (window->RootWindow) if (window->RootWindow)
window = window->RootWindow; window = window->RootWindow;
@ -10122,8 +10126,8 @@ void ImGui::DockContextProcessDock(ImGuiContext* ctx, ImGuiDockRequest* req)
} }
// Update selection immediately // Update selection immediately
if (target_node->TabBar) if (ImGuiTabBar* tab_bar = target_node->TabBar)
target_node->TabBar->NextSelectedTabId = next_selected_id; tab_bar->NextSelectedTabId = tab_bar->WantFocusTabId = next_selected_id;
MarkIniSettingsDirty(); MarkIniSettingsDirty();
} }
@ -10492,6 +10496,8 @@ static void ImGui::DockNodeUpdate(ImGuiDockNode* node)
ImGuiDockNode* first_node_with_windows = NULL; ImGuiDockNode* first_node_with_windows = NULL;
DockNodeUpdateFindOnlyNodeWithWindowsRec(node, &count, &first_node_with_windows); DockNodeUpdateFindOnlyNodeWithWindowsRec(node, &count, &first_node_with_windows);
node->OnlyNodeWithWindows = (count == 1 ? first_node_with_windows : NULL); node->OnlyNodeWithWindows = (count == 1 ? first_node_with_windows : NULL);
if (node->LastFocusedNodeID == 0 && first_node_with_windows != NULL)
node->LastFocusedNodeID = first_node_with_windows->ID;
// Copy the dock family from of our window so it can be used for proper dock filtering. // Copy the dock family from of our window so it can be used for proper dock filtering.
// When node has mixed windows, prioritize the family with the most constraint (CompatibleWithNeutral = false) as the reference to copy. // When node has mixed windows, prioritize the family with the most constraint (CompatibleWithNeutral = false) as the reference to copy.
@ -10586,6 +10592,7 @@ static void ImGui::DockNodeUpdate(ImGuiDockNode* node)
char window_label[20]; char window_label[20];
DockNodeGetHostWindowTitle(node, window_label, IM_ARRAYSIZE(window_label)); DockNodeGetHostWindowTitle(node, window_label, IM_ARRAYSIZE(window_label));
ImGuiWindowFlags window_flags = ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse | ImGuiWindowFlags_DockNodeHost; ImGuiWindowFlags window_flags = ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse | ImGuiWindowFlags_DockNodeHost;
//window_flags |= ImGuiWindowFlags_NoFocusOnAppearing;
window_flags |= ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoNavFocus; window_flags |= ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoNavFocus;
window_flags |= ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse; window_flags |= ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse;
@ -10612,10 +10619,14 @@ static void ImGui::DockNodeUpdate(ImGuiDockNode* node)
// Update active node (the one whose title bar is highlight) within a node tree // Update active node (the one whose title bar is highlight) within a node tree
if (node->IsSplitNode()) if (node->IsSplitNode())
IM_ASSERT(node->TabBar == NULL); IM_ASSERT(node->TabBar == NULL);
if (!node->IsSplitNode()) if (node->IsRootNode())
node->LastFocusedNodeID = node->ID; // This also ensure on our creation frame we will receive the title screen highlight {
else if (g.NavWindow && g.NavWindow->RootWindowDockStop->DockNode && g.NavWindow->RootWindowDockStop->ParentWindow == host_window) //if (!node->IsSplitNode())
node->LastFocusedNodeID = g.NavWindow->RootWindowDockStop->DockNode->ID; // node->LastFocusedNodeID = node->ID; // This also ensure on our creation frame we will receive the title screen highlight
//else
if (g.NavWindow && g.NavWindow->RootWindowDockStop->DockNode && g.NavWindow->RootWindowDockStop->ParentWindow == host_window)
node->LastFocusedNodeID = g.NavWindow->RootWindowDockStop->DockNode->ID;
}
// Draw and populate Tab Bar // Draw and populate Tab Bar
if (host_window && node->Windows.Size > 0) if (host_window && node->Windows.Size > 0)
@ -10718,7 +10729,7 @@ static void ImGui::DockNodeUpdateTabBar(ImGuiDockNode* node, ImGuiWindow* host_w
ImGuiTabItem* tab = &tab_bar->Tabs[tab_n]; ImGuiTabItem* tab = &tab_bar->Tabs[tab_n];
IM_ASSERT(tab->Window != NULL); IM_ASSERT(tab->Window != NULL);
if (Selectable(tab->Window->Name, tab->ID == tab_bar->SelectedTabId)) if (Selectable(tab->Window->Name, tab->ID == tab_bar->SelectedTabId))
tab_bar->NextSelectedTabId = tab->ID; tab_bar->NextSelectedTabId = tab_bar->WantFocusTabId = tab->ID;
SameLine(); SameLine();
Text(" "); Text(" ");
} }
@ -10740,16 +10751,6 @@ static void ImGui::DockNodeUpdateTabBar(ImGuiDockNode* node, ImGuiWindow* host_w
if (IsItemActive()) if (IsItemActive())
focus_tab_id = tab_bar->SelectedTabId; focus_tab_id = tab_bar->SelectedTabId;
// Create tab bar and setup initial selection
if (g.NavWindow && g.NavWindow->RootWindowDockStop->DockNode == node)
{
//printf("[%05d] tab bar create focus '%s'\n", g.FrameCount, window_focused->Name);
ImGuiID focused_id = g.NavWindow->RootWindowDockStop->ID;
if (focused_id != tab_bar->SelectedTabId)
if (focused_id != tab_bar->NextSelectedTabId || (tab_bar->NextSelectedTabId == 0 && focused_id != tab_bar->SelectedTabId))
tab_bar->SelectedTabId = focused_id;
}
// Submit new tabs // Submit new tabs
const int tabs_count_old = tab_bar->Tabs.Size; const int tabs_count_old = tab_bar->Tabs.Size;
for (int window_n = 0; window_n < node->Windows.Size; window_n++) for (int window_n = 0; window_n < node->Windows.Size; window_n++)
@ -10846,8 +10847,7 @@ static void ImGui::DockNodeUpdateTabBar(ImGuiDockNode* node, ImGuiWindow* host_w
} }
// When clicked on a tab we requested focus to the docked child // When clicked on a tab we requested focus to the docked child
// Since we are processing this on the frame after the click, make sure focus hasn't already been taken by someone else. if (tab_bar->WantFocusTabId)
if (node->TabBar->WantFocusTabId && g.NavWindow && g.NavWindow->RootWindow == host_window)
focus_tab_id = tab_bar->WantFocusTabId; focus_tab_id = tab_bar->WantFocusTabId;
// When clicking on the title bar outside of tabs, we still focus the selected tab for that node // When clicking on the title bar outside of tabs, we still focus the selected tab for that node
@ -10858,6 +10858,10 @@ static void ImGui::DockNodeUpdateTabBar(ImGuiDockNode* node, ImGuiWindow* host_w
StartMouseMovingWindow(tab->Window); StartMouseMovingWindow(tab->Window);
} }
// Forward focus from host node to selected window
if (is_focused && g.NavWindow == host_window && !g.NavWindowingTarget)
focus_tab_id = tab_bar->SelectedTabId;
// Apply navigation focus // Apply navigation focus
if (focus_tab_id != 0) if (focus_tab_id != 0)
if (ImGuiTabItem* tab = TabBarFindTabByID(tab_bar, focus_tab_id)) if (ImGuiTabItem* tab = TabBarFindTabByID(tab_bar, focus_tab_id))
@ -12022,7 +12026,7 @@ void ImGui::BeginAsDockableDragDropTarget(ImGuiWindow* window)
ImGuiDockNode* target_node = NULL; ImGuiDockNode* target_node = NULL;
if (window->DockNodeAsHost) if (window->DockNodeAsHost)
target_node = DockNodeTreeFindNodeByPos(window->DockNodeAsHost, g.IO.MousePos); target_node = DockNodeTreeFindNodeByPos(window->DockNodeAsHost, g.IO.MousePos);
else if (window->DockNode && window->DockIsActive) else if (window->DockNode) // && window->DockIsActive)
target_node = window->DockNode; target_node = window->DockNode;
else else
allow_null_target_node = true; // Dock into a regular window allow_null_target_node = true; // Dock into a regular window

4
imgui_widgets.cpp
View File

@ -5934,7 +5934,7 @@ static void ImGui::TabBarLayout(ImGuiTabBar* tab_bar)
tab_bar->WantFocusTabId = 0; tab_bar->WantFocusTabId = 0;
if (tab_bar->NextSelectedTabId) if (tab_bar->NextSelectedTabId)
{ {
tab_bar->SelectedTabId = tab_bar->WantFocusTabId = tab_bar->NextSelectedTabId; tab_bar->SelectedTabId = tab_bar->NextSelectedTabId;
tab_bar->NextSelectedTabId = 0; tab_bar->NextSelectedTabId = 0;
scroll_track_selected_tab_id = tab_bar->SelectedTabId; scroll_track_selected_tab_id = tab_bar->SelectedTabId;
} }
@ -6419,7 +6419,7 @@ bool ImGui::TabItemEx(ImGuiTabBar* tab_bar, const char* label, bool* p_open,
bool pressed = ButtonBehavior(bb, id, &hovered, &held, button_flags); bool pressed = ButtonBehavior(bb, id, &hovered, &held, button_flags);
hovered |= (g.HoveredId == id); hovered |= (g.HoveredId == id);
if (pressed || ((flags & ImGuiTabItemFlags_SetSelected) && !tab_contents_visible)) // SetSelected can only be passed on explicit tab bar, so we don't need to set WantFocusTabId if (pressed || ((flags & ImGuiTabItemFlags_SetSelected) && !tab_contents_visible)) // SetSelected can only be passed on explicit tab bar, so we don't need to set WantFocusTabId
tab_bar->NextSelectedTabId = id; tab_bar->NextSelectedTabId = tab_bar->WantFocusTabId = id;
// Allow the close button to overlap unless we are dragging (in which case we don't want any overlapping tabs to be hovered) // Allow the close button to overlap unless we are dragging (in which case we don't want any overlapping tabs to be hovered)
if (!held) if (!held)