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

Fix scaling problems

Browse source
This commit is contained in:
Soreepeong 2022-04-01 01:52:58 +09:00
parent f14bf171e4
commit 216d205542
1 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -748,18 +748,20 @@ namespace Dalamud.Interface.Internal
fontConfig.GlyphRanges = dummyRangeHandle.AddrOfPinnedObject(); fontConfig.GlyphRanges = dummyRangeHandle.AddrOfPinnedObject();
fontConfig.SizePixels = (this.AllowBigFontAtlas ? fontSize : DefaultFontSizePx) * fontLoadScale; fontConfig.SizePixels = (this.AllowBigFontAtlas ? fontSize : DefaultFontSizePx) * fontLoadScale;
sizedFont = ioFonts.AddFontDefault(fontConfig); sizedFont = ioFonts.AddFontDefault(fontConfig);
fontsToUnscale.Add(sizedFont);
fontsToOverwriteFromAxis.Add(true);
fontsToReassignSizes.Add(this.AllowBigFontAtlas ? null : fontSize);
} }
else else
{ {
var rangeHandle = GCHandle.Alloc(flattenedRanges.ToArray(), GCHandleType.Pinned); var rangeHandle = GCHandle.Alloc(flattenedRanges.ToArray(), GCHandleType.Pinned);
garbageList.Add(rangeHandle); garbageList.Add(rangeHandle);
sizedFont = ioFonts.AddFontFromFileTTF(fontPathJp, (this.AllowBigFontAtlas ? fontSize : DefaultFontSizePx) * fontLoadScale, fontConfig, rangeHandle.AddrOfPinnedObject()); sizedFont = ioFonts.AddFontFromFileTTF(fontPathJp, (this.AllowBigFontAtlas ? fontSize : DefaultFontSizePx + 1) * fontLoadScale, fontConfig, rangeHandle.AddrOfPinnedObject());
fontsToUnscale.Add(sizedFont);
fontsToOverwriteFromAxis.Add(false);
fontsToReassignSizes.Add(this.AllowBigFontAtlas ? null : fontSize);
} }
fontsToUnscale.Add(sizedFont);
fontsToOverwriteFromAxis.Add(true);
fontsToReassignSizes.Add(this.AllowBigFontAtlas ? null : fontSize);
foreach (var request in requests) foreach (var request in requests)
request.FontInternal = sizedFont; request.FontInternal = sizedFont;
} }
@ -786,9 +788,6 @@ namespace Dalamud.Interface.Internal
texPixels[i] = (byte)(Math.Pow(texPixels[i] / 255.0f, 1.0f / fontGamma) * 255.0f); texPixels[i] = (byte)(Math.Pow(texPixels[i] / 255.0f, 1.0f / fontGamma) * 255.0f);
} }
foreach (var font in fontsToUnscale)
GameFontManager.UnscaleFont(font, fontLoadScale, false);
gameFontManager.AfterBuildFonts(); gameFontManager.AfterBuildFonts();
for (var i = 0; i < fontsToUnscale.Count; i++) for (var i = 0; i < fontsToUnscale.Count; i++)
@ -799,30 +798,34 @@ namespace Dalamud.Interface.Internal
var overwrite = fontsToOverwriteFromAxis[i]; var overwrite = fontsToOverwriteFromAxis[i];
var overwriteSize = fontsToReassignSizes[i]; var overwriteSize = fontsToReassignSizes[i];
GameFontManager.UnscaleFont(font, fontLoadScale, false);
if (correspondingAxis == null) if (correspondingAxis == null)
continue; continue;
var scale = 1f;
if (overwrite) if (overwrite)
{ {
var srcPtr = correspondingAxis.ImFont.NativePtr; var srcPtr = correspondingAxis.ImFont.NativePtr;
var scale = fontPtr->ConfigData->SizePixels / srcPtr->ConfigData->SizePixels / fontLoadScale; scale = fontPtr->ConfigData->SizePixels / srcPtr->ConfigData->SizePixels / fontLoadScale;
Log.Verbose("[FONT] Font {0}: scale {1}", i, scale);
fontPtr->FontSize = srcPtr->FontSize * scale; fontPtr->FontSize = srcPtr->FontSize * scale;
fontPtr->Ascent = srcPtr->Ascent * scale; fontPtr->Ascent = srcPtr->Ascent * scale;
fontPtr->Descent = srcPtr->Descent * scale; fontPtr->Descent = srcPtr->Descent * scale;
fontPtr->FallbackChar = srcPtr->FallbackChar; fontPtr->FallbackChar = srcPtr->FallbackChar;
fontPtr->EllipsisChar = srcPtr->EllipsisChar; fontPtr->EllipsisChar = srcPtr->EllipsisChar;
GameFontManager.CopyGlyphsAcrossFonts(correspondingAxis.ImFont, font, false, false);
scale = 1f;
} }
if (overwriteSize != null) if (overwriteSize != null)
{ scale *= overwriteSize.Value / fontPtr->ConfigData->SizePixels;
var scale = overwriteSize.Value / fontPtr->ConfigData->SizePixels;
fontPtr->FontSize *= scale;
fontPtr->Ascent *= scale;
fontPtr->Descent *= scale;
}
GameFontManager.CopyGlyphsAcrossFonts(correspondingAxis.ImFont, font, !overwrite, false); if (scale != 1f)
GameFontManager.UnscaleFont(font, 1 / scale, false);
Log.Verbose("[FONT] Font {0}: result size {1}", i, fontPtr->FontSize);
if (!this.UseAxis && fontPtr == DefaultFont.NativePtr) if (!this.UseAxis && fontPtr == DefaultFont.NativePtr)
{ {