diff options
| author | oy <Tom_Adams@web.de> | 2010-10-11 01:36:46 +0200 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2010-10-11 01:36:46 +0200 |
| commit | de7504282c372a391bca19bb664b9ccf22fad47b (patch) | |
| tree | 1fe9ba1454264bd84d90917a80a51c44537b59ce /src/game/client | |
| parent | b65a26fe93e54af74d6304e66ec5942ecf4c48e8 (diff) | |
| download | zcatch-de7504282c372a391bca19bb664b9ccf22fad47b.tar.gz zcatch-de7504282c372a391bca19bb664b9ccf22fad47b.zip | |
made edit boxes scrollable. Closes #96
Diffstat (limited to 'src/game/client')
| -rw-r--r-- | src/game/client/components/menus.cpp | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp index 05eb975b..33dcbb99 100644 --- a/src/game/client/components/menus.cpp +++ b/src/game/client/components/menus.cpp @@ -220,7 +220,10 @@ int CMenus::DoEditBox(void *pID, const CUIRect *pRect, char *pStr, unsigned StrS { int Inside = UI()->MouseInside(pRect); bool ReturnValue = false; + bool UpdateOffset = false; static int s_AtIndex = 0; + static bool s_DoScroll = false; + static float s_ScrollStart = 0.0f; if(UI()->LastActiveItem() == pID) { @@ -230,6 +233,8 @@ int CMenus::DoEditBox(void *pID, const CUIRect *pRect, char *pStr, unsigned StrS if(Inside && UI()->MouseButton(0)) { + s_DoScroll = true; + s_ScrollStart = UI()->MouseX(); int MxRel = (int)(UI()->MouseX() - pRect->x); for(int i = 1; i <= Len; i++) @@ -244,6 +249,24 @@ int CMenus::DoEditBox(void *pID, const CUIRect *pRect, char *pStr, unsigned StrS s_AtIndex = Len; } } + else if(!UI()->MouseButton(0)) + s_DoScroll = false; + else if(s_DoScroll) + { + // do scrolling + if(UI()->MouseX() < pRect->x && s_ScrollStart-UI()->MouseX() > 10.0f) + { + s_AtIndex = max(0, s_AtIndex-1); + s_ScrollStart = UI()->MouseX(); + UpdateOffset = true; + } + else if(UI()->MouseX() > pRect->x+pRect->w && UI()->MouseX()-s_ScrollStart > 10.0f) + { + s_AtIndex = min(Len, s_AtIndex+1); + s_ScrollStart = UI()->MouseX(); + UpdateOffset = true; + } + } for(int i = 0; i < m_NumInputEvents; i++) { @@ -257,7 +280,10 @@ int CMenus::DoEditBox(void *pID, const CUIRect *pRect, char *pStr, unsigned StrS if(UI()->ActiveItem() == pID) { if(!UI()->MouseButton(0)) + { + s_DoScroll = false; UI()->SetActiveItem(0); + } } else if(UI()->HotItem() == pID) { @@ -292,7 +318,7 @@ int CMenus::DoEditBox(void *pID, const CUIRect *pRect, char *pStr, unsigned StrS } // check if the text has to be moved - if(UI()->LastActiveItem() == pID && !JustGotActive && m_NumInputEvents) + if(UI()->LastActiveItem() == pID && !JustGotActive && (UpdateOffset || m_NumInputEvents)) { float w = TextRender()->TextWidth(0, FontSize, pDisplayStr, s_AtIndex)*UI()->Scale(); if(w-*Offset > Textbox.w) |