mirror of
https://github.com/ocornut/imgui.git
synced 2026-01-11 00:04:24 +00:00
Merge 2ff8366d40 into 396b33d0d0
This commit is contained in:
commit
4cbeecdbff
1 changed files with 1 additions and 1 deletions
|
|
@ -19235,7 +19235,7 @@ static bool IsDockNodeTitleBarHighlighted(ImGuiDockNode* node, ImGuiDockNode* ro
|
||||||
{
|
{
|
||||||
// FIXME: This could all be backed in RootWindowForTitleBarHighlight? Probably need to reorganize for both dock nodes + other RootWindowForTitleBarHighlight users (not-node)
|
// FIXME: This could all be backed in RootWindowForTitleBarHighlight? Probably need to reorganize for both dock nodes + other RootWindowForTitleBarHighlight users (not-node)
|
||||||
ImGuiWindow* parent_window = g.NavWindow->RootWindow;
|
ImGuiWindow* parent_window = g.NavWindow->RootWindow;
|
||||||
while (parent_window->Flags & ImGuiWindowFlags_ChildMenu)
|
while (parent_window->Flags & (ImGuiWindowFlags_ChildMenu|ImGuiWindowFlags_Popup) && !(parent_window->Flags & ImGuiWindowFlags_Modal))
|
||||||
parent_window = parent_window->ParentWindow->RootWindow;
|
parent_window = parent_window->ParentWindow->RootWindow;
|
||||||
ImGuiDockNode* start_parent_node = parent_window->DockNodeAsHost ? parent_window->DockNodeAsHost : parent_window->DockNode;
|
ImGuiDockNode* start_parent_node = parent_window->DockNodeAsHost ? parent_window->DockNodeAsHost : parent_window->DockNode;
|
||||||
for (ImGuiDockNode* parent_node = start_parent_node; parent_node != NULL; parent_node = parent_node->HostWindow ? parent_node->HostWindow->RootWindow->DockNode : NULL)
|
for (ImGuiDockNode* parent_node = start_parent_node; parent_node != NULL; parent_node = parent_node->HostWindow ? parent_node->HostWindow->RootWindow->DockNode : NULL)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue