mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Align font height, capHeight to FreeType metrics

Browse Source 
Previously, `height` was derived from a manually chosen glyph (typically
"I", Standard Cap Height) using FontBuilder, and `lineSpacing` was used
inconsistently for layout logic as a height.

Now, with the FreeType-based system:
- `height` uses `face->size->metrics.height`, which includes the
  recommended line height with internal leading/line gap as defined by
  the font designer.
- `lineSpacing` was removed
- `GetCapHeight` uses the standard cap height + ascender to have a
  visual virtual alignment

This change standardizes font metric usage:
- Use `height` for vertical layout and line progression.
- Use `GetCapheight` in layout engines like `CGUIText` or `CGUIString`,

This ensures better alignment across fonts and consistent spacing in
multiline text rendering.

Fixes: #7962
This commit is contained in:
trompetin17
2025-05-28 22:37:37 -05:00
parent 638d4d28d2
commit dfb4598186
11 changed files with 89 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/Font.cpp
+20 -12
View File
@@ -28,6 +28,7 @@
#include <numeric>
#include <string>
#include <vector>
#include <cstdlib>
namespace
{
@@ -74,14 +75,16 @@ void CFont::GlyphMap::set(u16 codepoint, const GlyphData& glyph)
(*m_Data[codepoint >> 8])[codepoint & 0xff].defined = 1;
}
float CFont::GetLineSpacing() const {
return m_LineSpacing / m_Scale;
}
float CFont::GetHeight() const {
return m_Height / m_Scale;
}
float CFont::GetCapHeight()
{
const CFont::GlyphData* g{GetGlyph(L'I')};
return (g ? g->yadvance : 0) + std::abs(FPosF26Dot6ToFloat(m_Faces.front()->size->metrics.descender));
}
float CFont::GetCharacterWidth(wchar_t c)
{
PROFILE2("GetCharacterWidth font texture generate");
@@ -94,11 +97,13 @@ void CFont::CalculateStringSize(const wchar_t* string, float& width, float& heig
{
PROFILE2("CalculateStringSize font texture generate");
width = 0;
height = GetHeight();
height = 0;
// Compute the width as the width of the longest line.
std::wstring original{string};
std::wistringstream stream{string};
std::wstring line;
bool firstLine{true};
while (std::getline(stream, line))
{
FT_UInt glyphIndexStorage{0};
@@ -129,8 +134,15 @@ void CFont::CalculateStringSize(const wchar_t* string, float& width, float& heig
};
width = std::max(width, lineWidth);
height += GetLineSpacing();
if (!firstLine || !line.empty())
height += firstLine ? GetCapHeight() : GetHeight();
firstLine = false;
}
if (original.back() == L'\n')
height += GetHeight();
}
bool CFont::SetFontParams(const std::string& fontName, float size, float strokeWidth, float scale)
@@ -204,15 +216,10 @@ bool CFont::AddFontFromPath(const OsPath& fontPath)
return false;
}
// Get the height of the font.
if(m_Faces.empty())
{
// Get the height of the font.
m_Height = FPosF26Dot6ToFloat(face->size->metrics.height);
// Get the line spacing of the font.
m_LineSpacing = FPosF26Dot6ToFloat(face->size->metrics.ascender - face->size->metrics.descender);
}
// Add the fallback font to the list.
m_Faces.push_back({face, &ftFaceDeleter});
@@ -385,6 +392,7 @@ const CFont::GlyphData* CFont::ExtractAndGenerateGlyph(u16 codepoint)
gd.y1 = m_StrokeWidth / m_Scale;
gd.xadvance = glyphW / m_Scale;
gd.yadvance = FPosF26Dot6ToFloat(slot->metrics.height) / m_Scale;
gd.defined = 1;
gd.face = faceToUse;