Merge pull request #2989 from Robyt3/ui-listheader-move

Move ms_ListheaderHeight and related methods to CUI

8 files changed, 29 insertions, 20 deletions

diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp
index b5edc5fe2..9ff9c514f 100644
--- a/src/game/client/components/menus.cpp
+++ b/src/game/client/components/menus.cpp
@@ -33,7 +33,6 @@
 #include "menus.h"
 #include "skins.h"
 
-float CMenus::ms_ListheaderHeight = CUI::ms_ListheaderHeight;
 float CMenus::ms_FontmodHeight = CUI::ms_FontmodHeight;
 
 CRenderTools *CMenus::CUIElementBase::m_pRenderTools = 0;
diff --git a/src/game/client/components/menus.h b/src/game/client/components/menus.h
index 4ebb94796..3e135e614 100644
--- a/src/game/client/components/menus.h
+++ b/src/game/client/components/menus.h
@@ -363,7 +363,6 @@ private:
 
 	int64 m_LastInput;
 
-	static float ms_ListheaderHeight;
 	static float ms_FontmodHeight;
 
 	// for settings
@@ -678,8 +677,6 @@ private:
 	void RenderMenubar(CUIRect r);
 	void RenderNews(CUIRect MainView);
 	void RenderBackButton(CUIRect MainView);
-	inline float GetListHeaderHeight() const { return ms_ListheaderHeight + (Config()->m_UiWideview ? 3.0f : 0.0f); }
-	inline float GetListHeaderHeightFactor() const { return 1.0f + (Config()->m_UiWideview ? (3.0f/ms_ListheaderHeight) : 0.0f); }
 	static void ConchainUpdateMusicState(IConsole::IResult *pResult, void *pUserData, IConsole::FCommandCallback pfnCallback, void *pCallbackUserData);
 	void UpdateMusicState();
 
diff --git a/src/game/client/components/menus_browser.cpp b/src/game/client/components/menus_browser.cpp
index dc3034339..b29efd306 100644
--- a/src/game/client/components/menus_browser.cpp
+++ b/src/game/client/components/menus_browser.cpp
@@ -767,8 +767,8 @@ void CMenus::RenderServerbrowserServerList(CUIRect View)
 
 	const float SpacingH = 2.0f;
 	const float ButtonHeight = 20.0f;
-	const float HeaderHeight = GetListHeaderHeight();
-	const float HeightFactor = GetListHeaderHeightFactor();
+	const float HeaderHeight = UI()->GetListHeaderHeight();
+	const float HeightFactor = UI()->GetListHeaderHeightFactor();
 
 	// background
 	View.Draw(vec4(0.0f, 0.0f, 0.0f, Config()->m_ClMenuAlpha/100.0f), 5.0f, (Client()->State() == IClient::STATE_OFFLINE) ? CUIRect::CORNER_ALL : CUIRect::CORNER_B|CUIRect::CORNER_TR);
@@ -1252,7 +1252,7 @@ void CMenus::RenderServerbrowserSidebar(CUIRect View)
 	}
 
 	// header
-	View.HSplitTop(GetListHeaderHeight(), &Header, &View);
+	View.HSplitTop(UI()->GetListHeaderHeight(), &Header, &View);
 	float Width = Header.w;
 	Header.VSplitLeft(Width*0.30f, &Button, &Header);
 	static CButtonContainer s_TabInfo;
@@ -1293,7 +1293,7 @@ void CMenus::RenderServerbrowserFriendTab(CUIRect View)
 	const float FontSize = 10.0f;
 	static bool s_ListExtended[NUM_FRIEND_TYPES] = { 1, 1, 0 };
 	static vec3 s_ListColor[NUM_FRIEND_TYPES] = { vec3(0.5f, 1.0f, 0.5f), vec3(0.4f, 0.4f, 1.0f), vec3(1.0f, 0.5f, 0.5f) };
-	const float HeaderHeight = GetListHeaderHeight();
+	const float HeaderHeight = UI()->GetListHeaderHeight();
 	const float SpacingH = 2.0f;
 
 	View.HSplitBottom(3*HeaderHeight+2*SpacingH, &View, &BottomArea);
@@ -1558,7 +1558,7 @@ void CMenus::RenderServerbrowserFilterTab(CUIRect View)
 	pFilter->GetFilter(&FilterInfo);
 
 	// server filter
-	ServerFilter.HSplitTop(GetListHeaderHeight(), &FilterHeader, &ServerFilter);
+	ServerFilter.HSplitTop(UI()->GetListHeaderHeight(), &FilterHeader, &ServerFilter);
 	FilterHeader.Draw(vec4(1, 1, 1, 0.25f), 4.0f, CUIRect::CORNER_T);
 	ServerFilter.Draw(vec4(0, 0, 0, 0.15f), 4.0f, CUIRect::CORNER_B);
 	FilterHeader.HMargin(2.0f, &FilterHeader);
@@ -1873,7 +1873,7 @@ void CMenus::RenderDetailInfo(CUIRect View, const CServerInfo *pInfo, const vec4
 	TextRender()->TextSecondaryColor(TextOutlineColor);
 
 	CUIRect ServerHeader;
-	View.HSplitTop(GetListHeaderHeight(), &ServerHeader, &View);
+	View.HSplitTop(UI()->GetListHeaderHeight(), &ServerHeader, &View);
 	ServerHeader.Draw(vec4(1, 1, 1, 0.25f), 5.0f, CUIRect::CORNER_T);
 	View.Draw(vec4(0, 0, 0, 0.15f), 5.0f, CUIRect::CORNER_B);
 	ServerHeader.HMargin(2.0f, &ServerHeader);
@@ -2066,7 +2066,7 @@ void CMenus::RenderServerbrowserServerDetail(CUIRect View, const CServerInfo *pI
 	RenderDetailInfo(ServerDetails, pInfo, CUI::ms_DefaultTextColor, CUI::ms_DefaultTextOutlineColor);
 
 	// server scoreboard
-	ServerScoreboard.HSplitTop(GetListHeaderHeight(), &ServerHeader, &ServerScoreboard);
+	ServerScoreboard.HSplitTop(UI()->GetListHeaderHeight(), &ServerHeader, &ServerScoreboard);
 	ServerHeader.Draw(vec4(1, 1, 1, 0.25f), 4.0f, CUIRect::CORNER_T);
 	ServerHeader.HMargin(2.0f, &ServerHeader);
 	UI()->DoLabel(&ServerHeader, Localize("Scoreboard"), 12.0f, TEXTALIGN_CENTER);
diff --git a/src/game/client/components/menus_demo.cpp b/src/game/client/components/menus_demo.cpp
index 83c7e3b43..1064a1075 100644
--- a/src/game/client/components/menus_demo.cpp
+++ b/src/game/client/components/menus_demo.cpp
@@ -477,12 +477,12 @@ void CMenus::RenderDemoList(CUIRect MainView)
 
 	// demo list header
 	static CListBox s_ListBox;
-	s_ListBox.DoHeader(&ListBox, Localize("Recorded"), GetListHeaderHeight());
+	s_ListBox.DoHeader(&ListBox, Localize("Recorded"), UI()->GetListHeaderHeight());
 
 	// demo list column headers
 	CUIRect Headers;
-	ListBox.HMargin(GetListHeaderHeight() + 2.0f, &Headers);
-	Headers.h = GetListHeaderHeight();
+	ListBox.HMargin(UI()->GetListHeaderHeight() + 2.0f, &Headers);
+	Headers.h = UI()->GetListHeaderHeight();
 
 	Headers.Draw(vec4(0.0f,0,0,0.15f), 0.0f, CUIRect::CORNER_NONE);
 
@@ -541,7 +541,7 @@ void CMenus::RenderDemoList(CUIRect MainView)
 		}
 	}
 
-	s_ListBox.DoSpacing(GetListHeaderHeight());
+	s_ListBox.DoSpacing(UI()->GetListHeaderHeight());
 
 	s_ListBox.DoStart(20.0f, m_lDemos.size(), 1, 3, m_DemolistSelectedIndex);
 	for(sorted_array<CDemoItem>::range r = m_lDemos.all(); !r.empty(); r.pop_front())
diff --git a/src/game/client/components/menus_ingame.cpp b/src/game/client/components/menus_ingame.cpp
index 9966bd5e3..efffdbeb9 100644
--- a/src/game/client/components/menus_ingame.cpp
+++ b/src/game/client/components/menus_ingame.cpp
@@ -513,7 +513,7 @@ bool CMenus::RenderServerControlServer(CUIRect MainView)
 {
 	static CListBox s_ListBox;
 	CUIRect List = MainView;
-	s_ListBox.DoHeader(&List, Localize("Option"), GetListHeaderHeight());
+	s_ListBox.DoHeader(&List, Localize("Option"), UI()->GetListHeaderHeight());
 	s_ListBox.DoStart(20.0f, m_pClient->m_pVoting->NumVoteOptions(), 1, 3, m_CallvoteSelectedOption, 0, true, 0, CUIRect::CORNER_NONE);
 
 	for(const CVoteOptionClient *pOption = m_pClient->m_pVoting->FirstVoteOption(); pOption; pOption = pOption->m_pNext)
@@ -567,7 +567,7 @@ void CMenus::RenderServerControlKick(CUIRect MainView, bool FilterSpectators)
 
 	static CListBox s_ListBox;
 	CUIRect List = MainView;
-	s_ListBox.DoHeader(&List, Localize("Player"), GetListHeaderHeight());
+	s_ListBox.DoHeader(&List, Localize("Player"), UI()->GetListHeaderHeight());
 	s_ListBox.DoStart(20.0f, NumOptions, 1, 3, Selected, 0, true, 0, CUIRect::CORNER_NONE);
 
 	for(int i = 0; i < NumOptions; i++)
diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp
index e48cd214e..b9dd42486 100644
--- a/src/game/client/components/menus_settings.cpp
+++ b/src/game/client/components/menus_settings.cpp
@@ -329,7 +329,7 @@ void CMenus::RenderSkinSelection(CUIRect MainView)
 
 	m_pSelectedSkin = 0;
 	int OldSelected = -1;
-	s_ListBox.DoHeader(&MainView, Localize("Skins"), GetListHeaderHeight());
+	s_ListBox.DoHeader(&MainView, Localize("Skins"), UI()->GetListHeaderHeight());
 	m_RefreshSkinSelector = s_ListBox.DoFilter();
 	s_ListBox.DoStart(60.0f, s_paSkinList.size(), 10, 1, OldSelected);
 
@@ -728,7 +728,7 @@ void CMenus::RenderLanguageSelection(CUIRect MainView, bool Header)
 	int OldSelected = s_SelectedLanguage;
 
 	if(Header)
-		s_ListBox.DoHeader(&MainView, Localize("Language"), GetListHeaderHeight());
+		s_ListBox.DoHeader(&MainView, Localize("Language"), UI()->GetListHeaderHeight());
 	bool IsActive = m_ActiveListBox == ACTLB_LANG;
 	s_ListBox.DoStart(20.0f, s_Languages.size(), 1, 3, s_SelectedLanguage, Header?0:&MainView, Header, &IsActive);
 
@@ -796,7 +796,7 @@ void CMenus::RenderThemeSelection(CUIRect MainView, bool Header)
 	const int OldSelected = SelectedTheme;
 
 	if(Header)
-		s_ListBox.DoHeader(&MainView, Localize("Theme"), GetListHeaderHeight());
+		s_ListBox.DoHeader(&MainView, Localize("Theme"), UI()->GetListHeaderHeight());
 
 	bool IsActive = m_ActiveListBox == ACTLB_THEME;
 	s_ListBox.DoStart(20.0f, m_lThemes.size(), 1, 3, SelectedTheme, Header?0:&MainView, Header, &IsActive);
diff --git a/src/game/client/ui.cpp b/src/game/client/ui.cpp
index 03b764b1f..44c66cfa5 100644
--- a/src/game/client/ui.cpp
+++ b/src/game/client/ui.cpp
@@ -766,3 +766,13 @@ float CUI::GetClientIDRectWidth(float FontSize)
 		return 0;
 	return 1.4f * FontSize + 0.2f * FontSize;
 }
+
+float CUI::GetListHeaderHeight() const
+{
+	return ms_ListheaderHeight + (m_pConfig->m_UiWideview ? 3.0f : 0.0f);
+}
+
+float CUI::GetListHeaderHeightFactor() const
+{
+	return 1.0f + (m_pConfig->m_UiWideview ? (3.0f/ms_ListheaderHeight) : 0.0f);
+}
diff --git a/src/game/client/ui.h b/src/game/client/ui.h
index 923f9d981..45600a75b 100644
--- a/src/game/client/ui.h
+++ b/src/game/client/ui.h
@@ -246,6 +246,9 @@ public:
 	float DrawClientID(float FontSize, vec2 Position, int ID,
 					const vec4& BgColor = vec4(1.0f, 1.0f, 1.0f, 0.5f), const vec4& TextColor = vec4(0.1f, 0.1f, 0.1f, 1.0f));
 	float GetClientIDRectWidth(float FontSize);
+
+	float GetListHeaderHeight() const;
+	float GetListHeaderHeightFactor() const;
 };