From ac3bc73c13acc8a2e1ae903d73a8020879ac0c02 Mon Sep 17 00:00:00 2001 From: ocornut Date: Mon, 18 Sep 2023 14:32:23 +0200 Subject: [PATCH] Docking: Fixed node tab-bar not having a filled value for tab-bar which is required for claiming moue wheel ownership in (unenabled) ImGuiTabBarFlags_FittingPolicyScroll mode. Amend 5f30191 --- imgui.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/imgui.cpp b/imgui.cpp index 394b89fe6..d27348553 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -16768,6 +16768,7 @@ static void ImGui::DockNodeUpdateTabBar(ImGuiDockNode* node, ImGuiWindow* host_w DockNodeAddTabBar(node); tab_bar = node->TabBar; } + tab_bar->ID = GetID("#TabBar"); ImGuiID focus_tab_id = 0; node->IsFocused = is_focused; @@ -16846,7 +16847,7 @@ static void ImGui::DockNodeUpdateTabBar(ImGuiDockNode* node, ImGuiWindow* host_w // Begin tab bar ImGuiTabBarFlags tab_bar_flags = ImGuiTabBarFlags_Reorderable | ImGuiTabBarFlags_AutoSelectNewTabs; // | ImGuiTabBarFlags_NoTabListScrollingButtons); - tab_bar_flags |= ImGuiTabBarFlags_SaveSettings | ImGuiTabBarFlags_DockNode; + tab_bar_flags |= ImGuiTabBarFlags_SaveSettings | ImGuiTabBarFlags_DockNode;// | ImGuiTabBarFlags_FittingPolicyScroll; if (!host_window->Collapsed && is_focused) tab_bar_flags |= ImGuiTabBarFlags_IsFocused; BeginTabBarEx(tab_bar, tab_bar_rect, tab_bar_flags, node);