edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix scroll bar (fixes #3347)

Browse source
This commit is contained in:
def 2020-11-21 18:30:24 +01:00
parent 1883546939
commit bb43660cd4
4 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/game/client/components/menus.cpp
View file

@ -2650,7 +2650,7 @@ bool CMenus::HandleListInputs(const CUIRect &View, float &ScrollValue, const flo
{
int NewIndex = -1;
int Num = (int)(View.h / ElemHeight) + 1;
int ScrollNum = NumElems - Num + 1;
int ScrollNum = maximum(NumElems - Num + 1, 0);
if(ScrollNum > 0)
{
if(pScrollOffset && *pScrollOffset >= 0)
@ -2663,18 +2663,9 @@ bool CMenus::HandleListInputs(const CUIRect &View, float &ScrollValue, const flo
if(Input()->KeyPress(KEY_MOUSE_WHEEL_DOWN) && UI()->MouseInside(&View))
ScrollValue += 3.0f / ScrollNum;
}
else
ScrollNum = 0;
if(ScrollValue < 0)
ScrollValue = 0;
if(ScrollValue > 1)
ScrollValue = 1;
if(SelectedIndex < 0)
SelectedIndex = 0;
if(SelectedIndex >= NumElems)
SelectedIndex = NumElems;
ScrollValue = clamp(ScrollValue, 0.0f, 1.0f);
SelectedIndex = clamp(SelectedIndex, 0, NumElems);
for(int i = 0; i < m_NumInputEvents; i++)
{

2
src/game/client/components/menus_browser.cpp
View file

@ -190,7 +190,7 @@ void CMenus::RenderServerbrowserServerList(CUIRect View)
CUIRect OriginalView = View;
int Num = (int)(View.h / s_aCols[0].m_Rect.h) + 1;
int ScrollNum = NumServers - Num + 1;
int ScrollNum = maximum(NumServers - Num + 1, 0);
View.y -= s_ScrollValue * ScrollNum * s_aCols[0].m_Rect.h;
int NewSelected = -1;

9
src/game/client/components/menus_demo.cpp
View file

@ -569,13 +569,8 @@ void CMenus::UiDoListboxStart(const void *pID, const CUIRect *pRect, float RowHe
gs_ListBoxScrollValue += Num == 1 ? 0.1f : 3.0f / Num;
}
if(gs_ListBoxScrollValue < 0.0f)
gs_ListBoxScrollValue = 0.0f;
if(gs_ListBoxScrollValue > 1.0f)
gs_ListBoxScrollValue = 1.0f;
Scroll.HMargin(5.0f, &Scroll);
gs_ListBoxScrollValue = DoScrollbarV(pID, &Scroll, gs_ListBoxScrollValue);
gs_ListBoxScrollValue = clamp(DoScrollbarV(pID, &Scroll, gs_ListBoxScrollValue), 0.0f, 1.0f);
// the list
gs_ListBoxView = gs_ListBoxOriginalView;
@ -1078,7 +1073,7 @@ void CMenus::RenderDemoList(CUIRect MainView)
CUIRect OriginalView = ListBox;
int Num = (int)(ListBox.h / s_aCols[0].m_Rect.h) + 1;
int ScrollNum = m_lDemos.size() - Num + 1;
int ScrollNum = maximum(m_lDemos.size() - Num + 1, 0);
ListBox.y -= s_ScrollValue * ScrollNum * s_aCols[0].m_Rect.h;
int NewSelected = -1;

2
src/game/client/components/menus_ingame.cpp
View file

@ -1029,7 +1029,7 @@ void CMenus::RenderGhost(CUIRect MainView)
CUIRect OriginalView = View;
int Num = (int)(View.h / s_aCols[0].m_Rect.h) + 1;
int ScrollNum = NumGhosts - Num + 1;
int ScrollNum = maximum(NumGhosts - Num + 1, 0);
View.y -= s_ScrollValue * ScrollNum * s_aCols[0].m_Rect.h;
int NewSelected = -1;