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

Make dropdown filters expandable by clicking on the line (#1670 1/10)

Browse source
This commit is contained in:
Jordy Ruiz 2018-11-16 13:08:17 +01:00
parent bfc7c1a248
commit ec4e6ead87
1 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -642,25 +642,17 @@ bool CMenus::RenderFilterHeader(CUIRect View, int FilterIndex)
float ButtonHeight = 20.0f; float ButtonHeight = 20.0f;
float Spacing = 3.0f; float Spacing = 3.0f;
bool Switch = false;
RenderTools()->DrawUIRect(&View, vec4(0.0f, 0.0f, 0.0f, 0.25f), CUI::CORNER_ALL, 5.0f); RenderTools()->DrawUIRect(&View, vec4(0.0f, 0.0f, 0.0f, 0.25f), CUI::CORNER_ALL, 5.0f);
CUIRect Button, EditButtons; CUIRect Button, EditButtons;
View.VSplitLeft(20.0f, &Button, &View); View.VSplitLeft(20.0f, &Button, &View);
Button.Margin(2.0f, &Button); Button.Margin(2.0f, &Button);
if(DoButton_SpriteClean(IMAGE_MENUICONS, pFilter->Extended() ? SPRITE_MENU_EXPANDED : SPRITE_MENU_COLLAPSED, &Button)) if(DoButton_SpriteClean(IMAGE_MENUICONS, pFilter->Extended() ? SPRITE_MENU_EXPANDED : SPRITE_MENU_COLLAPSED, &Button)
|| (UI()->MouseInside(&View) && Input()->KeyPress(KEY_MOUSE_1)))
{ {
pFilter->Switch(); Switch = true; // switch later, to make sure we haven't clicked one of the filter buttons (edit...)
// retract the other filters
if(pFilter->Extended())
{
for(int i = 0; i < m_lFilters.size(); ++i)
{
if(i != FilterIndex && m_lFilters[i].Extended())
m_lFilters[i].Switch();
}
}
} }
// split buttons from label // split buttons from label
@ -714,6 +706,7 @@ bool CMenus::RenderFilterHeader(CUIRect View, int FilterIndex)
static int s_EditPopupID = 0; static int s_EditPopupID = 0;
m_SelectedFilter = FilterIndex; m_SelectedFilter = FilterIndex;
InvokePopupMenu(&s_EditPopupID, 0, UI()->MouseX(), UI()->MouseY(), 200.0f, 310.0f, PopupFilter); InvokePopupMenu(&s_EditPopupID, 0, UI()->MouseX(), UI()->MouseY(), 200.0f, 310.0f, PopupFilter);
Switch = false;
} }
EditButtons.VSplitRight(Spacing, &EditButtons, 0); EditButtons.VSplitRight(Spacing, &EditButtons, 0);
@ -722,7 +715,10 @@ bool CMenus::RenderFilterHeader(CUIRect View, int FilterIndex)
if(FilterIndex > 0 && (pFilter->Custom() > CBrowserFilter::FILTER_ALL || m_lFilters[FilterIndex-1].Custom() != CBrowserFilter::FILTER_STANDARD)) if(FilterIndex > 0 && (pFilter->Custom() > CBrowserFilter::FILTER_ALL || m_lFilters[FilterIndex-1].Custom() != CBrowserFilter::FILTER_STANDARD))
{ {
if(DoButton_SpriteClean(IMAGE_TOOLICONS, SPRITE_TOOL_UP_A, &Button)) if(DoButton_SpriteClean(IMAGE_TOOLICONS, SPRITE_TOOL_UP_A, &Button))
{
Move(true, FilterIndex); Move(true, FilterIndex);
Switch = false;
}
} }
else else
DoIcon(IMAGE_TOOLICONS, SPRITE_TOOL_UP_B, &Button); DoIcon(IMAGE_TOOLICONS, SPRITE_TOOL_UP_B, &Button);
@ -733,11 +729,28 @@ bool CMenus::RenderFilterHeader(CUIRect View, int FilterIndex)
if(FilterIndex >= 0 && FilterIndex < m_lFilters.size()-1 && (pFilter->Custom() != CBrowserFilter::FILTER_STANDARD || m_lFilters[FilterIndex+1].Custom() > CBrowserFilter::FILTER_ALL)) if(FilterIndex >= 0 && FilterIndex < m_lFilters.size()-1 && (pFilter->Custom() != CBrowserFilter::FILTER_STANDARD || m_lFilters[FilterIndex+1].Custom() > CBrowserFilter::FILTER_ALL))
{ {
if(DoButton_SpriteClean(IMAGE_TOOLICONS, SPRITE_TOOL_DOWN_A, &Button)) if(DoButton_SpriteClean(IMAGE_TOOLICONS, SPRITE_TOOL_DOWN_A, &Button))
{
Move(false, FilterIndex); Move(false, FilterIndex);
Switch = false;
}
} }
else else
DoIcon(IMAGE_TOOLICONS, SPRITE_TOOL_DOWN_B, &Button); DoIcon(IMAGE_TOOLICONS, SPRITE_TOOL_DOWN_B, &Button);
if(Switch)
{
pFilter->Switch();
// retract the other filters
if(pFilter->Extended())
{
for(int i = 0; i < m_lFilters.size(); ++i)
{
if(i != FilterIndex && m_lFilters[i].Extended())
m_lFilters[i].Switch();
}
}
}
return false; return false;
} }