Reorder filter tabs to put friends last, adjust sizes to 30-30-40, from 25-25-50 (#1670 7/10)

This commit is contained in:
Jordy Ruiz 2018-11-16 13:57:32 +01:00
parent 4596b922be
commit cfc4485f4b

View file

@ -1341,20 +1341,21 @@ void CMenus::RenderServerbrowserSidebar(CUIRect View)
// header // header
View.HSplitTop(ms_ListheaderHeight, &Header, &View); View.HSplitTop(ms_ListheaderHeight, &Header, &View);
Header.VSplitLeft(Header.w/2, &Button, &Header); float Width = Header.w;
static CButtonContainer s_TabFriends; Header.VSplitLeft(Width*0.30f, &Button, &Header);
if(DoButton_SpriteID(&s_TabFriends, IMAGE_SIDEBARICONS, m_SidebarTab!=0?SPRITE_SIDEBAR_FRIEND_A:SPRITE_SIDEBAR_FRIEND_B, m_SidebarTab==0 , &Button, CUI::CORNER_TL, 5.0f, true)) static CButtonContainer s_TabInfo;
if(DoButton_SpriteID(&s_TabInfo, IMAGE_SIDEBARICONS, m_SidebarTab!=0?SPRITE_SIDEBAR_INFO_A: SPRITE_SIDEBAR_INFO_B, m_SidebarTab==0 , &Button, CUI::CORNER_TL, 5.0f, true))
{ {
m_SidebarTab = 0; m_SidebarTab = 0;
} }
Header.VSplitLeft(Header.w/2, &Button, &Header); Header.VSplitLeft(Width*0.30f, &Button, &Header);
static CButtonContainer s_TabFilter; static CButtonContainer s_TabFilter;
if(DoButton_SpriteID(&s_TabFilter, IMAGE_SIDEBARICONS, m_SidebarTab!=1?SPRITE_SIDEBAR_FILTER_A: SPRITE_SIDEBAR_FILTER_B, m_SidebarTab==1, &Button, 0, 0.0f, true)) if(DoButton_SpriteID(&s_TabFilter, IMAGE_SIDEBARICONS, m_SidebarTab!=1?SPRITE_SIDEBAR_FILTER_A: SPRITE_SIDEBAR_FILTER_B, m_SidebarTab==1, &Button, 0, 0.0f, true))
{ {
m_SidebarTab = 1; m_SidebarTab = 1;
} }
static CButtonContainer s_TabInfo; static CButtonContainer s_TabFriends;
if(DoButton_SpriteID(&s_TabInfo, IMAGE_SIDEBARICONS, m_SidebarTab!=2?SPRITE_SIDEBAR_INFO_A: SPRITE_SIDEBAR_INFO_B, m_SidebarTab == 2, &Header, CUI::CORNER_TR, 5.0f, true)) if(DoButton_SpriteID(&s_TabFriends, IMAGE_SIDEBARICONS, m_SidebarTab!=2?SPRITE_SIDEBAR_FRIEND_A:SPRITE_SIDEBAR_FRIEND_B, m_SidebarTab == 2, &Header, CUI::CORNER_TR, 5.0f, true))
{ {
m_SidebarTab = 2; m_SidebarTab = 2;
} }
@ -1363,13 +1364,13 @@ void CMenus::RenderServerbrowserSidebar(CUIRect View)
switch(m_SidebarTab) switch(m_SidebarTab)
{ {
case 0: case 0:
RenderServerbrowserFriendTab(View); RenderServerbrowserInfoTab(View);
break; break;
case 1: case 1:
RenderServerbrowserFilterTab(View); RenderServerbrowserFilterTab(View);
break; break;
case 2: case 2:
RenderServerbrowserInfoTab(View); RenderServerbrowserFriendTab(View);
} }
} }