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

don't capture sizePx when building default fonts

Browse source
This commit is contained in:
goat 2024-04-15 18:45:37 +02:00
parent 22d27fbb19
commit b40ffc24c1
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Dalamud/Interface/Internal/InterfaceManager.cs
View file

@ -747,7 +747,6 @@ internal class InterfaceManager : IInternalDisposableService
.CreateFontAtlas(nameof(InterfaceManager), FontAtlasAutoRebuildMode.Disable); .CreateFontAtlas(nameof(InterfaceManager), FontAtlasAutoRebuildMode.Disable);
using (this.dalamudAtlas.SuppressAutoRebuild()) using (this.dalamudAtlas.SuppressAutoRebuild())
{ {
var defaultSizePx = Service<FontAtlasFactory>.Get().DefaultFontSpec.SizePx;
this.DefaultFontHandle = (FontHandle)this.dalamudAtlas.NewDelegateFontHandle( this.DefaultFontHandle = (FontHandle)this.dalamudAtlas.NewDelegateFontHandle(
e => e.OnPreBuild(tk => tk.AddDalamudDefaultFont(-1))); e => e.OnPreBuild(tk => tk.AddDalamudDefaultFont(-1)));
this.IconFontHandle = (FontHandle)this.dalamudAtlas.NewDelegateFontHandle( this.IconFontHandle = (FontHandle)this.dalamudAtlas.NewDelegateFontHandle(
@ -755,7 +754,7 @@ internal class InterfaceManager : IInternalDisposableService
tk => tk.AddFontAwesomeIconFont( tk => tk.AddFontAwesomeIconFont(
new() new()
{ {
SizePx = defaultSizePx, SizePx = Service<FontAtlasFactory>.Get().DefaultFontSpec.SizePx,
GlyphMinAdvanceX = DefaultFontSizePx, GlyphMinAdvanceX = DefaultFontSizePx,
GlyphMaxAdvanceX = DefaultFontSizePx, GlyphMaxAdvanceX = DefaultFontSizePx,
}))); })));
@ -764,7 +763,7 @@ internal class InterfaceManager : IInternalDisposableService
DalamudAsset.FontAwesomeFreeSolid, DalamudAsset.FontAwesomeFreeSolid,
new() new()
{ {
SizePx = defaultSizePx, SizePx = Service<FontAtlasFactory>.Get().DefaultFontSpec.SizePx,
GlyphRanges = new ushort[] { 0x20, 0x20, 0x00 }, GlyphRanges = new ushort[] { 0x20, 0x20, 0x00 },
}))); })));
this.MonoFontHandle = (FontHandle)this.dalamudAtlas.NewDelegateFontHandle( this.MonoFontHandle = (FontHandle)this.dalamudAtlas.NewDelegateFontHandle(
@ -773,7 +772,7 @@ internal class InterfaceManager : IInternalDisposableService
DalamudAsset.InconsolataRegular, DalamudAsset.InconsolataRegular,
new() new()
{ {
SizePx = defaultSizePx, SizePx = Service<FontAtlasFactory>.Get().DefaultFontSpec.SizePx,
}))); })));
this.dalamudAtlas.BuildStepChange += e => e.OnPostBuild( this.dalamudAtlas.BuildStepChange += e => e.OnPostBuild(
tk => tk =>