Merge kbm-ig into kbm

This commit is contained in:
2026-09-14 16:26:34 -07:00
1371 changed files with 260387 additions and 267883 deletions
@@ -64,16 +64,19 @@ F64 UIComponent_Tooltips::getSafeZoneHalfWidth()
float safeWidth = 0.0f;
#ifndef __PSVITA__
// 85% safezone for tooltips in either SD mode
if( !RenderManager.IsHiDef() )
if (!(width >= 960.0f && width < 1280.0f))
{
// 85% safezone
safeWidth = m_movieWidth * (0.15f / 2);
}
else
{
// 90% safezone
safeWidth = width * (0.1f / 2);
// 85% safezone for tooltips in either SD mode
if( !RenderManager.IsHiDef() )
{
// 85% safezone
safeWidth = m_movieWidth * (0.15f / 2);
}
else
{
// 90% safezone
safeWidth = width * (0.1f / 2);
}
}
#endif
return safeWidth;
@@ -181,7 +184,7 @@ void UIComponent_Tooltips::tick()
bool layoutChanges = false;
for (int i = 0; i < eToolTipNumButtons; i++)
{
if ( !ui.IsReloadingSkin() && m_tooltipValues[i].show && m_tooltipValues[i].label.needsUpdating() )
if ( !ui.IsReloadingSkins() && m_tooltipValues[i].show && m_tooltipValues[i].label.needsUpdating() )
{
layoutChanges = true;
_SetTooltip(i, m_tooltipValues[i].label, m_tooltipValues[i].show, true);