fixed not expanding the filter by using the tool icons. closes #1682

oy · oy · commit 92e9ee83d573 · 2018-11-17T12:59:12.000+01:00
diff --git a/src/game/client/components/menus.h b/src/game/client/components/menus.h
@@ -399,6 +399,7 @@ class CMenus : public CComponent
 		};
 		// buttons var
 		int m_SwitchButton;
+		int m_aButtonID[3];
 
 		CBrowserFilter() {}
 		CBrowserFilter(int Custom, const char* pName, IServerBrowser *pServerBrowser);
diff --git a/src/game/client/components/menus_browser.cpp b/src/game/client/components/menus_browser.cpp
@@ -701,7 +701,8 @@ bool CMenus::RenderFilterHeader(CUIRect View, int FilterIndex)
 	EditButtons.VSplitRight(Spacing, &EditButtons, 0);
 	EditButtons.VSplitRight(ButtonHeight, &EditButtons, &Button);
 	Button.Margin(2.0f, &Button);
-	if(DoButton_SpriteClean(IMAGE_TOOLICONS, SPRITE_TOOL_EDIT_A, &Button))
+	DoIcon(IMAGE_TOOLICONS, SPRITE_TOOL_EDIT_A, &Button);
+	if(UI()->DoButtonLogic(&pFilter->m_aButtonID[2], "", 0, &Button))
 	{
 		static int s_EditPopupID = 0;
 		m_SelectedFilter = FilterIndex;
@@ -714,7 +715,8 @@ bool CMenus::RenderFilterHeader(CUIRect View, int FilterIndex)
 	Button.Margin(2.0f, &Button);
 	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))
+		DoIcon(IMAGE_TOOLICONS, SPRITE_TOOL_UP_A, &Button);
+		if(UI()->DoButtonLogic(&pFilter->m_aButtonID[0], "", 0, &Button))
 		{
 			Move(true, FilterIndex);
 			Switch = false;
@@ -728,7 +730,8 @@ bool CMenus::RenderFilterHeader(CUIRect View, int FilterIndex)
 	Button.Margin(2.0f, &Button);
 	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))
+		DoIcon(IMAGE_TOOLICONS, SPRITE_TOOL_DOWN_A, &Button);
+		if(UI()->DoButtonLogic(&pFilter->m_aButtonID[1], "", 0, &Button))
 		{
 			Move(false, FilterIndex);
 			Switch = false;

Original file line number	Diff line number	Diff line change
`@@ -701,7 +701,8 @@ bool CMenus::RenderFilterHeader(CUIRect View, int FilterIndex)`
`701`	`701`	`EditButtons.VSplitRight(Spacing, &EditButtons, 0);`
`702`	`702`	`EditButtons.VSplitRight(ButtonHeight, &EditButtons, &Button);`
`703`	`703`	`Button.Margin(2.0f, &Button);`
`704`		`- if(DoButton_SpriteClean(IMAGE_TOOLICONS, SPRITE_TOOL_EDIT_A, &Button))`
	`704`	`+ DoIcon(IMAGE_TOOLICONS, SPRITE_TOOL_EDIT_A, &Button);`
	`705`	`+ if(UI()->DoButtonLogic(&pFilter->m_aButtonID[2], "", 0, &Button))`
`705`	`706`	`{`
`706`	`707`	`static int s_EditPopupID = 0;`
`707`	`708`	`m_SelectedFilter = FilterIndex;`
`@@ -714,7 +715,8 @@ bool CMenus::RenderFilterHeader(CUIRect View, int FilterIndex)`
`714`	`715`	`Button.Margin(2.0f, &Button);`
`715`	`716`	`if(FilterIndex > 0 && (pFilter->Custom() > CBrowserFilter::FILTER_ALL \|\| m_lFilters[FilterIndex-1].Custom() != CBrowserFilter::FILTER_STANDARD))`
`716`	`717`	`{`
`717`		`- if(DoButton_SpriteClean(IMAGE_TOOLICONS, SPRITE_TOOL_UP_A, &Button))`
	`718`	`+ DoIcon(IMAGE_TOOLICONS, SPRITE_TOOL_UP_A, &Button);`
	`719`	`+ if(UI()->DoButtonLogic(&pFilter->m_aButtonID[0], "", 0, &Button))`
`718`	`720`	`{`
`719`	`721`	`Move(true, FilterIndex);`
`720`	`722`	`Switch = false;`
`@@ -728,7 +730,8 @@ bool CMenus::RenderFilterHeader(CUIRect View, int FilterIndex)`
`728`	`730`	`Button.Margin(2.0f, &Button);`
`729`	`731`	`if(FilterIndex >= 0 && FilterIndex < m_lFilters.size()-1 && (pFilter->Custom() != CBrowserFilter::FILTER_STANDARD \|\| m_lFilters[FilterIndex+1].Custom() > CBrowserFilter::FILTER_ALL))`
`730`	`732`	`{`
`731`		`- if(DoButton_SpriteClean(IMAGE_TOOLICONS, SPRITE_TOOL_DOWN_A, &Button))`
	`733`	`+ DoIcon(IMAGE_TOOLICONS, SPRITE_TOOL_DOWN_A, &Button);`
	`734`	`+ if(UI()->DoButtonLogic(&pFilter->m_aButtonID[1], "", 0, &Button))`
`732`	`735`	`{`
`733`	`736`	`Move(false, FilterIndex);`
`734`	`737`	`Switch = false;`