mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-07-05 09:05:20 +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 5d63ffc596
commit 0829ffe82b
5 changed files with 69 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
imgui_tables.cpp
View File

@@ -1749,11 +1749,11 @@ void ImGui::TableSetupColumn(ImStrv label, ImGuiTableColumnFlags flags, float in
if (!label.empty())
{
char zero_terminator = 0;
ImS16 name_offset = (ImS16)table->ColumnsNames.size();
table->ColumnsNames.append(label.Begin, label.End);
table->ColumnsNames.append(&zero_terminator, &zero_terminator + 1);
name_offset = (ImS16)table->ColumnsNames.size();
table->ColumnsNames.append(label);
table->ColumnsNames.append(ImStrv(&zero_terminator, &zero_terminator + 1));
}
const ImGuiID column_id = (label != NULL && label[0] != 0) ? ImHashStr(label) : 0;
const ImGuiID column_id = label ? ImHashStr(label) : 0;
// When ID changed or a column moved: defer the request until layout where we will process full reconcile.
const int column_idx = table->DeclColumnsCount++;
@@ -3340,8 +3340,8 @@ void ImGui::TableHeader(ImStrv label)
if (!label)
label = "";
ImGuiID id = window->GetID(label);
ImStrv label_for_display(label.Begin, FindRenderedTextEnd(label));
ImVec2 label_size = CalcTextSize(label_for_display, false);
const ImStrv label_for_display(label.Begin, FindRenderedTextEnd(label));
const ImVec2 label_size = CalcTextSize(label_for_display, false);
ImVec2 label_pos = window->DC.CursorPos;
// If we already got a row height, there's use that.