github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-24 07:05:34 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Finish LUS bump, including SoH-side fix for font free crash.

Browse source
This commit is contained in:
Malkierian 2025-07-08 13:11:19 -07:00
commit dabd23a5ee
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libultraship

@ -1 +1 @@
Subproject commit 5e33d3e7cd0396f847923cd6c471eaf324e90351 Subproject commit 7f737f8be9580980f5a1fe7784d6e1045f0309da

4
soh/soh/OTRGlobals.cpp
View file

@ -1678,7 +1678,9 @@ ImFont* OTRGlobals::CreateFontWithSize(float size, std::string fontPath) {
initData->Path = fontPath; initData->Path = fontPath;
std::shared_ptr<Ship::Font> fontData = std::static_pointer_cast<Ship::Font>( std::shared_ptr<Ship::Font> fontData = std::static_pointer_cast<Ship::Font>(
Ship::Context::GetInstance()->GetResourceManager()->LoadResource(fontPath, false, initData)); Ship::Context::GetInstance()->GetResourceManager()->LoadResource(fontPath, false, initData));
font = mImGuiIo->Fonts->AddFontFromMemoryTTF(fontData->Data, fontData->DataSize, size); ImFontConfig fontConf;
fontConf.FontDataOwnedByAtlas = false;
font = mImGuiIo->Fonts->AddFontFromMemoryTTF(fontData->Data, fontData->DataSize, size, &fontConf);
} }
// FontAwesome fonts need to have their sizes reduced by 2.0f/3.0f in order to align correctly // FontAwesome fonts need to have their sizes reduced by 2.0f/3.0f in order to align correctly
float iconFontSize = size * 2.0f / 3.0f; float iconFontSize = size * 2.0f / 3.0f;