From 4eb4e0cddbcd608d3b2ce72e7f6f1fe77fc3008b Mon Sep 17 00:00:00 2001 From: DeaTh-G Date: Tue, 4 Feb 2025 17:01:14 +0100 Subject: [PATCH] remove calculating the space for the next annotation after the last line --- UnleashedRecomp/ui/imgui_utils.cpp | 2 +- UnleashedRecomp/ui/message_window.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/UnleashedRecomp/ui/imgui_utils.cpp b/UnleashedRecomp/ui/imgui_utils.cpp index 066f53a2..9f7e2766 100644 --- a/UnleashedRecomp/ui/imgui_utils.cpp +++ b/UnleashedRecomp/ui/imgui_utils.cpp @@ -624,7 +624,7 @@ ImVec2 MeasureCentredParagraph(const ImFont* font, float fontSize, float lineMar x = std::max(x, textSize.x); y += textSize.y + Scale(lineMargin); - if (paragraph.annotated) + if (paragraph.annotated && i != (annotationRemovedLines.size() - 1)) y += fontSize * ANNOTATION_FONT_SIZE_MODIFIER; } diff --git a/UnleashedRecomp/ui/message_window.cpp b/UnleashedRecomp/ui/message_window.cpp index 8e562c77..fe05b8b3 100644 --- a/UnleashedRecomp/ui/message_window.cpp +++ b/UnleashedRecomp/ui/message_window.cpp @@ -292,9 +292,9 @@ void MessageWindow::Draw() if (Config::Language == ELanguage::Japanese) { textMarginX -= Scale(2.5f); - textMarginY -= Scale(7.5f); + textMarginY -= Scale(2.0f); - textY += Scale(lines.size() % 2 == 0 ? 8.5f : 15.5f); + textY += Scale(lines.size() % 2 == 0 ? 1.5f : 8.0f); } bool isController = hid::IsInputDeviceController();