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

Adjusted the "search" label and server/player info in the server browser. closes #1986

Browse source
This commit is contained in:
oy 2019-02-07 19:23:03 +01:00
parent 6faddbc87b
commit 3c165cce00
1 changed files with 50 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1238,14 +1238,15 @@ void CMenus::RenderServerbrowserServerList(CUIRect View)
// cut view // cut view
CUIRect Left, Label, EditBox, Button; CUIRect Left, Label, EditBox, Button;
Status.VSplitLeft(ButtonWidth*3.0f+SpacingH*2.0f, &Left, &Status); Status.VSplitLeft(ButtonWidth*3.5f+SpacingH*2.0f, &Left, &Status);
// render quick search and host address // render quick search and host address
Left.HSplitTop(((ButtonHeight*3.0f+SpacingH*2.0f)-(ButtonHeight*2.0f+SpacingH))/2.0f, 0, &Left); Left.HSplitTop(((ButtonHeight*3.0f+SpacingH*2.0f)-(ButtonHeight*2.0f+SpacingH))/2.0f, 0, &Left);
Left.HSplitTop(ButtonHeight, &Label, &Left); Left.HSplitTop(ButtonHeight, &Label, &Left);
Label.VSplitLeft(2.0f, 0, &Label);
Label.VSplitRight(ButtonWidth*2.0f+SpacingH, &Label, &EditBox); Label.VSplitRight(ButtonWidth*2.0f+SpacingH, &Label, &EditBox);
Label.y += 2.0f; Label.y += 2.0f;
UI()->DoLabel(&Label, Localize("Search:"), ButtonHeight*ms_FontmodHeight*0.8f, CUI::ALIGN_CENTER); UI()->DoLabel(&Label, Localize("Search:"), ButtonHeight*ms_FontmodHeight*0.8f, CUI::ALIGN_LEFT);
EditBox.VSplitRight(EditBox.h, &EditBox, &Button); EditBox.VSplitRight(EditBox.h, &EditBox, &Button);
static float s_ClearOffset = 0.0f; static float s_ClearOffset = 0.0f;
if(DoEditBox(&g_Config.m_BrFilterString, &EditBox, g_Config.m_BrFilterString, sizeof(g_Config.m_BrFilterString), ButtonHeight*ms_FontmodHeight*0.8f, &s_ClearOffset, false, CUI::CORNER_ALL)) if(DoEditBox(&g_Config.m_BrFilterString, &EditBox, g_Config.m_BrFilterString, sizeof(g_Config.m_BrFilterString), ButtonHeight*ms_FontmodHeight*0.8f, &s_ClearOffset, false, CUI::CORNER_ALL))
@ -1264,22 +1265,62 @@ void CMenus::RenderServerbrowserServerList(CUIRect View)
Left.HSplitTop(SpacingH, 0, &Left); Left.HSplitTop(SpacingH, 0, &Left);
Left.HSplitTop(ButtonHeight, &Label, 0); Left.HSplitTop(ButtonHeight, &Label, 0);
Label.VSplitLeft(2.0f, 0, &Label);
Label.VSplitRight(ButtonWidth*2.0f+SpacingH, &Label, &EditBox); Label.VSplitRight(ButtonWidth*2.0f+SpacingH, &Label, &EditBox);
Label.y += 2.0f; Label.y += 2.0f;
UI()->DoLabel(&Label, Localize("Host address:"), ButtonHeight*ms_FontmodHeight*0.8f, CUI::ALIGN_CENTER); UI()->DoLabel(&Label, Localize("Host address:"), ButtonHeight*ms_FontmodHeight*0.8f, CUI::ALIGN_LEFT);
static float s_AddressOffset = 0.0f; static float s_AddressOffset = 0.0f;
DoEditBox(&g_Config.m_UiServerAddress, &EditBox, g_Config.m_UiServerAddress, sizeof(g_Config.m_UiServerAddress), ButtonHeight*ms_FontmodHeight*0.8f, &s_AddressOffset, false, CUI::CORNER_ALL); DoEditBox(&g_Config.m_UiServerAddress, &EditBox, g_Config.m_UiServerAddress, sizeof(g_Config.m_UiServerAddress), ButtonHeight*ms_FontmodHeight*0.8f, &s_AddressOffset, false, CUI::CORNER_ALL);
// render status // render status
Status.HSplitTop(ButtonHeight+SpacingH, 0, &Status);
Status.HSplitTop(ButtonHeight, &Status, 0);
char aBuf[128];
if(ServerBrowser()->IsRefreshing()) if(ServerBrowser()->IsRefreshing())
{
char aBuf[128];
Status.HSplitTop(ButtonHeight + SpacingH, 0, &Status);
str_format(aBuf, sizeof(aBuf), Localize("%d%% loaded"), ServerBrowser()->LoadingProgression()); str_format(aBuf, sizeof(aBuf), Localize("%d%% loaded"), ServerBrowser()->LoadingProgression());
else
str_format(aBuf, sizeof(aBuf), Localize("%d servers, %d players"), ServerBrowser()->NumServers(), NumPlayers);
Status.y += 2.0f; Status.y += 2.0f;
UI()->DoLabel(&Status, aBuf, 14.0f, CUI::ALIGN_CENTER); UI()->DoLabel(&Status, aBuf, 14.0f, CUI::ALIGN_CENTER);
}
else
{
// todo: move this to a helper function
static float RenderOffset = 0.0f;
if(RenderOffset == 0.0f)
{
char aChar[2] = "0";
RenderOffset = TextRender()->TextWidth(0, 12.0f, aChar, -1);
}
float OffsetServer = 0.0f, OffsetPlayer = 0.0f;
int Num = ServerBrowser()->NumServers();
if(Num < 1000)
OffsetServer += RenderOffset;
if(Num < 100)
OffsetServer += RenderOffset;
if(Num < 10)
OffsetServer += RenderOffset;
Num = NumPlayers;
if(Num < 1000)
OffsetPlayer += RenderOffset;
if(Num < 100)
OffsetPlayer += RenderOffset;
if(Num < 10)
OffsetPlayer += RenderOffset;
char aBuf[128];
Status.VSplitLeft(20.0f, 0, &Status);
Status.HSplitTop(ButtonHeight/1.5f, 0, &Status);
Status.HSplitTop(ButtonHeight, &Label, &Status);
str_format(aBuf, sizeof(aBuf), Localize("%d servers"), ServerBrowser()->NumServers());
Label.y += 2.0f;
Label.x += OffsetServer;
UI()->DoLabel(&Label, aBuf, 14.0f, CUI::ALIGN_LEFT);
Status.HSplitTop(SpacingH, 0, &Status);
Status.HSplitTop(ButtonHeight, &Label, 0);
str_format(aBuf, sizeof(aBuf), Localize("%d players"), NumPlayers);
Label.y += 2.0f;
Label.x += OffsetPlayer;
UI()->DoLabel(&Label, aBuf, 14.0f, CUI::ALIGN_LEFT);
}
} }
void CMenus::RenderServerbrowserSidebar(CUIRect View) void CMenus::RenderServerbrowserSidebar(CUIRect View)