ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-15 21:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix inconsistencies

Browse source
This commit is contained in:
Soreepeong 2023-12-10 15:40:58 +09:00
parent 77536429d6
commit 3d576a0654
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Dalamud/Interface/ManagedFontAtlas/Internals/FontAtlasFactory.BuildToolkit.cs
View file

@ -398,8 +398,6 @@ internal sealed partial class FontAtlasFactory
config.GlyphMinAdvanceX = config.GlyphMinAdvanceX > 0 ? float.MaxValue : -float.MaxValue; config.GlyphMinAdvanceX = config.GlyphMinAdvanceX > 0 ? float.MaxValue : -float.MaxValue;
config.GlyphOffset *= this.Scale; config.GlyphOffset *= this.Scale;
config.RasterizerGamma *= 1.4f;
} }
} }
@ -426,9 +424,7 @@ internal sealed partial class FontAtlasFactory
var scale = this.Scale; var scale = this.Scale;
foreach (ref var font in this.Fonts.DataSpan) foreach (ref var font in this.Fonts.DataSpan)
{ {
if (this.GlobalScaleExclusions.Contains(font)) if (!this.GlobalScaleExclusions.Contains(font))
font.AdjustGlyphMetrics(1f, 1f); // we still need to round advanceX and kerning
else
font.AdjustGlyphMetrics(1 / scale, scale); font.AdjustGlyphMetrics(1 / scale, scale);
foreach (var c in FallbackCodepoints) foreach (var c in FallbackCodepoints)

8
Dalamud/Interface/ManagedFontAtlas/Internals/GamePrebakedFontHandle.cs
View file

@ -621,8 +621,12 @@ internal class GamePrebakedFontHandle : IFontHandle.IInternal
if (addExtraLanguageGlyphs) if (addExtraLanguageGlyphs)
{ {
toolkitPreBuild.AddExtraGlyphsForDalamudLanguage( var cfg = toolkitPreBuild.FindConfigPtr(font);
new(toolkitPreBuild.FindConfigPtr(font)) { MergeFont = font }); toolkitPreBuild.AddExtraGlyphsForDalamudLanguage(new()
{
MergeFont = cfg.DstFont,
SizePx = cfg.SizePixels,
});
} }
var fas = GameFontStyle.GetRecommendedFamilyAndSize(style.Family, style.SizePt * toolkitPreBuild.Scale); var fas = GameFontStyle.GetRecommendedFamilyAndSize(style.Family, style.SizePt * toolkitPreBuild.Scale);