mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-08-17 04:42:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

ImStrv: moved double char* function signatures under #ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS blocks + fixed various compiles errors/warnings.

Browse Source
This commit is contained in:
ocornut
2021-03-31 15:06:32 +02:00
committed by ocornut
parent 9e96dc0bb2
commit c55ff79b96
5 changed files with 67 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
imgui_tables.cpp
View File

@@ -1686,8 +1686,8 @@ void ImGui::TableSetupColumn(ImStrv label, ImGuiTableColumnFlags flags, float in
{
char zero_terminator = 0;
column->NameOffset = (ImS16)table->ColumnsNames.size();
table->ColumnsNames.append(label.Begin, label.End);
table->ColumnsNames.append(&zero_terminator, &zero_terminator + 1);
table->ColumnsNames.append(label);
table->ColumnsNames.append(ImStrv(&zero_terminator, &zero_terminator + 1));
}
}
@@ -3179,7 +3179,7 @@ void ImGui::TableHeader(ImStrv label)
label = "";
ImGuiID id = window->GetID(label);
label.End = FindRenderedTextEnd(label);
ImVec2 label_size = CalcTextSize(label.Begin, label.End, true);
ImVec2 label_size = CalcTextSize(label, true);
ImVec2 label_pos = window->DC.CursorPos;
// If we already got a row height, there's use that.