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

Scroll fix, protect scrolling 2 windows at the same time

Browse source
This commit is contained in:
PsychoGod 2011-05-10 20:16:22 +03:00 committed by oy
parent 896ef2f235
commit 210d98666c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -154,9 +154,9 @@ void CMenus::RenderServerbrowserServerList(CUIRect View)
int ScrollNum = NumServers-Num+1; int ScrollNum = NumServers-Num+1;
if(ScrollNum > 0) if(ScrollNum > 0)
{ {
if(Input()->KeyPresses(KEY_MOUSE_WHEEL_UP)) if(Input()->KeyPresses(KEY_MOUSE_WHEEL_UP) && UI()->MouseInside(&View))
s_ScrollValue -= 3.0f/ScrollNum; s_ScrollValue -= 3.0f/ScrollNum;
if(Input()->KeyPresses(KEY_MOUSE_WHEEL_DOWN)) if(Input()->KeyPresses(KEY_MOUSE_WHEEL_DOWN) && UI()->MouseInside(&View))
s_ScrollValue += 3.0f/ScrollNum; s_ScrollValue += 3.0f/ScrollNum;
} }
else else

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

@ -289,9 +289,9 @@ void CMenus::UiDoListboxStart(const void *pID, const CUIRect *pRect, float RowHe
Num = 0; Num = 0;
if(Num > 0) if(Num > 0)
{ {
if(Input()->KeyPresses(KEY_MOUSE_WHEEL_UP)) if(Input()->KeyPresses(KEY_MOUSE_WHEEL_UP) && UI()->MouseInside(&View))
gs_ListBoxScrollValue -= 3.0f/Num; gs_ListBoxScrollValue -= 3.0f/Num;
if(Input()->KeyPresses(KEY_MOUSE_WHEEL_DOWN)) if(Input()->KeyPresses(KEY_MOUSE_WHEEL_DOWN) && UI()->MouseInside(&View))
gs_ListBoxScrollValue += 3.0f/Num; gs_ListBoxScrollValue += 3.0f/Num;
if(gs_ListBoxScrollValue < 0.0f) gs_ListBoxScrollValue = 0.0f; if(gs_ListBoxScrollValue < 0.0f) gs_ListBoxScrollValue = 0.0f;