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

scroll the possible commands in the console's tab completion if the wanted one is out of sight. Closes #105

Browse source
This commit is contained in:
oy 2010-06-19 13:48:01 +02:00
parent ea64b0d7b3
commit b790634a2d
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/game/client/components/console.cpp
View file

@ -51,6 +51,7 @@ CGameConsole::CInstance::CInstance(int Type)
m_aCompletionBuffer[0] = 0; m_aCompletionBuffer[0] = 0;
m_CompletionChosen = -1; m_CompletionChosen = -1;
m_CompletionRenderOffset = 0.0f;
m_pCommand = 0x0; m_pCommand = 0x0;
} }
@ -241,6 +242,8 @@ struct CRenderInfo
const char *m_pCurrentCmd; const char *m_pCurrentCmd;
int m_WantedCompletion; int m_WantedCompletion;
int m_EnumCount; int m_EnumCount;
float m_Offset;
float m_Width;
}; };
void CGameConsole::PossibleCommandsRenderCallback(const char *pStr, void *pUser) void CGameConsole::PossibleCommandsRenderCallback(const char *pStr, void *pUser)
@ -256,6 +259,12 @@ void CGameConsole::PossibleCommandsRenderCallback(const char *pStr, void *pUser)
pInfo->m_pSelf->RenderTools()->DrawRoundRect(pInfo->m_Cursor.m_X-3, pInfo->m_Cursor.m_Y, tw+5, pInfo->m_Cursor.m_FontSize+4, pInfo->m_Cursor.m_FontSize/3); pInfo->m_pSelf->RenderTools()->DrawRoundRect(pInfo->m_Cursor.m_X-3, pInfo->m_Cursor.m_Y, tw+5, pInfo->m_Cursor.m_FontSize+4, pInfo->m_Cursor.m_FontSize/3);
pInfo->m_pSelf->Graphics()->QuadsEnd(); pInfo->m_pSelf->Graphics()->QuadsEnd();
// scroll when out of sight
if(pInfo->m_Cursor.m_X < 3.0f)
pInfo->m_Offset = 0.0f;
else if(pInfo->m_Cursor.m_X+tw > pInfo->m_Width)
pInfo->m_Offset -= pInfo->m_Width/2;
pInfo->m_pSelf->TextRender()->TextColor(0.05f, 0.05f, 0.05f,1); pInfo->m_pSelf->TextRender()->TextColor(0.05f, 0.05f, 0.05f,1);
pInfo->m_pSelf->TextRender()->TextEx(&pInfo->m_Cursor, pStr, -1); pInfo->m_pSelf->TextRender()->TextEx(&pInfo->m_Cursor, pStr, -1);
} }
@ -386,8 +395,10 @@ void CGameConsole::OnRender()
Info.m_pSelf = this; Info.m_pSelf = this;
Info.m_WantedCompletion = pConsole->m_CompletionChosen; Info.m_WantedCompletion = pConsole->m_CompletionChosen;
Info.m_EnumCount = 0; Info.m_EnumCount = 0;
Info.m_Offset = pConsole->m_CompletionRenderOffset;
Info.m_Width = Screen.w;
Info.m_pCurrentCmd = pConsole->m_aCompletionBuffer; Info.m_pCurrentCmd = pConsole->m_aCompletionBuffer;
TextRender()->SetCursor(&Info.m_Cursor, x, y+12.0f, FontSize, TEXTFLAG_RENDER); TextRender()->SetCursor(&Info.m_Cursor, x+Info.m_Offset, y+12.0f, FontSize, TEXTFLAG_RENDER);
const char *pPrompt = "> "; const char *pPrompt = "> ";
if(m_ConsoleType) if(m_ConsoleType)
@ -438,6 +449,7 @@ void CGameConsole::OnRender()
if(pConsole->m_Input.GetString()[0] != 0) if(pConsole->m_Input.GetString()[0] != 0)
{ {
m_pConsole->PossibleCommands(pConsole->m_aCompletionBuffer, pConsole->m_CompletionFlagmask, PossibleCommandsRenderCallback, &Info); m_pConsole->PossibleCommands(pConsole->m_aCompletionBuffer, pConsole->m_CompletionFlagmask, PossibleCommandsRenderCallback, &Info);
pConsole->m_CompletionRenderOffset = Info.m_Offset;
if(Info.m_EnumCount <= 0) if(Info.m_EnumCount <= 0)
{ {

1
src/game/client/components/console.h
View file

@ -24,6 +24,7 @@ class CGameConsole : public CComponent
char m_aCompletionBuffer[128]; char m_aCompletionBuffer[128];
int m_CompletionChosen; int m_CompletionChosen;
int m_CompletionFlagmask; int m_CompletionFlagmask;
float m_CompletionRenderOffset;
IConsole::CCommandInfo *m_pCommand; IConsole::CCommandInfo *m_pCommand;