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

remove wrapper function

Browse source
This commit is contained in:
DeaTh-G 2025-01-25 17:30:24 +01:00
parent 191515d32b
commit 3460d887d1
3 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
UnleashedRecomp/ui/imgui_utils.cpp
View file

@ -617,11 +617,6 @@ void DrawRubyAnnotatedText(const ImFont* font, float fontSize, float maxWidth, c
} }
} }
void DrawCentredParagraph(const ImFont* font, float fontSize, float maxWidth, const ImVec2& centre, float lineMargin, const char* text, std::function<void(const char*, ImVec2)> drawMethod)
{
DrawRubyAnnotatedText(font, fontSize, maxWidth, centre, lineMargin, text, drawMethod, annotationDrawMethod, true);
}
float Lerp(float a, float b, float t) float Lerp(float a, float b, float t)
{ {
return a + (b - a) * t; return a + (b - a) * t;

3
UnleashedRecomp/ui/imgui_utils.h
View file

@ -26,7 +26,7 @@ struct TextSegment {
}; };
struct Paragraph { struct Paragraph {
bool annotated; bool annotated = false;
std::vector<std::vector<TextSegment>> lines; std::vector<std::vector<TextSegment>> lines;
}; };
@ -68,7 +68,6 @@ std::string RemoveAnnotationFromParagraphLine(const std::vector<TextSegment>& an
ImVec2 MeasureCentredParagraph(const ImFont* font, float fontSize, float lineMargin, std::vector<std::string> lines); ImVec2 MeasureCentredParagraph(const ImFont* font, float fontSize, float lineMargin, std::vector<std::string> lines);
ImVec2 MeasureCentredParagraph(const ImFont* font, float fontSize, float maxWidth, float lineMargin, const char* text); ImVec2 MeasureCentredParagraph(const ImFont* font, float fontSize, float maxWidth, float lineMargin, const char* text);
void DrawRubyAnnotatedText(const ImFont* font, float fontSize, float maxWidth, const ImVec2& pos, float lineMargin, const char* text, std::function<void(const char*, ImVec2)> drawMethod, std::function<void(const char*, float, ImVec2)> annotationDrawMethod, bool isCentred = false); void DrawRubyAnnotatedText(const ImFont* font, float fontSize, float maxWidth, const ImVec2& pos, float lineMargin, const char* text, std::function<void(const char*, ImVec2)> drawMethod, std::function<void(const char*, float, ImVec2)> annotationDrawMethod, bool isCentred = false);
void DrawCentredParagraph(const ImFont* font, float fontSize, float maxWidth, const ImVec2& centre, float lineMargin, const char* text, std::function<void(const char*, ImVec2)> drawMethod);
float Lerp(float a, float b, float t); float Lerp(float a, float b, float t);
float Cubic(float a, float b, float t); float Cubic(float a, float b, float t);
float Hermite(float a, float b, float t); float Hermite(float a, float b, float t);

6
UnleashedRecomp/ui/message_window.cpp
View file

@ -307,7 +307,7 @@ void MessageWindow::Draw()
if (DrawContainer(g_appearTime, centre, { textSize.x / 2 + textMarginX, textSize.y / 2 + textMarginY }, !g_isControlsVisible)) if (DrawContainer(g_appearTime, centre, { textSize.x / 2 + textMarginX, textSize.y / 2 + textMarginY }, !g_isControlsVisible))
{ {
DrawCentredParagraph DrawRubyAnnotatedText
( (
g_fntSeurat, g_fntSeurat,
fontSize, fontSize,
@ -323,7 +323,9 @@ void MessageWindow::Draw()
[=](const char* str, float size, ImVec2 pos) [=](const char* str, float size, ImVec2 pos)
{ {
DrawTextWithShadow(g_fntSeurat, size, pos, IM_COL32(255, 255, 255, 255), str); DrawTextWithShadow(g_fntSeurat, size, pos, IM_COL32(255, 255, 255, 255), str);
} },
true
); );
drawList->PopClipRect(); drawList->PopClipRect();