diff options
| author | PsychoGod <temnbiumulllka@gmail.com> | 2011-05-10 20:16:22 +0300 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-05-17 01:15:54 +0200 |
| commit | 210d98666ca63c671c22b6a835392978adad5a0c (patch) | |
| tree | 37dc72cd347d6ca9ca4730021b7d33e011d382d0 /src/game/client | |
| parent | 896ef2f2355d2dbc370a0bba89ba1664ce10c190 (diff) | |
| download | zcatch-210d98666ca63c671c22b6a835392978adad5a0c.tar.gz zcatch-210d98666ca63c671c22b6a835392978adad5a0c.zip | |
Scroll fix, protect scrolling 2 windows at the same time
Diffstat (limited to 'src/game/client')
| -rw-r--r-- | src/game/client/components/menus_browser.cpp | 4 | ||||
| -rw-r--r-- | src/game/client/components/menus_demo.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/game/client/components/menus_browser.cpp b/src/game/client/components/menus_browser.cpp index 1245a50b..09c8c494 100644 --- a/src/game/client/components/menus_browser.cpp +++ b/src/game/client/components/menus_browser.cpp @@ -154,9 +154,9 @@ void CMenus::RenderServerbrowserServerList(CUIRect View) int ScrollNum = NumServers-Num+1; 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; - if(Input()->KeyPresses(KEY_MOUSE_WHEEL_DOWN)) + if(Input()->KeyPresses(KEY_MOUSE_WHEEL_DOWN) && UI()->MouseInside(&View)) s_ScrollValue += 3.0f/ScrollNum; } else diff --git a/src/game/client/components/menus_demo.cpp b/src/game/client/components/menus_demo.cpp index 7f2a7186..1539f3a6 100644 --- a/src/game/client/components/menus_demo.cpp +++ b/src/game/client/components/menus_demo.cpp @@ -289,9 +289,9 @@ void CMenus::UiDoListboxStart(const void *pID, const CUIRect *pRect, float RowHe 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; - if(Input()->KeyPresses(KEY_MOUSE_WHEEL_DOWN)) + if(Input()->KeyPresses(KEY_MOUSE_WHEEL_DOWN) && UI()->MouseInside(&View)) gs_ListBoxScrollValue += 3.0f/Num; if(gs_ListBoxScrollValue < 0.0f) gs_ListBoxScrollValue = 0.0f; |