|
@@ -15827,7 +15827,7 @@ static void SameLineOrWrap(const ImVec2& size)
|
|
ImGuiContext& g = *GImGui;
|
|
ImGuiContext& g = *GImGui;
|
|
ImGuiWindow* window = g.CurrentWindow;
|
|
ImGuiWindow* window = g.CurrentWindow;
|
|
ImVec2 pos(window->DC.CursorPosPrevLine.x + g.Style.ItemSpacing.x, window->DC.CursorPosPrevLine.y);
|
|
ImVec2 pos(window->DC.CursorPosPrevLine.x + g.Style.ItemSpacing.x, window->DC.CursorPosPrevLine.y);
|
|
- if (window->ClipRect.Contains(ImRect(pos, pos + size)))
|
|
|
|
|
|
+ if (window->WorkRect.Contains(ImRect(pos, pos + size)))
|
|
ImGui::SameLine();
|
|
ImGui::SameLine();
|
|
}
|
|
}
|
|
|
|
|
|
@@ -15921,7 +15921,7 @@ void ImGui::DebugTextUnformattedWithLocateItem(const char* line_begin, const cha
|
|
for (const char* p = line_begin; p <= line_end - 10; p++)
|
|
for (const char* p = line_begin; p <= line_end - 10; p++)
|
|
{
|
|
{
|
|
ImGuiID id = 0;
|
|
ImGuiID id = 0;
|
|
- if (p[0] != '0' || (p[1] != 'x' && p[1] != 'X') || sscanf(p + 2, "%X", &id) != 1)
|
|
|
|
|
|
+ if (p[0] != '0' || (p[1] != 'x' && p[1] != 'X') || sscanf(p + 2, "%X", &id) != 1 || ImCharIsXdigitA(p[10]))
|
|
continue;
|
|
continue;
|
|
ImVec2 p0 = CalcTextSize(line_begin, p);
|
|
ImVec2 p0 = CalcTextSize(line_begin, p);
|
|
ImVec2 p1 = CalcTextSize(p, p + 10);
|
|
ImVec2 p1 = CalcTextSize(p, p + 10);
|