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

fix disposes and add TextureWrapIconSource

Browse source
This commit is contained in:
Soreepeong 2024-02-26 04:16:36 +09:00
parent 9644dd9922
commit 42b6f8fd4b
10 changed files with 187 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

72
Dalamud/Interface/ImGuiNotification/Internal/ActiveNotification.cs
View file

@ -43,7 +43,10 @@ internal sealed class ActiveNotification : IActiveNotification, IDisposable
/// <param name="initiatorPlugin">The initiator plugin. Use <c>null</c> if originated by Dalamud.</param>
public ActiveNotification(Notification underlyingNotification, LocalPlugin? initiatorPlugin)
{
this.underlyingNotification = underlyingNotification with { };
this.underlyingNotification = underlyingNotification with
{
IconSource = underlyingNotification.IconSource?.Clone(),
};
this.InitiatorPlugin = initiatorPlugin;
this.showEasing = new InCubic(NotificationConstants.ShowAnimationDuration);
this.hideEasing = new OutCubic(NotificationConstants.HideAnimationDuration);
@ -51,7 +54,16 @@ internal sealed class ActiveNotification : IActiveNotification, IDisposable
this.showEasing.Start();
this.progressEasing.Start();
this.UpdateIcon();
try
{
this.UpdateIcon();
}
catch (Exception e)
{
// Ignore the one caused from ctor only; other UpdateIcon calls are from plugins, and they should handle the
// error accordingly.
Log.Error(e, $"{nameof(ActiveNotification)}#{this.Id} ctor: {nameof(this.UpdateIcon)} failed and ignored.");
}
}
/// <inheritdoc/>
@ -114,17 +126,8 @@ internal sealed class ActiveNotification : IActiveNotification, IDisposable
}
}
/// <inheritdoc cref="IActiveNotification.IconSource"/>
public INotificationIconSource? IconSource
{
get => this.underlyingNotification.IconSource;
set
{
if (this.IsDismissed)
return;
this.underlyingNotification.IconSource = value;
}
}
/// <inheritdoc/>
public INotificationIconSource? IconSource => this.underlyingNotification.IconSource;
/// <inheritdoc cref="IActiveNotification.Expiry"/>
public DateTime Expiry
@ -264,23 +267,14 @@ internal sealed class ActiveNotification : IActiveNotification, IDisposable
/// <inheritdoc/>
public void Dispose()
{
this.ClearIconTask();
this.underlyingNotification.IconSource = null;
this.ClearMaterializedIcon();
this.underlyingNotification.Dispose();
this.Dismiss = null;
this.Click = null;
this.DrawActions = null;
this.InitiatorPlugin = null;
}
/// <inheritdoc/>
public Notification CloneNotification()
{
var newValue = this.underlyingNotification with { };
if (this.newProgress is { } p)
newValue.Progress = p;
return newValue;
}
/// <inheritdoc/>
public void DismissNow() => this.DismissNow(NotificationDismissReason.Programmatical);
@ -504,30 +498,26 @@ internal sealed class ActiveNotification : IActiveNotification, IDisposable
return windowSize.Y;
}
/// <inheritdoc/>
public void Update(INotification newNotification)
{
if (this.IsDismissed)
return;
this.Content = newNotification.Content;
this.Title = newNotification.Title;
this.Type = newNotification.Type;
this.IconSource = newNotification.IconSource;
this.Expiry = newNotification.Expiry;
this.Interactable = newNotification.Interactable;
this.HoverExtendDuration = newNotification.HoverExtendDuration;
this.newProgress = newNotification.Progress;
}
/// <inheritdoc/>
public void UpdateIcon()
{
if (this.IsDismissed)
return;
this.ClearIconTask();
this.ClearMaterializedIcon();
this.MaterializedIcon = (this.IconSource as INotificationIconSource.IInternal)?.Materialize();
}
/// <inheritdoc/>
public void UpdateIconSource(INotificationIconSource? newIconSource)
{
if (this.IsDismissed || this.underlyingNotification.IconSource == newIconSource)
return;
this.underlyingNotification.IconSource?.Dispose();
this.underlyingNotification.IconSource = newIconSource;
this.UpdateIcon();
}
/// <summary>Removes non-Dalamud invocation targets from events.</summary>
public void RemoveNonDalamudInvocations()
{
@ -567,7 +557,7 @@ internal sealed class ActiveNotification : IActiveNotification, IDisposable
}
}
private void ClearIconTask()
private void ClearMaterializedIcon()
{
this.MaterializedIcon?.Dispose();
this.MaterializedIcon = null;