|
@@ -964,7 +964,7 @@ void ImGui::TableUpdateLayout(ImGuiTable* table)
|
|
|
const int column_n = table->DisplayOrderToIndex[order_n];
|
|
|
ImGuiTableColumn* column = &table->Columns[column_n];
|
|
|
|
|
|
- column->NavLayerCurrent = (ImS8)((table->FreezeRowsCount > 0 || column_n < table->FreezeColumnsCount) ? ImGuiNavLayer_Menu : ImGuiNavLayer_Main);
|
|
|
+ column->NavLayerCurrent = (ImS8)(table->FreezeRowsCount > 0 ? ImGuiNavLayer_Menu : ImGuiNavLayer_Main); // Use Count NOT request so Header line changes layer when frozen
|
|
|
|
|
|
if (offset_x_frozen && table->FreezeColumnsCount == visible_n)
|
|
|
{
|
|
@@ -1846,10 +1846,7 @@ void ImGui::TableEndRow(ImGuiTable* table)
|
|
|
// get the new cursor position.
|
|
|
if (unfreeze_rows_request)
|
|
|
for (int column_n = 0; column_n < table->ColumnsCount; column_n++)
|
|
|
- {
|
|
|
- ImGuiTableColumn* column = &table->Columns[column_n];
|
|
|
- column->NavLayerCurrent = (ImS8)((column_n < table->FreezeColumnsCount) ? ImGuiNavLayer_Menu : ImGuiNavLayer_Main);
|
|
|
- }
|
|
|
+ table->Columns[column_n].NavLayerCurrent = ImGuiNavLayer_Main;
|
|
|
if (unfreeze_rows_actual)
|
|
|
{
|
|
|
IM_ASSERT(table->IsUnfrozenRows == false);
|