diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp index 7c91e7375..ef4f84022 100644 --- a/src/game/client/components/menus.cpp +++ b/src/game/client/components/menus.cpp @@ -923,11 +923,7 @@ float CMenus::DoScrollbarV(const void *pID, const CUIRect *pRect, float Current) UI()->SetHotItem(pID); // render - RenderTools()->DrawUIRect(pRect, ColorRGBA(0, 0, 0, 0.25f), CUI::CORNER_ALL, 2.5f); - - CUIRect Slider = Handle; - RenderTools()->DrawUIRect(&Slider, ColorRGBA(1, 1, 1, 0.25f), CUI::CORNER_ALL, 2.5f); - Slider.Margin(2, &Slider); + RenderTools()->DrawUIRect(pRect, ColorRGBA(0, 0, 0, 0.25f), CUI::CORNER_ALL, 5.0f); float ColorSlider = 0; @@ -938,7 +934,7 @@ float CMenus::DoScrollbarV(const void *pID, const CUIRect *pRect, float Current) else ColorSlider = 0.75f; - RenderTools()->DrawUIRect(&Slider, ColorRGBA(ColorSlider, ColorSlider, ColorSlider, 0.75f), CUI::CORNER_ALL, 2.5f); + RenderTools()->DrawUIRect(&Handle, ColorRGBA(ColorSlider, ColorSlider, ColorSlider, 0.75f), CUI::CORNER_ALL, 5.0f); return ReturnValue; } diff --git a/src/game/client/components/menus_demo.cpp b/src/game/client/components/menus_demo.cpp index 1e4ef3ab9..6296734b2 100644 --- a/src/game/client/components/menus_demo.cpp +++ b/src/game/client/components/menus_demo.cpp @@ -522,22 +522,18 @@ void CMenus::UiDoListboxStart(const void *pID, const CUIRect *pRect, float RowHe if(!LogicOnly) { // draw header + /* View.HSplitTop(ms_ListheaderHeight, &Header, &View); RenderTools()->DrawUIRect(&Header, ColorRGBA(1, 1, 1, 0.25f), CUI::CORNER_T, 5.0f); UI()->DoLabel(&Header, pTitle, Header.h * ms_FontmodHeight, 0); - - // draw footers - View.HSplitBottom(ms_ListheaderHeight, &View, &Footer); - RenderTools()->DrawUIRect(&Footer, ColorRGBA(1, 1, 1, 0.25f), CUI::CORNER_B, 5.0f); - Footer.VSplitLeft(10.0f, 0, &Footer); - UI()->DoLabel(&Footer, pBottomText, Header.h * ms_FontmodHeight, 0); + */ // background - RenderTools()->DrawUIRect(&View, ColorRGBA(0, 0, 0, 0.15f), 0, 0); + RenderTools()->DrawUIRect(&View, ColorRGBA(0, 0, 0, 0.15f), CUI::CORNER_ALL, 5.0f); } // prepare the scroll - View.VSplitRight(15, &View, &Scroll); + View.VSplitRight(10, &View, &Scroll); // setup the variables gs_ListBoxOriginalView = View; @@ -569,8 +565,8 @@ void CMenus::UiDoListboxStart(const void *pID, const CUIRect *pRect, float RowHe gs_ListBoxScrollValue += Num == 1 ? 0.1f : 3.0f / Num; } - Scroll.HMargin(5.0f, &Scroll); - gs_ListBoxScrollValue = clamp(DoScrollbarV(pID, &Scroll, clamp(gs_ListBoxScrollValue, 0.0f, 1.0f)), 0.0f, 1.0f); + //Scroll.HMargin(5.0f, &Scroll); + gs_ListBoxScrollValue = clamp(DoScrollbarV(pID, &Scroll, gs_ListBoxScrollValue), 0.0f, 1.0f); // the list gs_ListBoxView = gs_ListBoxOriginalView;