edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 14:38:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Browser: make the sliding window of join friend button IDs global to all friend lists

Browse source
This commit is contained in:
Jordy Ruiz 2019-01-25 12:03:34 +01:00
parent 513249c24b
commit ff22c4106a
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/game/client/components/menus_browser.cpp
View file

@ -1402,6 +1402,9 @@ void CMenus::RenderServerbrowserFriendTab(CUIRect View)
} }
// show lists // show lists
// only ~10 buttons will be displayed at once, a sliding window of 20 buttons ought to be enough
static CButtonContainer s_FriendJoinButtons[20];
int ButtonId = 0;
for(int i = 0; i < NUM_FRIEND_TYPES; ++i) for(int i = 0; i < NUM_FRIEND_TYPES; ++i)
{ {
CUIRect Header; CUIRect Header;
@ -1410,8 +1413,7 @@ void CMenus::RenderServerbrowserFriendTab(CUIRect View)
if(s_ListExtended[i]) if(s_ListExtended[i])
{ {
// entries // entries
static CButtonContainer s_JoinButtons[20]; // max of ~10 buttons displayed at once for(int f = 0; f < m_lFriendList[i].size(); ++f, ++ButtonId)
for(int f = 0; f < m_lFriendList[i].size(); ++f)
{ {
View.HSplitTop(20.0f + ms_ListheaderHeight, &Rect, &View); View.HSplitTop(20.0f + ms_ListheaderHeight, &Rect, &View);
RenderTools()->DrawUIRect(&Rect, vec4(0.5f, 0.5f, 0.5f, 0.5f), CUI::CORNER_ALL, 5.0f); RenderTools()->DrawUIRect(&Rect, vec4(0.5f, 0.5f, 0.5f, 0.5f), CUI::CORNER_ALL, 5.0f);
@ -1455,7 +1457,7 @@ void CMenus::RenderServerbrowserFriendTab(CUIRect View)
if(m_lFriendList[i][f].m_pServerInfo) if(m_lFriendList[i][f].m_pServerInfo)
{ {
Button.Margin((Button.h - ms_ListheaderHeight + 2.0f) / 2, &Button); Button.Margin((Button.h - ms_ListheaderHeight + 2.0f) / 2, &Button);
if(DoButton_Menu(&(s_JoinButtons[f%20]), Localize("Join", "Join a server"), 0, &Button) ) if(DoButton_Menu(&(s_FriendJoinButtons[ButtonId%20]), Localize("Join", "Join a server"), 0, &Button) )
{ {
str_copy(g_Config.m_UiServerAddress, m_lFriendList[i][f].m_pServerInfo->m_aAddress, sizeof(g_Config.m_UiServerAddress)); str_copy(g_Config.m_UiServerAddress, m_lFriendList[i][f].m_pServerInfo->m_aAddress, sizeof(g_Config.m_UiServerAddress));
Client()->Connect(g_Config.m_UiServerAddress); Client()->Connect(g_Config.m_UiServerAddress);