ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-01-02 05:43:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move IFontHandle.ImFontLocked to ILockedImFont+impl

Browse source
This commit is contained in:
Soreepeong 2024-01-24 00:19:27 +09:00
parent 68dc16803c
commit 5161053cb3
9 changed files with 105 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Dalamud/Interface/ManagedFontAtlas/Internals/FontHandle.cs
View file

@ -74,7 +74,7 @@ internal abstract class FontHandle : IFontHandle
/// Invokes <see cref="IFontHandle.ImFontChanged"/>.
/// </summary>
/// <param name="font">The font, locked during the call of <see cref="ImFontChanged"/>.</param>
public void InvokeImFontChanged(IFontHandle.ImFontLocked font)
public void InvokeImFontChanged(ILockedImFont font)
{
try
{
@ -133,11 +133,11 @@ internal abstract class FontHandle : IFontHandle
/// </summary>
/// <param name="errorMessage">The error message, if any.</param>
/// <returns>
/// An instance of <see cref="IFontHandle.ImFontLocked"/> that <b>must</b> be disposed after use on success;
/// An instance of <see cref="ILockedImFont"/> that <b>must</b> be disposed after use on success;
/// <c>null</c> with <paramref name="errorMessage"/> populated on failure.
/// </returns>
/// <exception cref="ObjectDisposedException">Still may be thrown.</exception>
public IFontHandle.ImFontLocked? TryLock(out string? errorMessage)
public ILockedImFont? TryLock(out string? errorMessage)
{
IFontHandleSubstance? prevSubstance = default;
while (true)
@ -182,12 +182,12 @@ internal abstract class FontHandle : IFontHandle
// Transfer the ownership of reference.
errorMessage = null;
return IFontHandle.ImFontLocked.Rent(fontPtr, substance.DataRoot);
return new LockedImFont(fontPtr, substance.DataRoot);
}
}
/// <inheritdoc/>
public IFontHandle.ImFontLocked Lock() =>
public ILockedImFont Lock() =>
this.TryLock(out var errorMessage) ?? throw new InvalidOperationException(errorMessage);
/// <inheritdoc/>
@ -238,10 +238,10 @@ internal abstract class FontHandle : IFontHandle
this.ImFontChanged += OnImFontChanged;
this.Disposed += OnDisposed;
if (this.Available)
OnImFontChanged(this, default);
OnImFontChanged(this, null);
return tcs.Task;
void OnImFontChanged(IFontHandle unused, IFontHandle.ImFontLocked unused2)
void OnImFontChanged(IFontHandle unused, ILockedImFont? unused2)
{
if (tcs.Task.IsCompletedSuccessfully)
return;