dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-16 05:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix exceeding input boundaries in console

Browse source 
After 734386ce9f the new font system calculate height and cap height,
previously was having some magic number. Now we are using cap height
divide 2 to give a more nice space.

Remove an extra pixel in the buffer and improves background color for
better reading and eye care.

This also support the change console font option added in d549cbeeaa

Fixes: #8351
This commit is contained in:
trompetin17 2025-11-03 13:12:21 -05:00 committed by Ralph Sennhauser
parent df9c6f510c
commit 8e820a988e
3 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/graphics/FontMetrics.cpp
View file

@ -56,7 +56,7 @@ void CFontMetrics::CalculateStringSize(const wchar_t* string, float& w, float& h
m_Font->CalculateStringSize(string, w, h);
}
float CFontMetrics::GetCapHeight()
float CFontMetrics::GetCapHeight() const
{
if (!m_Font)
return 0.0f;

2
source/graphics/FontMetrics.h
View file

@ -33,7 +33,7 @@ public:
CFontMetrics(CStrIntern font, CStrIntern locale);
float GetHeight() const;
float GetCapHeight();
float GetCapHeight() const;
float GetCharacterWidth(wchar_t c) const;
void CalculateStringSize(const wchar_t* string, float& w, float& h) const;

23
source/ps/CConsole.cpp
View file

@ -118,13 +118,14 @@ void CConsole::Init()
UpdateScreenSize(g_xres, g_yres);
// Calculate and store the line spacing
// Calculate and store the line spacing.
const CFontMetrics font{CStrIntern(m_consoleFont)};
m_FontHeight = font.GetHeight();
m_FontWidth = font.GetCharacterWidth(L'C');
m_CharsPerPage = static_cast<size_t>(g_xres / m_FontWidth);
// Offset by an arbitrary amount, to make it fit more nicely
m_FontOffset = 7.0f;
// Fonts constains two dimensions: the full height, and the cap height.
// We are adding some offset to move the text up a bit, so it looks better in the console.
m_FontOffset = font.GetCapHeight() / 2.f;
m_CursorBlinkRate = g_ConfigDB.Get("gui.cursorblinkrate", 0.5);
}
@ -249,18 +250,18 @@ void CConsole::DrawWindow(CCanvas2D& canvas)
for (CVector2D& point : points)
point += CVector2D{m_X, m_Y - (1.0f - m_VisibleFrac) * m_Height};
canvas.DrawRect(CRect(points[1], points[3]), CColor(0.0f, 0.0f, 0.5f, 0.6f));
canvas.DrawLine(points, 1.0f, CColor(0.5f, 0.5f, 0.0f, 0.6f));
canvas.DrawRect(CRect(points[1], points[3]), CColor(0.05f, 0.05f, 0.2f, 0.85f));
canvas.DrawLine(points, 1.0f, CColor(0.5f, 0.5f, 0.0f, 0.85f));
if (m_Height > m_FontHeight + 4)
if (m_Height > m_FontHeight + 2.0f * m_FontOffset)
{
points = {
CVector2D{0.0f, m_Height - m_FontHeight - 4.0f},
CVector2D{m_Width, m_Height - m_FontHeight - 4.0f}
CVector2D{0.0f, m_Height - m_FontHeight - 2.0f * m_FontOffset},
CVector2D{m_Width, m_Height - m_FontHeight - 2.0f * m_FontOffset}
};
for (CVector2D& point : points)
point += CVector2D{m_X, m_Y - (1.0f - m_VisibleFrac) * m_Height};
canvas.DrawLine(points, 1.0f, CColor(0.5f, 0.5f, 0.0f, 0.6f));
canvas.DrawLine(points, 1.0f, CColor(0.5f, 0.5f, 0.0f, 0.85f));
}
}
@ -283,7 +284,7 @@ void CConsole::DrawHistory(CTextRenderer& textRenderer)
{
textRenderer.Put(
9.0f,
m_Height - m_FontOffset - m_FontHeight * (i - m_MsgHistPos + 1),
m_Height - 3.0f * m_FontOffset - m_FontHeight * (i - m_MsgHistPos + 1),
it->c_str());
}
@ -299,7 +300,7 @@ void CConsole::DrawBuffer(CTextRenderer& textRenderer)
const CVector2D savedTranslate = textRenderer.GetTranslate();
textRenderer.Translate(2.0f, m_Height - m_FontOffset + 1.0f);
textRenderer.Translate(2.0f, m_Height - m_FontOffset);
textRenderer.SetCurrentColor(CColor(1.0f, 1.0f, 0.0f, 1.0f));
textRenderer.PutAdvance(L"]");