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

Fix minor scaling bug

Browse source
This commit is contained in:
Soreepeong 2022-04-05 15:47:27 +09:00
parent 31436cabfd
commit a21cdc3eaa
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -653,7 +653,7 @@ namespace Dalamud.Interface.Internal
DefaultFont = ioFonts.AddFontDefault(fontConfig); DefaultFont = ioFonts.AddFontDefault(fontConfig);
fontsToUnscale.Add(DefaultFont); fontsToUnscale.Add(DefaultFont);
fontsToOverwriteFromAxis.Add(true); fontsToOverwriteFromAxis.Add(true);
fontsToReassignSizes.Add(disableBigFonts ? DefaultFontSizePx * fontLoadScale : null); fontsToReassignSizes.Add(disableBigFonts ? DefaultFontSizePx : null);
} }
else else
{ {
@ -758,14 +758,14 @@ namespace Dalamud.Interface.Internal
sizedFont = ioFonts.AddFontDefault(fontConfig); sizedFont = ioFonts.AddFontDefault(fontConfig);
fontsToUnscale.Add(sizedFont); fontsToUnscale.Add(sizedFont);
fontsToOverwriteFromAxis.Add(true); fontsToOverwriteFromAxis.Add(true);
fontsToReassignSizes.Add(disableBigFonts ? fontLoadScale * fontSize : null); fontsToReassignSizes.Add(disableBigFonts ? fontSize : null);
} }
else else
{ {
var rangeHandle = GCHandle.Alloc(flattenedRanges.ToArray(), GCHandleType.Pinned); var rangeHandle = GCHandle.Alloc(flattenedRanges.ToArray(), GCHandleType.Pinned);
garbageList.Add(rangeHandle); garbageList.Add(rangeHandle);
fontConfig.PixelSnapH = true; fontConfig.PixelSnapH = true;
sizedFont = ioFonts.AddFontFromFileTTF(fontPathJp, (disableBigFonts ? fontSize : DefaultFontSizePx + 1) * fontLoadScale, fontConfig, rangeHandle.AddrOfPinnedObject()); sizedFont = ioFonts.AddFontFromFileTTF(fontPathJp, (disableBigFonts ? DefaultFontSizePx + 1 : fontSize) * fontLoadScale, fontConfig, rangeHandle.AddrOfPinnedObject());
fontsToUnscale.Add(sizedFont); fontsToUnscale.Add(sizedFont);
fontsToOverwriteFromAxis.Add(false); fontsToOverwriteFromAxis.Add(false);
fontsToReassignSizes.Add(disableBigFonts ? fontSize : null); fontsToReassignSizes.Add(disableBigFonts ? fontSize : null);
@ -849,7 +849,7 @@ namespace Dalamud.Interface.Internal
} }
if (overwriteSize != null) if (overwriteSize != null)
scale *= overwriteSize.Value / fontPtr->ConfigData->SizePixels; scale *= fontLoadScale * overwriteSize.Value / fontPtr->ConfigData->SizePixels;
if (scale != 1f) if (scale != 1f)
GameFontManager.UnscaleFont(font, 1 / scale, false); GameFontManager.UnscaleFont(font, 1 / scale, false);