mirror of
https://gitea.wildfiregames.com/0ad/0ad
synced 2026-06-16 05:13:58 -07:00
dfb4598186
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
59 lines
1.5 KiB
C++
59 lines
1.5 KiB
C++
/* Copyright (C) 2025 Wildfire Games.
|
|
* This file is part of 0 A.D.
|
|
*
|
|
* 0 A.D. is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* 0 A.D. is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "precompiled.h"
|
|
#include "FontMetrics.h"
|
|
|
|
#include "graphics/Font.h"
|
|
#include "graphics/FontManager.h"
|
|
#include "ps/Filesystem.h"
|
|
#include "ps/CLogger.h"
|
|
#include "renderer/Renderer.h"
|
|
|
|
CFontMetrics::CFontMetrics(CStrIntern font)
|
|
{
|
|
m_Font = g_Renderer.GetFontManager().LoadFont(font);
|
|
}
|
|
|
|
float CFontMetrics::GetHeight() const
|
|
{
|
|
if (!m_Font)
|
|
return 6;
|
|
return m_Font->GetHeight();
|
|
}
|
|
|
|
float CFontMetrics::GetCharacterWidth(wchar_t c) const
|
|
{
|
|
if (!m_Font)
|
|
return 6;
|
|
return m_Font->GetCharacterWidth(c);
|
|
}
|
|
|
|
void CFontMetrics::CalculateStringSize(const wchar_t* string, float& w, float& h) const
|
|
{
|
|
if (!m_Font)
|
|
w = h = 0;
|
|
else
|
|
m_Font->CalculateStringSize(string, w, h);
|
|
}
|
|
|
|
float CFontMetrics::GetCapHeight()
|
|
{
|
|
if (!m_Font)
|
|
return 0.0f;
|
|
return m_Font->GetCapHeight();
|
|
}
|