|
@@ -420,8 +420,11 @@ bool ImGui::BeginTableEx(const char* name, ImGuiID id, int columns_count, ImG
|
|
|
SetNextWindowScroll(ImVec2(0.0f, 0.0f));
|
|
|
|
|
|
// Create scrolling region (without border and zero window padding)
|
|
|
- ImGuiWindowFlags child_window_flags = (flags & ImGuiTableFlags_ScrollX) ? ImGuiWindowFlags_HorizontalScrollbar : ImGuiWindowFlags_None;
|
|
|
- BeginChildEx(name, instance_id, outer_rect.GetSize(), ImGuiChildFlags_None, child_window_flags);
|
|
|
+ ImGuiChildFlags child_child_flags = (g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasChildFlags) ? g.NextWindowData.ChildFlags : ImGuiChildFlags_None;
|
|
|
+ ImGuiWindowFlags child_window_flags = (g.NextWindowData.HasFlags & ImGuiNextWindowDataFlags_HasWindowFlags) ? g.NextWindowData.WindowFlags : ImGuiWindowFlags_None;
|
|
|
+ if (flags & ImGuiTableFlags_ScrollX)
|
|
|
+ child_window_flags |= ImGuiWindowFlags_HorizontalScrollbar;
|
|
|
+ BeginChildEx(name, instance_id, outer_rect.GetSize(), child_child_flags, child_window_flags);
|
|
|
table->InnerWindow = g.CurrentWindow;
|
|
|
table->WorkRect = table->InnerWindow->WorkRect;
|
|
|
table->OuterRect = table->InnerWindow->Rect();
|