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

fixed wrapping problems when rendering console input

Browse source
This commit is contained in:
oy 2012-04-21 00:23:48 +02:00
parent 14cd83de10
commit 86cd0cefd7
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/client/text.cpp
View file

@ -639,7 +639,7 @@ public:
Compare.m_Y = DrawY; Compare.m_Y = DrawY;
Compare.m_Flags &= ~TEXTFLAG_RENDER; Compare.m_Flags &= ~TEXTFLAG_RENDER;
Compare.m_LineWidth = -1; Compare.m_LineWidth = -1;
TextEx(&Compare, pText, Wlen); TextEx(&Compare, pCurrent, Wlen);
if(Compare.m_X-DrawX > pCursor->m_LineWidth) if(Compare.m_X-DrawX > pCursor->m_LineWidth)
{ {

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

@ -434,12 +434,6 @@ void CGameConsole::OnRender()
x = Cursor.m_X; x = Cursor.m_X;
// render console input (wrap line)
int Lines = TextRender()->TextLineCount(0, FontSize, pConsole->m_Input.GetString(), Screen.w - 10.0f - x);
y -= (Lines - 1) * FontSize;
TextRender()->SetCursor(&Cursor, x, y, FontSize, TEXTFLAG_RENDER);
Cursor.m_LineWidth = Screen.w - 10.0f - x;
//hide rcon password //hide rcon password
char aInputString[256]; char aInputString[256];
str_copy(aInputString, pConsole->m_Input.GetString(), sizeof(aInputString)); str_copy(aInputString, pConsole->m_Input.GetString(), sizeof(aInputString));
@ -449,10 +443,22 @@ void CGameConsole::OnRender()
aInputString[i] = '*'; aInputString[i] = '*';
} }
// render console input (wrap line)
TextRender()->SetCursor(&Cursor, x, y, FontSize, 0);
Cursor.m_LineWidth = Screen.w - 10.0f - x;
TextRender()->TextEx(&Cursor, aInputString, pConsole->m_Input.GetCursorOffset());
TextRender()->TextEx(&Cursor, aInputString+pConsole->m_Input.GetCursorOffset(), -1);
int Lines = Cursor.m_LineCount;
y -= (Lines - 1) * FontSize;
TextRender()->SetCursor(&Cursor, x, y, FontSize, TEXTFLAG_RENDER);
Cursor.m_LineWidth = Screen.w - 10.0f - x;
TextRender()->TextEx(&Cursor, aInputString, pConsole->m_Input.GetCursorOffset()); TextRender()->TextEx(&Cursor, aInputString, pConsole->m_Input.GetCursorOffset());
static float MarkerOffset = TextRender()->TextWidth(0, FontSize, "|", -1)/3; static float MarkerOffset = TextRender()->TextWidth(0, FontSize, "|", -1)/3;
CTextCursor Marker = Cursor; CTextCursor Marker = Cursor;
Marker.m_X -= MarkerOffset; Marker.m_X -= MarkerOffset;
Marker.m_LineWidth = -1;
TextRender()->TextEx(&Marker, "|", -1); TextRender()->TextEx(&Marker, "|", -1);
TextRender()->TextEx(&Cursor, aInputString+pConsole->m_Input.GetCursorOffset(), -1); TextRender()->TextEx(&Cursor, aInputString+pConsole->m_Input.GetCursorOffset(), -1);