thirdpartymirrors/UnleashedRecomp
1
0
Fork 0
mirror of https://github.com/hedge-dev/UnleashedRecomp.git synced 2026-04-27 21:01:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve annotated text line spacing

Browse source
This commit is contained in:
DeaTh-G 2025-01-19 01:09:19 +01:00
parent 967996acf1
commit 7b97382f49
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
UnleashedRecomp/ui/imgui_utils.cpp
View file

@ -404,9 +404,16 @@ ImVec2 MeasureCentredParagraph(const ImFont* font, float fontSize, float lineMar
/////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////
auto textSize = font->CalcTextSizeA(fontSize, FLT_MAX, 0, annotationRemovedLine.c_str()); auto textSize = font->CalcTextSizeA(fontSize, FLT_MAX, 0, annotationRemovedLine.c_str());
auto annotationSize = font->CalcTextSizeA(fontSize * 0.6f, FLT_MAX, 0, "");
x = std::max(x, textSize.x); x = std::max(x, textSize.x);
y += textSize.y + Scale(lineMargin); y += textSize.y + Scale(lineMargin);
// TODO: This will case the text to account for annotation even if there's none included ever. This should not be the case.
if (&str != &lines.back())
{
y += annotationSize.y;
}
} }
return { x, y }; return { x, y };
@ -460,6 +467,7 @@ void DrawCentredParagraph(const ImFont* font, float fontSize, float maxWidth, co
} }
auto textSize = font->CalcTextSizeA(fontSize, FLT_MAX, 0, annotationRemovedLine.c_str()); auto textSize = font->CalcTextSizeA(fontSize, FLT_MAX, 0, annotationRemovedLine.c_str());
auto annotationSize = font->CalcTextSizeA(fontSize, FLT_MAX, 0, "");
auto textX = annotationRemovedLine.starts_with("- ") auto textX = annotationRemovedLine.starts_with("- ")
? centre.x - paragraphSize.x / 2 ? centre.x - paragraphSize.x / 2
@ -468,11 +476,12 @@ void DrawCentredParagraph(const ImFont* font, float fontSize, float maxWidth, co
for (const auto& segment : segments) for (const auto& segment : segments)
{ {
textSize = font->CalcTextSizeA(fontSize, FLT_MAX, 0, segment.text.c_str()); textSize = font->CalcTextSizeA(fontSize, FLT_MAX, 0, segment.text.c_str());
auto textY = centre.y - paragraphSize.y / 2 + offsetY; auto textY = centre.y - paragraphSize.y / 2 + offsetY;
if (segment.annotated) if (segment.annotated)
{ {
auto annotationSize = font->CalcTextSizeA(fontSize * 0.6f, FLT_MAX, 0, segment.annotation.c_str()); annotationSize = font->CalcTextSizeA(fontSize * 0.6f, FLT_MAX, 0, segment.annotation.c_str());
float annotationX = textX + (textSize.x - annotationSize.x) / 2.0f; float annotationX = textX + (textSize.x - annotationSize.x) / 2.0f;
@ -483,7 +492,8 @@ void DrawCentredParagraph(const ImFont* font, float fontSize, float maxWidth, co
textX += textSize.x; textX += textSize.x;
} }
offsetY += textSize.y + Scale(lineMargin); // TODO: This will case the text to account for annotation even if there's none included ever. This should not be the case.
offsetY += textSize.y + annotationSize.y + Scale(lineMargin);
} }
} }