diff options
| author | oy <Tom_Adams@web.de> | 2011-04-09 00:03:56 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-04-09 00:03:56 +0200 |
| commit | c902d98be37618a27b2306fc900b0b5caeaf1827 (patch) | |
| tree | 4dcef75355dc5858daf3a31d893a021b3d071edf /src/game/client/components | |
| parent | 05889f3e3eb12a6baaf20d712c6d0d3bed1ff964 (diff) | |
| download | zcatch-c902d98be37618a27b2306fc900b0b5caeaf1827.tar.gz zcatch-c902d98be37618a27b2306fc900b0b5caeaf1827.zip | |
moved vote tabs on top
Diffstat (limited to 'src/game/client/components')
| -rw-r--r-- | src/game/client/components/menus_ingame.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/game/client/components/menus_ingame.cpp b/src/game/client/components/menus_ingame.cpp index 254faade..4737f38d 100644 --- a/src/game/client/components/menus_ingame.cpp +++ b/src/game/client/components/menus_ingame.cpp @@ -363,7 +363,7 @@ void CMenus::RenderServerControlServer(CUIRect MainView) static int s_VoteList = 0; static float s_ScrollValue = 0; CUIRect List = MainView; - UiDoListboxStart(&s_VoteList, &List, 24.0f, Localize("Change settings"), "", m_pClient->m_pVoting->m_NumVoteOptions, 1, m_CallvoteSelectedOption, s_ScrollValue); + UiDoListboxStart(&s_VoteList, &List, 24.0f, "", "", m_pClient->m_pVoting->m_NumVoteOptions, 1, m_CallvoteSelectedOption, s_ScrollValue); for(CVoteOptionClient *pOption = m_pClient->m_pVoting->m_pFirst; pOption; pOption = pOption->m_pNext) { @@ -395,7 +395,7 @@ void CMenus::RenderServerControlKick(CUIRect MainView, bool FilterSpectators) static int s_VoteList = 0; static float s_ScrollValue = 0; CUIRect List = MainView; - UiDoListboxStart(&s_VoteList, &List, 24.0f, FilterSpectators?Localize("Move player to spectators"):Localize("Kick player"), "", NumOptions, 1, Selected, s_ScrollValue); + UiDoListboxStart(&s_VoteList, &List, 24.0f, "", "", NumOptions, 1, Selected, s_ScrollValue); for(int i = 0; i < NumOptions; i++) { @@ -422,8 +422,10 @@ void CMenus::RenderServerControl(CUIRect MainView) // render background CUIRect Bottom, Extended, TabBar, Button; - MainView.HSplitBottom(20.0f, &MainView, &TabBar); - RenderTools()->DrawUIRect(&MainView, ms_ColorTabbarActive, CUI::CORNER_T, 10.0f); + MainView.HSplitTop(20.0f, &Bottom, &MainView); + RenderTools()->DrawUIRect(&Bottom, ms_ColorTabbarActive, CUI::CORNER_T, 10.0f); + MainView.HSplitTop(20.0f, &TabBar, &MainView); + RenderTools()->DrawUIRect(&MainView, ms_ColorTabbarActive, CUI::CORNER_B, 10.0f); MainView.Margin(10.0f, &MainView); MainView.HSplitBottom(90.0f, &MainView, &Extended); @@ -431,7 +433,7 @@ void CMenus::RenderServerControl(CUIRect MainView) { TabBar.VSplitLeft(TabBar.w/3, &Button, &TabBar); static int s_Button0 = 0; - if(DoButton_MenuTab(&s_Button0, Localize("Change settings"), s_ControlPage == 0, &Button, CUI::CORNER_BL)) + if(DoButton_MenuTab(&s_Button0, Localize("Change settings"), s_ControlPage == 0, &Button, 0)) s_ControlPage = 0; TabBar.VSplitMid(&Button, &TabBar); @@ -440,7 +442,7 @@ void CMenus::RenderServerControl(CUIRect MainView) s_ControlPage = 1; static int s_Button2 = 0; - if(DoButton_MenuTab(&s_Button2, Localize("Move player to spectators"), s_ControlPage == 2, &TabBar, CUI::CORNER_BR)) + if(DoButton_MenuTab(&s_Button2, Localize("Move player to spectators"), s_ControlPage == 2, &TabBar, 0)) s_ControlPage = 2; } |