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

Merge pull request #1987 from Dune-jr/fix-join-hover

Browse source 
Add fade effect to join friend button
This commit is contained in:
oy 2019-01-27 13:28:40 +01:00 committed by GitHub
parent 1dfe209414 ff22c4106a
commit d51a731ec6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1422,6 +1422,9 @@ void CMenus::RenderServerbrowserFriendTab(CUIRect View)
}
// 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)
{
CUIRect Header;
@ -1430,7 +1433,7 @@ void CMenus::RenderServerbrowserFriendTab(CUIRect View)
if(s_ListExtended[i])
{
// entries
for(int f = 0; f < m_lFriendList[i].size(); ++f)
for(int f = 0; f < m_lFriendList[i].size(); ++f, ++ButtonId)
{
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);
@ -1474,10 +1477,7 @@ void CMenus::RenderServerbrowserFriendTab(CUIRect View)
if(m_lFriendList[i][f].m_pServerInfo)
{
Button.Margin((Button.h - ms_ListheaderHeight + 2.0f) / 2, &Button);
RenderTools()->DrawUIRect(&Button, vec4(1.0f, 1.0f, 1.0f, 0.15f), CUI::CORNER_ALL, 4.0f);
Label.HMargin(2.0f, &Label);
UI()->DoLabelScaled(&Button, Localize("Join", "Join a server"), FontSize, CUI::ALIGN_CENTER);
if(UI()->MouseInside(&Button) && Input()->KeyPress(KEY_MOUSE_1)) // todo: fix me
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));
Client()->Connect(g_Config.m_UiServerAddress);