diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index 4e126395d..ceba9c0a7 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -180,6 +180,8 @@ Other Changes: nesting a tooltip in a disabled block. (#9180, #7640) [@RegimantasSimkus] - Added GetItemFlags() in public API for consistency and to expose generic flags of last submitted item. (#9127) +- Log/Capture: fixed erroneously injecting extra carriage returns in output + buffer when ItemSpacing.y > FramePadding.y + 1. - Images: - Added style.ImageRounding, ImGuiStyleVar_ImageRounding to configure rounding of Image() widgets. (#2942, #845) diff --git a/imgui.cpp b/imgui.cpp index 6894b5dcf..7f8710cd9 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -15071,7 +15071,7 @@ void ImGui::LogRenderedText(const ImVec2* ref_pos, const char* text, const char* if (!text_end) text_end = FindRenderedTextEnd(text, text_end); - const bool log_new_line = ref_pos && (ref_pos->y > g.LogLinePosY + g.Style.FramePadding.y + 1); + const bool log_new_line = ref_pos && (ref_pos->y > g.LogLinePosY + ImMax(g.Style.FramePadding.y, g.Style.ItemSpacing.y) + 1); if (ref_pos) g.LogLinePosY = ref_pos->y; if (log_new_line)