|
@@ -1261,7 +1261,7 @@ void ImGui::TableUpdateLayout(ImGuiTable* table)
|
|
|
if (table->Flags & ImGuiTableFlags_NoClip)
|
|
|
table->DrawSplitter->SetCurrentChannel(inner_window->DrawList, TABLE_DRAW_CHANNEL_NOCLIP);
|
|
|
else
|
|
|
- inner_window->DrawList->PushClipRect(inner_window->InnerClipRect.Min, inner_window->InnerClipRect.Max, false);
|
|
|
+ inner_window->DrawList->PushClipRect(inner_window->InnerClipRect.Min, inner_window->InnerClipRect.Max, false); // FIXME: use table->InnerClipRect?
|
|
|
}
|
|
|
|
|
|
// Process hit-testing on resizing borders. Actual size change will be applied in EndTable()
|
|
@@ -2011,7 +2011,7 @@ void ImGui::TableEndRow(ImGuiTable* table)
|
|
|
{
|
|
|
for (int column_n = 0; column_n < table->ColumnsCount; column_n++)
|
|
|
table->Columns[column_n].NavLayerCurrent = ImGuiNavLayer_Main;
|
|
|
- const float y0 = ImMax(table->RowPosY2 + 1, window->InnerClipRect.Min.y);
|
|
|
+ const float y0 = ImMax(table->RowPosY2 + 1, table->InnerClipRect.Min.y);
|
|
|
table_instance->LastFrozenHeight = y0 - table->OuterRect.Min.y;
|
|
|
|
|
|
if (unfreeze_rows_actual)
|
|
@@ -2020,8 +2020,8 @@ void ImGui::TableEndRow(ImGuiTable* table)
|
|
|
table->IsUnfrozenRows = true;
|
|
|
|
|
|
// BgClipRect starts as table->InnerClipRect, reduce it now and make BgClipRectForDrawCmd == BgClipRect
|
|
|
- table->BgClipRect.Min.y = table->Bg2ClipRectForDrawCmd.Min.y = ImMin(y0, window->InnerClipRect.Max.y);
|
|
|
- table->BgClipRect.Max.y = table->Bg2ClipRectForDrawCmd.Max.y = window->InnerClipRect.Max.y;
|
|
|
+ table->BgClipRect.Min.y = table->Bg2ClipRectForDrawCmd.Min.y = ImMin(y0, table->InnerClipRect.Max.y);
|
|
|
+ table->BgClipRect.Max.y = table->Bg2ClipRectForDrawCmd.Max.y = table->InnerClipRect.Max.y;
|
|
|
table->Bg2DrawChannelCurrent = table->Bg2DrawChannelUnfrozen;
|
|
|
IM_ASSERT(table->Bg2ClipRectForDrawCmd.Min.y <= table->Bg2ClipRectForDrawCmd.Max.y);
|
|
|
|