From d2519f7ab9b96a64d6ee03123a7ba498a78db10c Mon Sep 17 00:00:00 2001 From: Choupom Date: Wed, 20 Oct 2010 21:33:48 +0200 Subject: small ui fixes --- src/game/client/components/menus.cpp | 25 ------------------------- src/game/client/components/menus.h | 2 -- src/game/client/components/menus_ingame.cpp | 2 +- src/game/client/components/menus_settings.cpp | 2 +- src/game/client/ui.cpp | 14 +++++++------- 5 files changed, 9 insertions(+), 36 deletions(-) (limited to 'src') diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp index 174ea38b..8e7d9eb5 100644 --- a/src/game/client/components/menus.cpp +++ b/src/game/client/components/menus.cpp @@ -141,8 +141,6 @@ void CMenus::DoButton_KeySelect(const void *pID, const char *pText, int Checked, int CMenus::DoButton_MenuTab(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Corners) { - vec4 ColorMod(1,1,1,1); - if(Checked) RenderTools()->DrawUIRect(pRect, ms_ColorTabbarActive, Corners, 10.0f); else @@ -152,17 +150,6 @@ int CMenus::DoButton_MenuTab(const void *pID, const char *pText, int Checked, co return UI()->DoButtonLogic(pID, pText, Checked, pRect); } - -int CMenus::DoButton_SettingsTab(const void *pID, const char *pText, int Checked, const CUIRect *pRect) -{ - if(Checked) - RenderTools()->DrawUIRect(pRect, ms_ColorTabbarActive, CUI::CORNER_R, 10.0f); - else - RenderTools()->DrawUIRect(pRect, ms_ColorTabbarInactive, CUI::CORNER_R, 10.0f); - UI()->DoLabel(pRect, pText, pRect->h*ms_FontmodHeight, 0); - return UI()->DoButtonLogic(pID, pText, Checked, pRect); -} - int CMenus::DoButton_GridHeader(const void *pID, const char *pText, int Checked, const CUIRect *pRect) //void CMenus::ui_draw_grid_header(const void *id, const char *text, int checked, const CUIRect *r, const void *extra) { @@ -174,18 +161,6 @@ int CMenus::DoButton_GridHeader(const void *pID, const char *pText, int Checked, return UI()->DoButtonLogic(pID, pText, Checked, pRect); } -int CMenus::DoButton_ListRow(const void *pID, const char *pText, int Checked, const CUIRect *pRect) -{ - if(Checked) - { - CUIRect sr = *pRect; - sr.Margin(1.5f, &sr); - RenderTools()->DrawUIRect(&sr, vec4(1,1,1,0.5f), CUI::CORNER_ALL, 4.0f); - } - UI()->DoLabel(pRect, pText, pRect->h*ms_FontmodHeight, -1); - return UI()->DoButtonLogic(pID, pText, Checked, pRect); -} - int CMenus::DoButton_CheckBox_Common(const void *pID, const char *pText, const char *pBoxText, const CUIRect *pRect) //void CMenus::ui_draw_checkbox_common(const void *id, const char *text, const char *boxtext, const CUIRect *r, const void *extra) { diff --git a/src/game/client/components/menus.h b/src/game/client/components/menus.h index df9349e6..7b661360 100644 --- a/src/game/client/components/menus.h +++ b/src/game/client/components/menus.h @@ -36,7 +36,6 @@ class CMenus : public CComponent int DoButton_DemoPlayer_Sprite(const void *pID, int SpriteId, int Checked, const CUIRect *pRect); int DoButton_Menu(const void *pID, const char *pText, int Checked, const CUIRect *pRect); int DoButton_MenuTab(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Corners); - int DoButton_SettingsTab(const void *pID, const char *pText, int Checked, const CUIRect *pRect); int DoButton_CheckBox_Common(const void *pID, const char *pText, const char *pBoxText, const CUIRect *pRect); int DoButton_CheckBox(const void *pID, const char *pText, int Checked, const CUIRect *pRect); @@ -50,7 +49,6 @@ class CMenus : public CComponent int DoButton_BrowseIcon(int Checked, const CUIRect *pRect); int DoButton_GridHeader(const void *pID, const char *pText, int Checked, const CUIRect *pRect); - int DoButton_ListRow(const void *pID, const char *pText, int Checked, const CUIRect *pRect); //static void ui_draw_browse_icon(int what, const CUIRect *r); //static void ui_draw_grid_header(const void *id, const char *text, int checked, const CUIRect *r, const void *extra); diff --git a/src/game/client/components/menus_ingame.cpp b/src/game/client/components/menus_ingame.cpp index 236a25dc..fcec7e5b 100644 --- a/src/game/client/components/menus_ingame.cpp +++ b/src/game/client/components/menus_ingame.cpp @@ -374,7 +374,7 @@ void CMenus::RenderServerControl(CUIRect MainView) { TabBar.HSplitTop(10, &Button, &TabBar); TabBar.HSplitTop(26, &Button, &TabBar); - if(DoButton_SettingsTab(paTabs[i], paTabs[i], s_ControlPage == i, &Button)) + if(DoButton_MenuTab(paTabs[i], paTabs[i], s_ControlPage == i, &Button, CUI::CORNER_R)) { s_ControlPage = i; m_CallvoteSelectedPlayer = -1; diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp index 45e99522..fc5f01f1 100644 --- a/src/game/client/components/menus_settings.cpp +++ b/src/game/client/components/menus_settings.cpp @@ -775,7 +775,7 @@ void CMenus::RenderSettings(CUIRect MainView) { TabBar.HSplitTop(10, &Button, &TabBar); TabBar.HSplitTop(26, &Button, &TabBar); - if(DoButton_SettingsTab(aTabs[i], aTabs[i], s_SettingsPage == i, &Button)) + if(DoButton_MenuTab(aTabs[i], aTabs[i], s_SettingsPage == i, &Button, CUI::CORNER_R)) s_SettingsPage = i; } diff --git a/src/game/client/ui.cpp b/src/game/client/ui.cpp index 2895b717..0759d0c1 100644 --- a/src/game/client/ui.cpp +++ b/src/game/client/ui.cpp @@ -308,21 +308,21 @@ int CUI::DoButton(const void *id, const char *text, int checked, const CUIRect * return ret; }*/ -void CUI::DoLabel(const CUIRect *r, const char *pText, float size, int Align, int MaxWidth) +void CUI::DoLabel(const CUIRect *r, const char *pText, float Size, int Align, int MaxWidth) { // TODO: FIX ME!!!! //Graphics()->BlendNormal(); - size *= Scale(); + Size *= Scale(); if(Align == 0) { - float tw = TextRender()->TextWidth(0, size, pText, MaxWidth); - TextRender()->Text(0, r->x + r->w/2-tw/2, r->y - size/10, size, pText, MaxWidth); + float tw = TextRender()->TextWidth(0, Size, pText, MaxWidth); + TextRender()->Text(0, r->x + r->w/2-tw/2, r->y - Size/10, Size, pText, MaxWidth); } else if(Align < 0) - TextRender()->Text(0, r->x, r->y - size/10, size, pText, MaxWidth); + TextRender()->Text(0, r->x, r->y - Size/10, Size, pText, MaxWidth); else if(Align > 0) { - float tw = TextRender()->TextWidth(0, size, pText, MaxWidth); - TextRender()->Text(0, r->x + r->w-tw, r->y - size/10, size, pText, MaxWidth); + float tw = TextRender()->TextWidth(0, Size, pText, MaxWidth); + TextRender()->Text(0, r->x + r->w-tw, r->y - Size/10, Size, pText, MaxWidth); } } -- cgit 1.4.1