diff --git a/Dalamud.CorePlugin/PluginImpl.cs b/Dalamud.CorePlugin/PluginImpl.cs
index afeaad426..cb9b4368a 100644
--- a/Dalamud.CorePlugin/PluginImpl.cs
+++ b/Dalamud.CorePlugin/PluginImpl.cs
@@ -56,16 +56,15 @@ namespace Dalamud.CorePlugin
///
/// Dalamud plugin interface.
/// Logging service.
- public PluginImpl(DalamudPluginInterface pluginInterface, IPluginLog log, INotificationManager notificationManager)
+ public PluginImpl(DalamudPluginInterface pluginInterface, IPluginLog log)
{
- this.NotificationManager = notificationManager;
try
{
// this.InitLoc();
this.Interface = pluginInterface;
this.pluginLog = log;
- this.windowSystem.AddWindow(new PluginWindow(this));
+ this.windowSystem.AddWindow(new PluginWindow());
this.Interface.UiBuilder.Draw += this.OnDraw;
this.Interface.UiBuilder.OpenConfigUi += this.OnOpenConfigUi;
@@ -85,8 +84,6 @@ namespace Dalamud.CorePlugin
}
}
- public INotificationManager NotificationManager { get; }
-
///
/// Gets the plugin interface.
///
diff --git a/Dalamud.CorePlugin/PluginWindow.cs b/Dalamud.CorePlugin/PluginWindow.cs
index 33b8505c4..27be82f41 100644
--- a/Dalamud.CorePlugin/PluginWindow.cs
+++ b/Dalamud.CorePlugin/PluginWindow.cs
@@ -1,9 +1,7 @@
using System;
using System.Numerics;
-using Dalamud.Interface.Internal.Notifications;
using Dalamud.Interface.Windowing;
-
using ImGuiNET;
namespace Dalamud.CorePlugin
@@ -16,19 +14,15 @@ namespace Dalamud.CorePlugin
///
/// Initializes a new instance of the class.
///
- ///
- public PluginWindow(PluginImpl pluginImpl)
+ public PluginWindow()
: base("CorePlugin")
{
- this.PluginImpl = pluginImpl;
this.IsOpen = true;
this.Size = new Vector2(810, 520);
this.SizeCondition = ImGuiCond.FirstUseEver;
}
- public PluginImpl PluginImpl { get; }
-
///
public void Dispose()
{
@@ -42,72 +36,6 @@ namespace Dalamud.CorePlugin
///
public override void Draw()
{
- if (ImGui.Button("Legacy"))
- this.PluginImpl.Interface.UiBuilder.AddNotification("asdf");
- if (ImGui.Button("Test"))
- {
- const string text =
- "Bla bla bla bla bla bla bla bla bla bla bla.\nBla bla bla bla bla bla bla bla bla bla bla bla bla bla.";
-
- NewRandom(out var title, out var type);
- var n = this.PluginImpl.NotificationManager.AddNotification(
- new()
- {
- Content = text,
- Title = title,
- Type = type,
- Interactible = true,
- Expiry = DateTime.MaxValue,
- });
-
- var nclick = 0;
- n.Click += _ => nclick++;
- n.DrawActions += an =>
- {
- if (ImGui.Button("Update in place"))
- {
- NewRandom(out title, out type);
- an.Update(an.CloneNotification() with { Title = title, Type = type });
- }
-
- if (an.IsMouseHovered)
- {
- ImGui.SameLine();
- if (ImGui.Button("Dismiss"))
- an.DismissNow();
- }
-
- ImGui.AlignTextToFramePadding();
- ImGui.SameLine();
- ImGui.TextUnformatted($"Clicked {nclick} time(s)");
- };
- }
- }
-
- private static void NewRandom(out string? title, out NotificationType type)
- {
- var rand = new Random();
-
- title = rand.Next(0, 7) switch
- {
- 0 => "This is a toast",
- 1 => "Truly, a toast",
- 2 => "I am testing this toast",
- 3 => "I hope this looks right",
- 4 => "Good stuff",
- 5 => "Nice",
- _ => null,
- };
-
- type = rand.Next(0, 5) switch
- {
- 0 => NotificationType.Error,
- 1 => NotificationType.Warning,
- 2 => NotificationType.Info,
- 3 => NotificationType.Success,
- 4 => NotificationType.None,
- _ => NotificationType.None,
- };
}
}
}