zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-22 04:01:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

make things compile again with the font substitution wrapper.

Browse source
This commit is contained in:
Christoph Oelckers 2024-01-08 17:26:43 +01:00
parent 0f9d3b4a66
commit 216f477b90
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/ZWidget/src/core/canvas.cpp
View file

@ -46,9 +46,9 @@ public:
class CanvasFont
{
public:
CanvasFont(const std::string& fontname, double height) : fontname(fontname), height(height)
CanvasFont(const std::string& fontname, double height, std::vector<uint8_t>& _data) : fontname(fontname), height(height)
{
ttf = std::make_unique<TrueTypeFont>(LoadWidgetFontData(fontname));
ttf = std::make_unique<TrueTypeFont>(_data);
textmetrics = ttf->GetTextMetrics(height);
}
@ -310,7 +310,7 @@ public:
return nullptr;
}
SFT_LMetrics& GetTextMetrics()
TrueTypeTextMetrics& GetTextMetrics()
{
return fonts[0].font->textmetrics;
}
@ -398,7 +398,7 @@ BitmapCanvas::BitmapCanvas(DisplayWindow* window) : window(window)
uiscale = window->GetDpiScale();
uint32_t white = 0xffffffff;
whiteTexture = createTexture(1, 1, &white);
font = std::make_unique<CanvasFontGroup>("NotoSans", 16.0 * uiscale);
font = std::make_unique<CanvasFontGroup>("NotoSans", 15.0 * uiscale);
}
BitmapCanvas::~BitmapCanvas()