Skip to content

Commit aa30d59

Browse files
committed
improve server browser scoreboard
1 parent b57de63 commit aa30d59

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

src/game/client/components/menus_browser.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1965,6 +1965,7 @@ void CMenus::RenderDetailScoreboard(CUIRect View, const CServerInfo *pInfo, int
19651965
const float RowWidth = (RowCount == 0) ? View.w : (View.w * 0.25f);
19661966
const float FontSize = Config()->m_UiWideview ? 8.0f : 7.0f;
19671967
const vec4 HighlightColor = vec4(TextHighlightColor.r, TextHighlightColor.g, TextHighlightColor.b, TextColor.a);
1968+
const vec4 GreyTextColor = vec4(TextColor.r, TextColor.g, TextColor.b, TextColor.a * 0.6f);
19681969
float LineHeight = 20.0f;
19691970

19701971
static CScrollRegion s_ScrollRegion;
@@ -2037,24 +2038,23 @@ void CMenus::RenderDetailScoreboard(CUIRect View, const CServerInfo *pInfo, int
20372038
DoIcon(IMAGE_BROWSEICONS, SPRITE_BROWSE_HEART_A, &Icon);
20382039

20392040
Name.VSplitLeft(2.0f, 0, &Name);
2040-
Name.VSplitLeft(25.0f, &Score, &Name);
2041+
Name.VSplitLeft(40.0f, &Score, &Name);
20412042
Name.VSplitRight(2 * (Name.h - 8.0f), &Name, &Flag);
20422043
Name.HSplitTop(LineHeight * 0.5f, &Name, &Clan);
20432044

20442045
// score
20452046
if(!(pInfo->m_aClients[i].m_PlayerType & CServerInfo::CClient::PLAYERFLAG_SPEC))
20462047
{
2047-
Score.y += (Score.h - FontSize / CUI::ms_FontmodHeight) / 2.0f;
20482048
char aTemp[16];
20492049
FormatScore(aTemp, sizeof(aTemp), pInfo->m_Flags & IServerBrowser::FLAG_TIMESCORE, &pInfo->m_aClients[i]);
2050-
UI()->DoLabel(&Score, aTemp, FontSize, TEXTALIGN_LEFT);
2050+
UI()->DoLabel(&Score, aTemp, FontSize, TEXTALIGN_MC);
20512051
}
20522052

20532053
// name
20542054
UI()->DoLabelHighlighted(&Name, pInfo->m_aClients[i].m_aName, Config()->m_BrFilterString, FontSize, TextColor, HighlightColor);
20552055

20562056
// clan
2057-
UI()->DoLabelHighlighted(&Clan, pInfo->m_aClients[i].m_aClan, Config()->m_BrFilterString, FontSize, TextColor, HighlightColor);
2057+
UI()->DoLabelHighlighted(&Clan, pInfo->m_aClients[i].m_aClan, Config()->m_BrFilterString, FontSize, GreyTextColor, HighlightColor);
20582058

20592059
// flag
20602060
Flag.HMargin(4.0f, &Flag);

src/game/client/ui.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,7 @@ void CUI::DoLabelHighlighted(const CUIRect *pRect, const char *pText, const char
390390
s_Cursor.m_MaxWidth = pRect->w;
391391
ApplyCursorAlign(&s_Cursor, pRect, Align);
392392

393+
vec4 OldColor = TextRender()->GetColor();
393394
TextRender()->TextColor(TextColor);
394395
const char *pMatch = pHighlighted && pHighlighted[0] ? str_find_nocase(pText, pHighlighted) : 0;
395396
if(pMatch)
@@ -405,6 +406,7 @@ void CUI::DoLabelHighlighted(const CUIRect *pRect, const char *pText, const char
405406
TextRender()->TextDeferred(&s_Cursor, pText, -1);
406407

407408
TextRender()->DrawTextOutlined(&s_Cursor);
409+
TextRender()->TextColor(OldColor);
408410
}
409411

410412
void CUI::DoLabelSelected(const CUIRect *pRect, const char *pText, bool Selected, float FontSize, int Align)

0 commit comments

Comments
 (0)