Use new INotificationManager instead of pluginInterface.UiBuilder.

Kurochi51 · Mar 17, 2024 · ff50582 · ff50582
1 parent 01f3787
commit ff50582
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 10 deletions.
diff --git a/PetScale/PetScale.cs b/PetScale/PetScale.cs
@@ -27,6 +27,7 @@ namespace PetScale;
 public sealed class PetScale : IDalamudPlugin
 {
     private const string CommandName = "/pscale";
+    public const string PluginName = "Pet Scale";
 
     private readonly DalamudPluginInterface pluginInterface;
     private readonly Configuration config;
@@ -70,7 +71,8 @@ public PetScale(DalamudPluginInterface _pluginInterface,
         IFramework _framework,
         IPluginLog _log,
         IClientState _clientState,
-        IDataManager _dataManger)
+        IDataManager _dataManger,
+        INotificationManager _notificationManager)
     {
         pluginInterface = _pluginInterface;
         commandManager = _commandManager;
@@ -80,7 +82,7 @@ public PetScale(DalamudPluginInterface _pluginInterface,
         config = pluginInterface.GetPluginConfig() as Configuration ?? new Configuration();
         utilities = new Utilities(_dataManger, log);
 
-        ConfigWindow = new ConfigWindow(this, config, pluginInterface, log);
+        ConfigWindow = new ConfigWindow(this, config, pluginInterface, log, _notificationManager);
 #if DEBUG
         DevWindow = new DevWindow(log, pluginInterface);
         WindowSystem.AddWindow(DevWindow);
@@ -336,7 +338,7 @@ private void RefreshCache(string playerName, uint playerObjectId)
         utilities.CachePlayerList(playerObjectId, players, BattleCharaSpan);
     }
 
-    private unsafe void SetScale(BattleChara* pet, PetStruct userData, string petName)
+    private unsafe void SetScale(BattleChara* pet, in PetStruct userData, string petName)
     {
         var scale = userData.PetSize switch
         {

diff --git a/PetScale/PetScale.csproj b/PetScale/PetScale.csproj
@@ -30,6 +30,8 @@
         </ContentWithTargetPath>
     </ItemGroup>
 
+    <!--D:\yes\Dalamud\bin\Release\-->
+    <!--$(appdata)\XIVLauncher\addon\Hooks\dev\-->
     <PropertyGroup>
         <DalamudLibPath Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(appdata)\XIVLauncher\addon\Hooks\dev\</DalamudLibPath>
         <DalamudLibPath Condition="$([MSBuild]::IsOSPlatform('Linux'))">$(HOME)/.xlcore/dalamud/Hooks/dev/</DalamudLibPath>

diff --git a/PetScale/Windows/ConfigWindow.cs b/PetScale/Windows/ConfigWindow.cs
@@ -16,6 +16,7 @@
 using Dalamud.Interface.Windowing;
 using Dalamud.Interface.Utility.Raii;
 using Dalamud.Interface.ManagedFontAtlas;
+using Dalamud.Interface.ImGuiNotification;
 using Dalamud.Interface.Internal.Notifications;
 using FFXIVClientStructs.FFXIV.Client.Graphics.Kernel;
 using PetScale.Structs;
@@ -29,6 +30,7 @@ public sealed class ConfigWindow : Window, IDisposable
     private readonly Configuration config;
     private readonly PetScale plugin;
     private readonly IPluginLog log;
+    private readonly INotificationManager notificationManager;
     private readonly Dictionary<PetSize, string> sizeMap = new()
     {
         { PetSize.SmallModelScale,   "Small" },
@@ -38,6 +40,7 @@ public sealed class ConfigWindow : Window, IDisposable
     private readonly string buttonIcon;
     private readonly CancellationTokenSource cts;
     private readonly CancellationToken cToken;
+    private readonly Notification notification = new();
     private const string DefaultPetSelection = "Pet";
     private const string LongestCharaName = "WWWWWWWWWWWWWWW WWWWW";
     private const string LongestSize = "Medium";
@@ -53,12 +56,14 @@ public sealed class ConfigWindow : Window, IDisposable
     public unsafe ConfigWindow(PetScale _plugin,
         Configuration _config,
         DalamudPluginInterface _pluginInterface,
-        IPluginLog _pluginLog) : base($"{nameof(PetScale)} Config")
+        IPluginLog _pluginLog,
+        INotificationManager _notificationManager) : base($"{nameof(PetScale)} Config")
     {
         plugin = _plugin;
         config = _config;
         pluginInterface = _pluginInterface;
         log = _pluginLog;
+        notificationManager = _notificationManager;
         SizeConstraints = new WindowSizeConstraints()
         {
             MinimumSize = new Vector2(470, 365),
@@ -106,17 +111,17 @@ public override void Draw()
             var error = false;
             if (charaName.IsNullOrWhitespace() || charaName.Equals("Characters", StringComparison.Ordinal))
             {
-                pluginInterface.UiBuilder.AddNotification("Invalid Character selected", "Pet Scale", NotificationType.Error);
+                CreateNotification("Invalid Character selected", PetScale.PluginName, NotificationType.Error);
                 error = true;
             }
             if (petSelection.Equals(DefaultPetSelection, StringComparison.Ordinal))
             {
-                pluginInterface.UiBuilder.AddNotification("Invalid Pet selected", "Pet Scale", NotificationType.Error);
+                CreateNotification("Invalid Pet selected", PetScale.PluginName, NotificationType.Error);
                 error = true;
             }
             if (sizeSelection.Equals("Size", StringComparison.Ordinal))
             {
-                pluginInterface.UiBuilder.AddNotification("Invalid Pet Size selected", "Pet Scale", NotificationType.Error);
+                CreateNotification("Invalid Pet Size selected", PetScale.PluginName, NotificationType.Error);
                 error = true;
             }
             if (!error)
@@ -179,7 +184,7 @@ private unsafe void DisplayEntries()
                 if (DrawIconButton(fontHandle: null, buttonIcon, buttonId + buttonIcon))
                 {
                     petData.RemoveAt(i);
-                    pluginInterface.UiBuilder.AddNotification("Entry " + item.CharacterName + ", " + petSelection + ", " + sizeMap[item.PetSize] + " was removed.");
+                    CreateNotification("Entry " + item.CharacterName + ", " + petSelection + ", " + sizeMap[item.PetSize] + " was removed.", PetScale.PluginName);
                     itemRemoved = true;
                 }
             }
@@ -324,7 +329,9 @@ private void CheckPossibleEntry()
         if (checkPet.IsDefault())
         {
             petData.Add(currentPetData);
-            pluginInterface.UiBuilder.AddNotification("Entry " + currentPetData.CharacterName + ", " + petSelection + ", " + sizeMap[currentPetSize.Key] + " was added.");
+            CreateNotification(
+                "Entry " + currentPetData.CharacterName + ", " + petSelection + ", " + sizeMap[currentPetSize.Key] + " was added.",
+                PetScale.PluginName);
         }
         else if (!checkPet.PetSize.Equals(currentPetData.PetSize))
         {
@@ -333,7 +340,7 @@ private void CheckPossibleEntry()
             checkPet.PetSize = currentPetSize.Key;
             petData[index] = checkPet;
             log.Debug("Entry {name} with {pet} at {size} got changed.", checkPet.CharacterName, petSelection, checkPet.PetSize);
-            pluginInterface.UiBuilder.AddNotification(entry + sizeMap[petData[index].PetSize]);
+            CreateNotification(entry + sizeMap[petData[index].PetSize], PetScale.PluginName);
         }
         Save(save: true);
     }
@@ -451,6 +458,14 @@ private async void QueueColumnWidthChange(IFontHandle handle, ILockedImFont lock
         fontChange = true;
     }
 
+    private void CreateNotification(string content, string title, NotificationType type = NotificationType.None)
+    {
+        notification.Content = content;
+        notification.Title = title;
+        notification.Type = type;
+        notificationManager.AddNotification(notification);
+    }
+
     public void Dispose()
     {
         pluginInterface.UiBuilder.DefaultFontHandle.ImFontChanged -= QueueColumnWidthChange;