Skip to content

Commit 884d62d

Browse files
committed
ImStr: Support running under test framework.
1 parent 6482932 commit 884d62d

3 files changed

Lines changed: 6 additions & 3 deletions

File tree

imgui.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2905,7 +2905,8 @@ ImGuiID ImGuiWindow::GetID(ImStr str)
29052905
ImGui::KeepAliveID(id);
29062906
#ifdef IMGUI_ENABLE_TEST_ENGINE
29072907
ImGuiContext& g = *GImGui;
2908-
IMGUI_TEST_ENGINE_ID_INFO2(id, ImGuiDataType_String, str, str_end);
2908+
IM_IMSTR_ENSURE_HAS_END(str);
2909+
IMGUI_TEST_ENGINE_ID_INFO2(id, ImGuiDataType_String, str.Begin, str.End);
29092910
#endif
29102911
return id;
29112912
}
@@ -2940,7 +2941,8 @@ ImGuiID ImGuiWindow::GetIDNoKeepAlive(ImStr str)
29402941
ImGuiID id = ImHashStr(str, seed);
29412942
#ifdef IMGUI_ENABLE_TEST_ENGINE
29422943
ImGuiContext& g = *GImGui;
2943-
IMGUI_TEST_ENGINE_ID_INFO2(id, ImGuiDataType_String, str, str_end);
2944+
IM_IMSTR_ENSURE_HAS_END(str);
2945+
IMGUI_TEST_ENGINE_ID_INFO2(id, ImGuiDataType_String, str.Begin, str.End);
29442946
#endif
29452947
return id;
29462948
}

imgui.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ struct ImVec4
235235
#define IM_IMSTR_ENSURE_HAS_END(s) if (s.End == NULL) s.End = s.Begin + strlen(s.Begin)
236236

237237
// String view class.
238+
#define IMGUI_HAS_IMSTR 1
238239
struct ImStr
239240
{
240241
const char* Begin;

imgui_internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2101,7 +2101,7 @@ IMGUI_API void ImFontAtlasBuildMultiplyRectAlpha8(const unsigned ch
21012101

21022102
#ifdef IMGUI_ENABLE_TEST_ENGINE
21032103
extern void ImGuiTestEngineHook_ItemAdd(ImGuiContext* ctx, const ImRect& bb, ImGuiID id);
2104-
extern void ImGuiTestEngineHook_ItemInfo(ImGuiContext* ctx, ImGuiID id, const char* label, ImGuiItemStatusFlags flags);
2104+
extern void ImGuiTestEngineHook_ItemInfo(ImGuiContext* ctx, ImGuiID id, ImStr label, ImGuiItemStatusFlags flags);
21052105
extern void ImGuiTestEngineHook_IdInfo(ImGuiContext* ctx, ImGuiDataType data_type, ImGuiID id, const void* data_id);
21062106
extern void ImGuiTestEngineHook_IdInfo(ImGuiContext* ctx, ImGuiDataType data_type, ImGuiID id, const void* data_id, const void* data_id_end);
21072107
extern void ImGuiTestEngineHook_Log(ImGuiContext* ctx, const char* fmt, ...);

0 commit comments

Comments
 (0)