From 6cd8dc0d9dd9913b8d25daeaa14dd4352eed93a2 Mon Sep 17 00:00:00 2001
From: Kelsi <kelsihates2fa@gmail.com>
Date: Thu, 12 Mar 2026 07:52:47 -0700
Subject: [PATCH] feat: show spell icon in cast bar alongside progress bar
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Display the casting spell's icon (20×20) to the left of the progress
bar using the existing getSpellIcon DBC lookup. Falls back gracefully
to the icon-less layout when no icon is available (e.g. before DBC
load or for unknown spells).
---
 src/ui/game_screen.cpp | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/ui/game_screen.cpp b/src/ui/game_screen.cpp
index 0b6831b7..bc0b54e3 100644
--- a/src/ui/game_screen.cpp
+++ b/src/ui/game_screen.cpp
@@ -6301,10 +6301,16 @@ void GameScreen::renderRepBar(game::GameHandler& gameHandler) {
 void GameScreen::renderCastBar(game::GameHandler& gameHandler) {
     if (!gameHandler.isCasting()) return;
 
+    auto* assetMgr = core::Application::getInstance().getAssetManager();
+
     ImVec2 displaySize = ImGui::GetIO().DisplaySize;
     float screenW = displaySize.x > 0.0f ? displaySize.x : 1280.0f;
     float screenH = displaySize.y > 0.0f ? displaySize.y : 720.0f;
 
+    uint32_t currentSpellId = gameHandler.getCurrentCastSpellId();
+    VkDescriptorSet iconTex = (currentSpellId != 0 && assetMgr)
+        ? getSpellIcon(currentSpellId, assetMgr) : VK_NULL_HANDLE;
+
     float barW = 300.0f;
     float barX = (screenW - barW) / 2.0f;
     float barY = screenH - 120.0f;
@@ -6332,7 +6338,6 @@ void GameScreen::renderCastBar(game::GameHandler& gameHandler) {
         ImGui::PushStyleColor(ImGuiCol_PlotHistogram, barColor);
 
         char overlay[64];
-        uint32_t currentSpellId = gameHandler.getCurrentCastSpellId();
         if (currentSpellId == 0) {
             snprintf(overlay, sizeof(overlay), "Opening... (%.1fs)", gameHandler.getCastTimeRemaining());
         } else {
@@ -6343,7 +6348,15 @@ void GameScreen::renderCastBar(game::GameHandler& gameHandler) {
             else
                 snprintf(overlay, sizeof(overlay), "%s... (%.1fs)", verb, gameHandler.getCastTimeRemaining());
         }
-        ImGui::ProgressBar(progress, ImVec2(-1, 20), overlay);
+
+        if (iconTex) {
+            // Spell icon to the left of the progress bar
+            ImGui::Image((ImTextureID)(uintptr_t)iconTex, ImVec2(20, 20));
+            ImGui::SameLine(0, 4);
+            ImGui::ProgressBar(progress, ImVec2(-1, 20), overlay);
+        } else {
+            ImGui::ProgressBar(progress, ImVec2(-1, 20), overlay);
+        }
         ImGui::PopStyleColor();
     }
     ImGui::End();