ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fallback behavior for bad use of DstFont values

Browse source
This commit is contained in:
Soreepeong 2024-01-19 08:11:33 +09:00
parent 63b16bcc7c
commit 0c2a722f83
1 changed files with 62 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

64
Dalamud/Interface/ManagedFontAtlas/Internals/FontAtlasFactory.Implementation.cs
View file

@ -209,7 +209,7 @@ internal sealed partial class FontAtlasFactory
private int buildIndex; private int buildIndex;
private bool buildQueued; private bool buildQueued;
private bool disposed = false; private bool disposed;
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="DalamudFontAtlas"/> class. /// Initializes a new instance of the <see cref="DalamudFontAtlas"/> class.
@ -612,6 +612,7 @@ internal sealed partial class FontAtlasFactory
var res = default(FontAtlasBuiltData); var res = default(FontAtlasBuiltData);
nint atlasPtr = 0; nint atlasPtr = 0;
BuildToolkit? toolkit = null;
try try
{ {
res = new(this, this.fontHandleManagers.Select(x => x.NewSubstance()), scale); res = new(this, this.fontHandleManagers.Select(x => x.NewSubstance()), scale);
@ -627,11 +628,44 @@ internal sealed partial class FontAtlasFactory
atlasPtr, atlasPtr,
sw.ElapsedMilliseconds); sw.ElapsedMilliseconds);
using var toolkit = res.CreateToolkit(this.factory, isAsync); toolkit = res.CreateToolkit(this.factory, isAsync);
this.BuildStepChange?.Invoke(toolkit); this.BuildStepChange?.Invoke(toolkit);
toolkit.PreBuildSubstances(); toolkit.PreBuildSubstances();
toolkit.PreBuild(); toolkit.PreBuild();
// Prevent NewImAtlas.ConfigData[].DstFont pointing to a font not owned by the new atlas,
// by making it add a font with default configuration first instead.
if (!ValidateMergeFontReferences(default))
{
Log.Warning(
"[{name}:{functionname}] 0x{ptr:X}: refering to fonts outside the new atlas; " +
"adding a default font, and using that as the merge target.",
this.Name,
nameof(this.RebuildFontsPrivateReal),
atlasPtr);
res.IsBuildInProgress = false;
toolkit.Dispose();
res.Dispose();
res = new(this, this.fontHandleManagers.Select(x => x.NewSubstance()), scale);
unsafe
{
atlasPtr = (nint)res.Atlas.NativePtr;
}
toolkit = res.CreateToolkit(this.factory, isAsync);
// PreBuildSubstances deals with toolkit.Add... function family. Do this first.
var defaultFont = toolkit.AddDalamudDefaultFont(InterfaceManager.DefaultFontSizePx, null);
this.BuildStepChange?.Invoke(toolkit);
toolkit.PreBuildSubstances();
toolkit.PreBuild();
_ = ValidateMergeFontReferences(defaultFont);
}
#if VeryVerboseLog #if VeryVerboseLog
Log.Verbose("[{name}:{functionname}] 0x{ptr:X}: Build (at {sw}ms)", this.Name, nameof(this.RebuildFontsPrivateReal), atlasPtr, sw.ElapsedMilliseconds); Log.Verbose("[{name}:{functionname}] 0x{ptr:X}: Build (at {sw}ms)", this.Name, nameof(this.RebuildFontsPrivateReal), atlasPtr, sw.ElapsedMilliseconds);
#endif #endif
@ -687,8 +721,34 @@ internal sealed partial class FontAtlasFactory
} }
finally finally
{ {
toolkit?.Dispose();
this.buildQueued = false; this.buildQueued = false;
} }
unsafe bool ValidateMergeFontReferences(ImFontPtr replacementDstFont)
{
var correct = true;
foreach (ref var configData in toolkit.NewImAtlas.ConfigDataWrapped().DataSpan)
{
var found = false;
foreach (ref var font in toolkit.Fonts.DataSpan)
{
if (configData.DstFont == font)
{
found = true;
break;
}
}
if (!found)
{
correct = false;
configData.DstFont = replacementDstFont;
}
}
return correct;
}
} }
private void OnRebuildRecommend() private void OnRebuildRecommend()