mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: [windows] cache the actually loaded font name

pull/10281/head
glx22 2022-12-22 19:50:05 +01:00 committed by Loïc Guilloux
parent af3df959c2
commit e6c857cdba
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/os/windows/font_win32.cpp
View File

@ -378,7 +378,6 @@ Win32FontCache::Win32FontCache(FontSize fs, const LOGFONT &logfont, int pixels)
{ {
this->dc = CreateCompatibleDC(nullptr); this->dc = CreateCompatibleDC(nullptr);
this->SetFontSize(fs, pixels); this->SetFontSize(fs, pixels);
this->fontname = FS2OTTD(this->logfont.lfFaceName);
} }
Win32FontCache::~Win32FontCache() Win32FontCache::~Win32FontCache()
@ -441,7 +440,9 @@ void Win32FontCache::SetFontSize(FontSize fs, int pixels)
this->glyph_size.cx = otm->otmTextMetrics.tmMaxCharWidth; this->glyph_size.cx = otm->otmTextMetrics.tmMaxCharWidth;
this->glyph_size.cy = otm->otmTextMetrics.tmHeight; this->glyph_size.cy = otm->otmTextMetrics.tmHeight;
Debug(fontcache, 2, "Loaded font '{}' with size {}", FS2OTTD((LPWSTR)((BYTE *)otm + (ptrdiff_t)otm->otmpFullName)), pixels); this->fontname = FS2OTTD((LPWSTR)((BYTE *)otm + (ptrdiff_t)otm->otmpFaceName));
Debug(fontcache, 2, "Loaded font '{}' with size {}", this->fontname, pixels);
} }
/** /**

2
src/os/windows/font_win32.h
View File

@ -21,7 +21,7 @@ private:
HDC dc = nullptr; ///< Cached GDI device context. HDC dc = nullptr; ///< Cached GDI device context.
HGDIOBJ old_font; ///< Old font selected into the GDI context. HGDIOBJ old_font; ///< Old font selected into the GDI context.
SIZE glyph_size; ///< Maximum size of regular glyphs. SIZE glyph_size; ///< Maximum size of regular glyphs.
std::string fontname; ///< Cached copy of this->logfont.lfFaceName std::string fontname; ///< Cached copy of loaded font facename
void SetFontSize(FontSize fs, int pixels); void SetFontSize(FontSize fs, int pixels);