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

Change alignment of browser headers, adjust size, remove info icon slot

Browse source
This commit is contained in:
Jordy Ruiz 2018-12-17 13:39:31 +01:00
parent e0cd64b595
commit cc74e865b7
3 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game/client/components/menus.cpp
View file

@ -265,7 +265,7 @@ void CMenus::DoButton_MenuTabTop_Dummy(const char *pText, int Checked, const CUI
TextRender()->TextOutlineColor(0.0f, 0.0f, 0.0f, 0.3f);
}
int CMenus::DoButton_GridHeader(const void *pID, const char *pText, int Checked, const CUIRect *pRect)
int CMenus::DoButton_GridHeader(const void *pID, const char *pText, int Checked, CUI::EAlignment Align, const CUIRect *pRect)
//void CMenus::ui_draw_grid_header(const void *id, const char *text, int checked, const CUIRect *r, const void *extra)
{
if(Checked)
@ -278,7 +278,7 @@ int CMenus::DoButton_GridHeader(const void *pID, const char *pText, int Checked,
CUIRect Label;
pRect->VMargin(2.0f, &Label);
Label.y+=2.0f;
UI()->DoLabel(&Label, pText, pRect->h*ms_FontmodHeight*0.8f, CUI::ALIGN_CENTER);
UI()->DoLabel(&Label, pText, pRect->h*ms_FontmodHeight*0.8f, Align);
if(Checked)
{

3
src/game/client/components/menus.h
View file

@ -72,7 +72,7 @@ private:
int DoIcon(int ImageId, int SpriteId, const CUIRect *pRect);
void DoIconColor(int ImageId, int SpriteId, const CUIRect *pRect, const vec4& Color);
int DoButton_GridHeader(const void *pID, const char *pText, int Checked, const CUIRect *pRect);
int DoButton_GridHeader(const void *pID, const char *pText, int Checked, CUI::EAlignment Align, const CUIRect *pRect);
int DoButton_GridHeaderIcon(CButtonContainer *pBC, int ImageID, int SpriteID, const CUIRect *pRect, int Corners);
//static void ui_draw_browse_icon(int what, const CUIRect *r);
@ -481,6 +481,7 @@ private:
int m_Flags;
CUIRect m_Rect;
CUIRect m_Spacer;
CUI::EAlignment m_Align;
};
static CColumn ms_aBrowserCols[NUM_BROWSER_COLS];

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

@ -24,12 +24,12 @@
#include "menus.h"
CMenus::CColumn CMenus::ms_aBrowserCols[] = {
{COL_BROWSER_FLAG, -1, " ", -1, 87.0f, 0, {0}, {0}}, // Localize - these strings are localized within CLocConstString
{COL_BROWSER_NAME, IServerBrowser::SORT_NAME, "Server", 0, 320.0f, 0, {0}, {0}},
{COL_BROWSER_GAMETYPE, IServerBrowser::SORT_GAMETYPE, "Type", 1, 70.0f, 0, {0}, {0}},
{COL_BROWSER_MAP, IServerBrowser::SORT_MAP, "Map", 1, 100.0f, 0, {0}, {0}},
{COL_BROWSER_PLAYERS, IServerBrowser::SORT_NUMPLAYERS, "Players", 1, 40.0f, 0, {0}, {0}},
{COL_BROWSER_PING, IServerBrowser::SORT_PING, "Ping", 1, 40.0f, 0, {0}, {0}},
{COL_BROWSER_FLAG, -1, " ", -1, 87.0f, 0, {0}, {0}, CUI::ALIGN_LEFT}, // Localize - these strings are localized within CLocConstString
{COL_BROWSER_NAME, IServerBrowser::SORT_NAME, "Server", 0, 310.0f, 0, {0}, {0}, CUI::ALIGN_LEFT},
{COL_BROWSER_GAMETYPE, IServerBrowser::SORT_GAMETYPE, "Type", 1, 70.0f, 0, {0}, {0}, CUI::ALIGN_LEFT},
{COL_BROWSER_MAP, IServerBrowser::SORT_MAP, "Map", 1, 100.0f, 0, {0}, {0}, CUI::ALIGN_LEFT},
{COL_BROWSER_PLAYERS, IServerBrowser::SORT_NUMPLAYERS, "Players", 1, 50.0f, 0, {0}, {0}, CUI::ALIGN_LEFT},
{COL_BROWSER_PING, IServerBrowser::SORT_PING, "Ping", 1, 40.0f, 0, {0}, {0}, CUI::ALIGN_RIGHT},
};
CServerFilterInfo CMenus::CBrowserFilter::ms_FilterStandard = {IServerBrowser::FILTER_COMPAT_VERSION|IServerBrowser::FILTER_PURE|IServerBrowser::FILTER_PURE_MAP, 999, -1, 0, {0}, 0};
@ -908,7 +908,7 @@ void CMenus::RenderServerbrowserOverlay()
void CMenus::RenderServerbrowserServerList(CUIRect View)
{
CUIRect Headers, Status, InfoButton;
CUIRect Headers, Status;
float SpacingH = 2.0f;
float ButtonHeight = 20.0f;
@ -923,8 +923,8 @@ void CMenus::RenderServerbrowserServerList(CUIRect View)
View.HSplitTop(ms_ListheaderHeight, &Headers, &View);
View.HSplitBottom(ButtonHeight*3.0f+SpacingH*2.0f, &View, &Status);
Headers.VSplitRight(ms_ListheaderHeight, &Headers, &InfoButton); // split for info button
// Headers.VSplitRight(ms_ListheaderHeight, &Headers, &InfoButton); // split for info button
Headers.VSplitRight(2.f, &Headers, 0); // some margin on the right
// do layout
for(int i = 0; i < NUM_BROWSER_COLS; i++)
@ -962,7 +962,7 @@ void CMenus::RenderServerbrowserServerList(CUIRect View)
if(i == COL_BROWSER_FLAG)
continue;
if(DoButton_GridHeader(ms_aBrowserCols[i].m_Caption, ms_aBrowserCols[i].m_Caption, g_Config.m_BrSort == ms_aBrowserCols[i].m_Sort, &ms_aBrowserCols[i].m_Rect))
if(DoButton_GridHeader(ms_aBrowserCols[i].m_Caption, ms_aBrowserCols[i].m_Caption, g_Config.m_BrSort == ms_aBrowserCols[i].m_Sort, ms_aBrowserCols[i].m_Align, &ms_aBrowserCols[i].m_Rect))
{
if(ms_aBrowserCols[i].m_Sort != -1)
{