Fix InventoryIcons rendering over mouse

JLannoo · Apr 21, 2024 · d76a692 · d76a692
1 parent 08df421
commit d76a692
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 17 deletions.
diff --git a/HaveIDonated/Hover.cs b/HaveIDonated/Hover.cs
@@ -23,7 +23,6 @@ public Hover(IModHelper helper, List<BundleData> bundleData) {
 		_bundles = bundleData;
 
         _helper.Events.Display.RenderingHud += OnRendering;
-        _helper.Events.Display.RenderedHud += OnRendered;
         _helper.Events.Display.RenderedActiveMenu += OnRenderedActiveMenu;
         _helper.Events.Input.ButtonPressed += OnButtonPressed;
 	}
@@ -77,15 +76,7 @@ private void OnButtonPressed(object? sender, ButtonPressedEventArgs e) {
     }
 
     private void OnRenderedActiveMenu(object? sender, RenderedActiveMenuEventArgs e) {
-        if (Game1.activeClickableMenu != null) {
-            Draw(Game1.spriteBatch);
-        }
-    }
-
-    private void OnRendered(object? sender, RenderedHudEventArgs e) {
-        if (Game1.activeClickableMenu == null) {
-            Draw(Game1.spriteBatch);
-        }
+        Draw(Game1.spriteBatch);
     }
 
     private void OnRendering(object? sender, RenderingHudEventArgs e) {
@@ -95,7 +86,6 @@ private void OnRendering(object? sender, RenderingHudEventArgs e) {
 
 	public void Dispose() {
 		_helper.Events.Display.RenderingHud -= OnRendering;
-		_helper.Events.Display.RenderedHud -= OnRendered;
 		_helper.Events.Display.RenderedActiveMenu -= OnRenderedActiveMenu;
         _helper.Events.Input.ButtonPressed -= OnButtonPressed;
 

diff --git a/HaveIDonated/InventoryIcons.cs b/HaveIDonated/InventoryIcons.cs
@@ -107,6 +107,11 @@ private void Draw(SpriteBatch spriteBatch) {
                 }
             }
         }
+
+        if(Game1.activeClickableMenu is IClickableMenu menu) {
+            menu.drawMouse(spriteBatch);
+
+        }
     }
 
     private List<(Item, ClickableComponent)> GetItemsBeingDrawn() {
@@ -209,7 +214,6 @@ private static List<Bundle> GetBundlesBeingDraw() {
             foreach (var bundle in menu.bundles) {
                 items.Add(bundle);
             }
-
         }
 
         return items;

diff --git a/HaveIDonated/ModEntry.cs b/HaveIDonated/ModEntry.cs
@@ -34,13 +34,13 @@ private void OnInventoryChanged(object? sender, InventoryChangedEventArgs e) {
 
     #region Methods
     private void RestartModFunctions() {
-        hover?.Dispose();
         inventoryIcons?.Dispose();
+        hover?.Dispose();
 
         List<BundleData> bundleData = Utils.GetBundleData();
 
-        hover = new Hover(_helper, bundleData);
         inventoryIcons = new InventoryIcons(_helper, bundleData);
+        hover = new Hover(_helper, bundleData);
 
     }
     #endregion

diff --git a/HaveIDonated/Utils.cs b/HaveIDonated/Utils.cs
@@ -92,9 +92,7 @@ public static void DrawTooltip(SpriteBatch spriteBatch, List<Line> lines) {
                 );
             }
 
-            // Draw text
-            spriteBatch.DrawString(Game1.smallFont, line.text, textPosition + new Vector2(2, 2), Game1.textShadowColor);
-            spriteBatch.DrawString(Game1.smallFont, line.text, textPosition, Game1.textColor);
+            Utility.drawTextWithShadow(spriteBatch, line.text, Game1.smallFont, textPosition, Game1.textColor);
         }
     }