|
|
@ -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);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|