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

Allow room for less padding if the text can't fit to the fixed width.

Browse source
This commit is contained in:
Skyth 2025-02-12 14:24:06 +03:00
parent dd775b8497
commit 8ec408db9c
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
UnleashedRecomp/ui/options_menu.cpp
View file

@ -487,21 +487,20 @@ static bool DrawCategories()
float size = Scale(32.0f); float size = Scale(32.0f);
ImVec2 textSizes[g_categoryCount]; ImVec2 textSizes[g_categoryCount];
float textSquashRatio[g_categoryCount]; float textSquashRatio[g_categoryCount];
float tabWidthSum = 0.0f;
float clipRectWidth = clipRectMax.x - clipRectMin.x; float clipRectWidth = clipRectMax.x - clipRectMin.x;
float categoryTextPadding = textPadding * 2.0f * g_categoryCount; float categoryTextPadding = textPadding * 2.0f * g_categoryCount;
float categoryTabPadding = tabPadding * (g_categoryCount - 1); float categoryTabPadding = tabPadding * (g_categoryCount - 1);
float maxTextWidth = (clipRectWidth - categoryTextPadding - categoryTabPadding) / float(g_categoryCount); float maxTabWidth = (clipRectWidth - categoryTabPadding) / float(g_categoryCount);
float maxTextWidth = maxTabWidth - (NARROW_PADDING_GRID_COUNT * gridSize * 2.0f);
float tabWidthSum = categoryTabPadding;
for (size_t i = 0; i < g_categoryCount; i++) for (size_t i = 0; i < g_categoryCount; i++)
{ {
textSizes[i] = g_dfsogeistdFont->CalcTextSizeA(size, FLT_MAX, 0.0f, GetCategory(i).c_str()); textSizes[i] = g_dfsogeistdFont->CalcTextSizeA(size, FLT_MAX, 0.0f, GetCategory(i).c_str());
textSquashRatio[i] = std::min(maxTextWidth / textSizes[i].x, 1.0f); textSquashRatio[i] = std::min(maxTextWidth / textSizes[i].x, 1.0f);
tabWidthSum += textSizes[i].x * textSquashRatio[i]; tabWidthSum += std::min(textSizes[i].x + textPadding * 2.0f, maxTabWidth);
} }
tabWidthSum += categoryTextPadding;
tabWidthSum += categoryTabPadding;
float tabHeight = gridSize * 4.0f; float tabHeight = gridSize * 4.0f;
float xOffset = (clipRectWidth - tabWidthSum) / 2.0f; float xOffset = (clipRectWidth - tabWidthSum) / 2.0f;
xOffset -= (1.0 - motion) * gridSize * 4.0; xOffset -= (1.0 - motion) * gridSize * 4.0;
@ -512,7 +511,7 @@ static bool DrawCategories()
{ {
ImVec2 min = { clipRectMin.x + xOffset, clipRectMin.y }; ImVec2 min = { clipRectMin.x + xOffset, clipRectMin.y };
xOffset += textSizes[i].x * textSquashRatio[i] + textPadding * 2.0f; xOffset += std::min(textSizes[i].x + textPadding * 2.0f, maxTabWidth);
ImVec2 max = { clipRectMin.x + xOffset, clipRectMin.y + tabHeight }; ImVec2 max = { clipRectMin.x + xOffset, clipRectMin.y + tabHeight };
xOffset += tabPadding; xOffset += tabPadding;
@ -578,7 +577,7 @@ static bool DrawCategories()
SetShaderModifier(IMGUI_SHADER_MODIFIER_NONE); SetShaderModifier(IMGUI_SHADER_MODIFIER_NONE);
} }
min.x += textPadding; min.x += ((max.x - min.x) - (textSizes[i].x * textSquashRatio[i])) / 2.0f;
// Store to draw again later, otherwise the tab background gets drawn on top of text during the animation. // Store to draw again later, otherwise the tab background gets drawn on top of text during the animation.
minVec[i] = min; minVec[i] = min;