From b40ffc24c13cf1b4606e56a2267039383fc4e116 Mon Sep 17 00:00:00 2001 From: goat Date: Mon, 15 Apr 2024 18:45:37 +0200 Subject: [PATCH] don't capture sizePx when building default fonts --- Dalamud/Interface/Internal/InterfaceManager.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Dalamud/Interface/Internal/InterfaceManager.cs b/Dalamud/Interface/Internal/InterfaceManager.cs index ffcd5c679..65d250cfd 100644 --- a/Dalamud/Interface/Internal/InterfaceManager.cs +++ b/Dalamud/Interface/Internal/InterfaceManager.cs @@ -747,7 +747,6 @@ internal class InterfaceManager : IInternalDisposableService .CreateFontAtlas(nameof(InterfaceManager), FontAtlasAutoRebuildMode.Disable); using (this.dalamudAtlas.SuppressAutoRebuild()) { - var defaultSizePx = Service.Get().DefaultFontSpec.SizePx; this.DefaultFontHandle = (FontHandle)this.dalamudAtlas.NewDelegateFontHandle( e => e.OnPreBuild(tk => tk.AddDalamudDefaultFont(-1))); this.IconFontHandle = (FontHandle)this.dalamudAtlas.NewDelegateFontHandle( @@ -755,7 +754,7 @@ internal class InterfaceManager : IInternalDisposableService tk => tk.AddFontAwesomeIconFont( new() { - SizePx = defaultSizePx, + SizePx = Service.Get().DefaultFontSpec.SizePx, GlyphMinAdvanceX = DefaultFontSizePx, GlyphMaxAdvanceX = DefaultFontSizePx, }))); @@ -764,7 +763,7 @@ internal class InterfaceManager : IInternalDisposableService DalamudAsset.FontAwesomeFreeSolid, new() { - SizePx = defaultSizePx, + SizePx = Service.Get().DefaultFontSpec.SizePx, GlyphRanges = new ushort[] { 0x20, 0x20, 0x00 }, }))); this.MonoFontHandle = (FontHandle)this.dalamudAtlas.NewDelegateFontHandle( @@ -773,7 +772,7 @@ internal class InterfaceManager : IInternalDisposableService DalamudAsset.InconsolataRegular, new() { - SizePx = defaultSizePx, + SizePx = Service.Get().DefaultFontSpec.SizePx, }))); this.dalamudAtlas.BuildStepChange += e => e.OnPostBuild( tk =>