Merge branch 'main' into partyIndexText

Author: MitchellMonaghan

AuraDesigner/AuraAdapter.lua

@@ -108,10 +108,31 @@ function Provider:GetUnitAuras(unit, spec)
                     scannedCount = scannedCount + 1
                     local sid = auraData.spellId
 
-                    -- Skip auras with secret spellIds — they are not
-                    -- on Blizzard's whitelist so they are not ours.
+                    -- Handle secret vs whitelisted auras
                     if not sid or issecretvalue(sid) then
-                        -- not a trackable aura, skip
+                        -- Secret aura — try inline fingerprint matching
+                        -- (same tick as indicator rendering, avoids race condition)
+                        local SecretModule = DF.AuraDesigner.SecretAuras
+                        if SecretModule and auraData.auraInstanceID then
+                            local matchedName = SecretModule:MatchAura(unit, auraData, spec)
+                            if matchedName then
+                                local knownSpellId = forwardLookup and forwardLookup[matchedName]
+                                local iconTex = DF.AuraDesigner.IconTextures and DF.AuraDesigner.IconTextures[matchedName]
+                                result[matchedName] = {
+                                    spellId = knownSpellId or 0,
+                                    icon = iconTex or auraData.icon,
+                                    duration = auraData.duration,
+                                    expirationTime = auraData.expirationTime,
+                                    stacks = auraData.applications,
+                                    caster = auraData.sourceUnit,
+                                    auraInstanceID = auraData.auraInstanceID,
+                                    secret = true,
+                                }
+                                matchedCount = matchedCount + 1
+                                -- Update state cache for disambiguation engines
+                                SecretModule:RecordMatch(unit, auraData.auraInstanceID, matchedName)
+                            end
+                        end
                     else
                         local auraName = lookup[sid]
                         if auraName then
@@ -132,7 +153,8 @@ function Provider:GetUnitAuras(unit, spec)
         end
     end
 
-    -- Merge secret-tracked auras (fingerprint + cast tracking system)
+    -- Merge disambiguation overrides from SecretAuras state cache
+    -- (e.g. VerdantEmbrace → Lifebind reclassification after 0.1s timer)
     local SecretAurasModule = DF.AuraDesigner.SecretAuras
     if SecretAurasModule then
         local secretResult = SecretAurasModule:GetUnitAuras(unit, spec)

AuraDesigner/Config.lua

@@ -113,6 +113,16 @@ DF.AuraDesigner.IconTextures = {
     Dawnlight           = 5927633,
 }
 
+-- ============================================================
+-- TOOLTIP SPELL ID OVERRIDES
+-- Some aura spell IDs are internal/secret and produce wrong tooltips
+-- (e.g. 409895 shows "Upheaval" instead of "Verdant Embrace").
+-- Map aura name → castable spell ID for correct tooltip display.
+-- ============================================================
+DF.AuraDesigner.TooltipSpellIDs = {
+    VerdantEmbrace = 360995,
+}
+
 -- ============================================================
 -- SPELL IDS PER SPEC
 -- Used for runtime aura matching via reverse spell ID lookup

AuraDesigner/Options.lua

@@ -13,6 +13,7 @@ local tinsert = table.insert
 local tremove = table.remove
 local max, min = math.max, math.min
 local sort = table.sort
+local RAID_CLASS_COLORS = RAID_CLASS_COLORS
 
 -- Local references set during BuildAuraDesignerPage
 local GUI
@@ -2881,15 +2882,26 @@ local function CreateEnableBanner(parent)
 
     local function UpdateSpecText()
         local adDB = GetAuraDesignerDB()
+        local resolvedSpec
         if adDB.spec == "auto" then
             local autoSpec = Adapter:GetPlayerSpec()
             if autoSpec then
                 specBtn.text:SetText("Auto (" .. Adapter:GetSpecDisplayName(autoSpec) .. ")")
+                resolvedSpec = autoSpec
             else
                 specBtn.text:SetText("Auto (detect)")
             end
         else
             specBtn.text:SetText(Adapter:GetSpecDisplayName(adDB.spec))
+            resolvedSpec = adDB.spec
+        end
+        -- Color the button text by class color
+        local specInfoEntry = resolvedSpec and DF.AuraDesigner.SpecInfo[resolvedSpec]
+        local cc = specInfoEntry and RAID_CLASS_COLORS[specInfoEntry.class]
+        if cc then
+            specBtn.text:SetTextColor(cc.r, cc.g, cc.b)
+        else
+            specBtn.text:SetTextColor(C_TEXT.r, C_TEXT.g, C_TEXT.b)
         end
     end
 
@@ -2925,10 +2937,24 @@ local function CreateEnableBanner(parent)
             local label = btn:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
             label:SetPoint("LEFT", 4, 0)
             label:SetText(opt[2])
-            label:SetTextColor(C_TEXT.r, C_TEXT.g, C_TEXT.b)
 
-            btn:SetScript("OnEnter", function() label:SetTextColor(1, 1, 1) end)
-            btn:SetScript("OnLeave", function() label:SetTextColor(C_TEXT.r, C_TEXT.g, C_TEXT.b) end)
+            -- Color by class for spec entries, default for "auto"
+            local specInfoEntry = DF.AuraDesigner.SpecInfo[opt[1]]
+            local cc = specInfoEntry and RAID_CLASS_COLORS[specInfoEntry.class]
+            local baseR, baseG, baseB = C_TEXT.r, C_TEXT.g, C_TEXT.b
+            if cc then
+                baseR, baseG, baseB = cc.r, cc.g, cc.b
+            end
+            label:SetTextColor(baseR, baseG, baseB)
+
+            btn:SetScript("OnEnter", function()
+                if cc then
+                    label:SetTextColor(min(baseR + 0.2, 1), min(baseG + 0.2, 1), min(baseB + 0.2, 1))
+                else
+                    label:SetTextColor(1, 1, 1)
+                end
+            end)
+            btn:SetScript("OnLeave", function() label:SetTextColor(baseR, baseG, baseB) end)
             btn:SetScript("OnClick", function()
                 GetAuraDesignerDB().spec = opt[1]
                 specMenu:Hide()
@@ -3407,9 +3433,11 @@ local function CreateSpellCard(grid, auraInfo, spec, x, y, CARD_SIZE, isSecret)
         usedLabel:SetTextColor(0.6, 0.6, 0.6)
     end
 
-    -- Spell tooltip on hover
+    -- Spell tooltip on hover (use tooltip override if available)
+    local tooltipOverrides = DF.AuraDesigner.TooltipSpellIDs
     local spellIDs = DF.AuraDesigner.SpellIDs
-    local spellID = spellIDs and spellIDs[spec] and spellIDs[spec][auraInfo.name]
+    local spellID = tooltipOverrides and tooltipOverrides[auraInfo.name]
+        or spellIDs and spellIDs[spec] and spellIDs[spec][auraInfo.name]
 
     if alreadyUsed then
         -- Used cards still get tooltips but no highlight/click
@@ -4585,14 +4613,6 @@ BuildLayoutGroupsTab = function()
                         mBadgeText:SetTextColor(1, 1, 1)
                         mBadge:SetWidth(max(mBadgeText:GetStringWidth() + 12, 32))
 
-                        -- Aura name
-                        local mName = memberRow:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
-                        mName:SetPoint("LEFT", mBadge, "RIGHT", 6, 0)
-                        mName:SetPoint("RIGHT", memberRow, "RIGHT", -24, 0)
-                        mName:SetMaxLines(1)
-                        mName:SetText(displayNames[member.auraName] or member.auraName)
-                        mName:SetTextColor(C_TEXT.r, C_TEXT.g, C_TEXT.b)
-
                         -- Remove button (using close icon)
                         local remBtn = CreateFrame("Button", nil, memberRow)
                         remBtn:SetSize(18, 18)
@@ -4618,6 +4638,42 @@ BuildLayoutGroupsTab = function()
                             RefreshPreviewEffects()
                         end)
 
+                        -- Customise button (navigates to Effects tab for this indicator)
+                        local custBtn = CreateFrame("Button", nil, memberRow, "BackdropTemplate")
+                        custBtn:SetSize(56, 18)
+                        custBtn:SetPoint("RIGHT", remBtn, "LEFT", -4, 0)
+                        local custTC = GetThemeColor()
+                        ApplyBackdrop(custBtn,
+                            {r = custTC.r * 0.15, g = custTC.g * 0.15, b = custTC.b * 0.15, a = 1},
+                            {r = custTC.r * 0.35, g = custTC.g * 0.35, b = custTC.b * 0.35, a = 0.6})
+                        local custText = custBtn:CreateFontString(nil, "OVERLAY")
+                        custText:SetFont("Fonts\\FRIZQT__.TTF", 8, "OUTLINE")
+                        custText:SetPoint("CENTER", 0, 0)
+                        custText:SetText("Customise")
+                        custText:SetTextColor(custTC.r, custTC.g, custTC.b)
+                        custBtn:SetScript("OnEnter", function() custText:SetTextColor(1, 1, 1) end)
+                        custBtn:SetScript("OnLeave", function()
+                            local tc2 = GetThemeColor()
+                            custText:SetTextColor(tc2.r, tc2.g, tc2.b)
+                        end)
+                        local capturedAuraName = member.auraName
+                        local capturedIndID = member.indicatorID
+                        custBtn:SetScript("OnClick", function()
+                            local cardKey = "placed:" .. capturedAuraName .. "#" .. capturedIndID
+                            wipe(expandedCards)
+                            expandedCards[cardKey] = true
+                            activeTab = "effects"
+                            DF:AuraDesigner_RefreshPage()
+                        end)
+
+                        -- Aura name
+                        local mName = memberRow:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
+                        mName:SetPoint("LEFT", mBadge, "RIGHT", 6, 0)
+                        mName:SetPoint("RIGHT", custBtn, "LEFT", -4, 0)
+                        mName:SetMaxLines(1)
+                        mName:SetText(displayNames[member.auraName] or member.auraName)
+                        mName:SetTextColor(C_TEXT.r, C_TEXT.g, C_TEXT.b)
+
                         by = by - 38
                     end
                 else
@@ -4964,10 +5020,15 @@ function DF.BuildAuraDesignerPage(guiRef, pageRef, dbRef)
     -- Override RefreshStates: Aura Designer uses its own layout system
     page.RefreshStates = function(self)
         local pageH = self:GetHeight()
-        self.child:SetHeight(math.max(pageH, 600))
+        self.child:SetHeight(pageH)
         if self.child and GUI.contentFrame then
             self.child:SetWidth(GUI.contentFrame:GetWidth() - 30)
         end
+        -- Keep parent scroll at 0 — only the right panel should scroll
+        local parentScroll = self:GetParent()
+        if parentScroll and parentScroll.SetVerticalScroll then
+            parentScroll:SetVerticalScroll(0)
+        end
         DF:AuraDesigner_RefreshPage()
     end
 
@@ -5272,6 +5333,19 @@ function DF:AuraDesigner_RefreshPage()
         selectedSpec = currentSpec
     end
 
+    -- Update frame preview container border to class color of current spec
+    if framePreview then
+        local resolvedSpec = currentSpec or selectedSpec
+        local specInfoEntry = resolvedSpec and DF.AuraDesigner.SpecInfo[resolvedSpec]
+        local classToken = specInfoEntry and specInfoEntry.class
+        local classColor = classToken and RAID_CLASS_COLORS[classToken]
+        if classColor then
+            framePreview:SetBackdropBorderColor(classColor.r, classColor.g, classColor.b, 1)
+        else
+            framePreview:SetBackdropBorderColor(C_BORDER.r, C_BORDER.g, C_BORDER.b, 1)
+        end
+    end
+
     -- Rebuild the current tab to reflect data changes
     if activeTab and SwitchTab then
         SwitchTab(activeTab)

AuraDesigner/SecretAuras.lua

@@ -387,3 +387,26 @@ function SecretAuras:GetUnitAuras(unit, spec)
 
     return result
 end
+
+--- Match a single aura against known secret signatures for the given spec.
+-- Exposed for inline use by AuraAdapter during its scan loop so that
+-- secret aura detection and indicator rendering happen on the same tick.
+-- @param unit  Unit token (e.g. "party1")
+-- @param auraData  AuraData table from C_UnitAuras (must have .auraInstanceID)
+-- @param spec  Spec key (e.g. "RestorationDruid")
+-- @return auraName String name of matched aura, or nil
+function SecretAuras:MatchAura(unit, auraData, spec)
+    return MatchAuraSignature(unit, auraData, spec)
+end
+
+--- Record an inline-matched aura into the state cache.
+-- Called by AuraAdapter after a successful inline match so that the
+-- disambiguation engines (e.g. VerdantEmbrace/Lifebind) and state
+-- cleanup (removedAuraInstanceIDs) continue to work correctly.
+-- @param unit  Unit token
+-- @param auraInstanceID  Blizzard aura instance ID
+-- @param auraName  Matched aura name
+function SecretAuras:RecordMatch(unit, auraInstanceID, auraName)
+    if not state.auras[unit] then state.auras[unit] = {} end
+    state.auras[unit][auraInstanceID] = auraName
+end

CHANGELOG.md

@@ -6,6 +6,8 @@
 * (Click Casting) **Fixed binding tooltip vanishing when pressing modifier keys** — modifier format mismatch caused all bindings to be filtered out
 * (Pet Frames) Fixed taint error from secret boolean in pet range checking
 * (Fading) **Fixed name and health text alpha resetting to 1.0** on zone change, combat res, vehicle exit, and test mode exit
+* (Aura Designer) **Fixed secret auras not appearing immediately on cast in combat** — inline fingerprint matching eliminates race condition between detection and rendering
+* (Aura Designer) Fixed Verdant Embrace tooltip incorrectly showing Upheaval
 
 ### New Features
 * (Aura Designer) **Secret aura tracking** — tracks auras that WoW hides behind secret spell IDs using signature-based fingerprinting (credit to Harrek for the technique and aura data from Advanced Raid Frames)
@@ -25,6 +27,13 @@
 * (Aura Designer) Spell cards now show WoW spell tooltips on hover
 * (Aura Designer) Secret auras shown in a distinct section with visual styling to differentiate from regular auras
 * (Aura Designer) Added "unsupported spec" message when viewing a non-healer spec
+* (Aura Designer) **Class color border** on preview frame window showing the current spec's class
+* (Aura Designer) **Class-colored spec dropdown** — each spec name colored by class for clarity
+* (Aura Designer) **Customise button** on layout group members — jumps directly to that aura's effects settings
+* (Aura Designer) Fixed page scrolling — only the right settings panel scrolls now, preview stays in view
+* (Auras) Added **Raid In Combat** debuff filter option — matches the existing buff filter for better debuff coverage
+* (Click Casting) Renamed "Mouseover" fallback to "Global" for clarity
+* (Click Casting) "Does not work with action bar binds" warning now highlighted in red
 
 ## [4.0.15] - 2026-03-10
 

ClickCasting/Constants.lua

@@ -431,7 +431,7 @@ CC.FRAME_INFO = FRAME_INFO
 -- Targeting Fallback info (checkboxes - for keyboard/hover bindings)
 local FALLBACK_INFO = {
     mouseover = {
-        name = "Mouseover",
+        name = "Global",
         desc = "Cast on nameplates or characters in the world. Not needed for party/raid frames.",
     },
     target = {

ClickCasting/UI/BindingEditor.lua

@@ -1352,7 +1352,7 @@ function CC:CreateEditBindingPanel()
     fallbackSubtitle:SetWidth(280)
     fallbackSubtitle:SetJustifyH("LEFT")
     fallbackSubtitle:SetWordWrap(true)
-    fallbackSubtitle:SetText("For nameplates & world units. Does not work with action bar binds.")
+    fallbackSubtitle:SetText("For nameplates & world units. |cffff3333Does not work with action bar binds.|r")
     fallbackSubtitle:SetTextColor(0.5, 0.5, 0.5)
     panel.fallbackSubtitle = fallbackSubtitle
 

Config.lua

@@ -866,6 +866,7 @@ DF.PartyDefaults = {
     -- Direct Mode: Debuff Filters
     directDebuffShowAll = false,              -- Show all debuffs (ignores sub-filters)
     directDebuffFilterRaid = true,            -- RAID filter
+    directDebuffFilterRaidInCombat = true,    -- RAID_IN_COMBAT filter
     directDebuffFilterCrowdControl = true,    -- CROWD_CONTROL filter
     directDebuffFilterImportant = true,       -- IMPORTANT filter (12.0.1)
     directDebuffSortOrder = "DEFAULT",        -- "DEFAULT" / "TIME" / "NAME"
@@ -1196,7 +1197,7 @@ DF.PartyDefaults = {
     -- Blizzard Frame Hiding
     hideBlizzardFrames = true,
     hideBlizzardPartyFrames = true,
-    hideBlizzardRaidFrames = false,
+    hideBlizzardRaidFrames = true,
     hideDefaultPlayerFrame = false,
     hidePlayerFrame = false,
     showBlizzardSideMenu = true,
@@ -2059,6 +2060,7 @@ DF.RaidDefaults = {
     -- Direct Mode: Debuff Filters
     directDebuffShowAll = false,              -- Show all debuffs (ignores sub-filters)
     directDebuffFilterRaid = true,            -- RAID filter
+    directDebuffFilterRaidInCombat = true,    -- RAID_IN_COMBAT filter
     directDebuffFilterCrowdControl = true,    -- CROWD_CONTROL filter
     directDebuffFilterImportant = true,       -- IMPORTANT filter (12.0.1)
     directDebuffSortOrder = "DEFAULT",        -- "DEFAULT" / "TIME" / "NAME"
@@ -2389,7 +2391,7 @@ DF.RaidDefaults = {
     -- Blizzard Frame Hiding
     hideBlizzardFrames = true,
     hideBlizzardPartyFrames = true,
-    hideBlizzardRaidFrames = false,
+    hideBlizzardRaidFrames = true,
     hideDefaultPlayerFrame = false,
     hidePlayerFrame = false,
     showBlizzardSideMenu = true,

Core.lua

@@ -3699,6 +3699,25 @@ eventFrame:SetScript("OnEvent", function(self, event, arg1)
             end
         end
 
+        -- One-time: force hideBlizzardRaidFrames = true for existing users
+        for _, mode in ipairs({"party", "raid"}) do
+            local modeDb = DF.db[mode]
+            if modeDb and not modeDb._hideBlizzRaidV407 then
+                modeDb.hideBlizzardRaidFrames = true
+                modeDb._hideBlizzRaidV407 = true
+            end
+        end
+        if DandersFramesDB_v2 and DandersFramesDB_v2.profiles then
+            for _, profile in pairs(DandersFramesDB_v2.profiles) do
+                for _, mode in ipairs({"party", "raid"}) do
+                    if profile[mode] and not profile[mode]._hideBlizzRaidV407 then
+                        profile[mode].hideBlizzardRaidFrames = true
+                        profile[mode]._hideBlizzRaidV407 = true
+                    end
+                end
+            end
+        end
+
         -- Wrap DF.db with overlay proxy (must happen AFTER all migrations,
         -- BEFORE anything that reads through the proxy)
         DF:WrapDB()

DandersFrames.toc

@@ -3,7 +3,7 @@
 ## Notes: Custom party/raid frames for WoW Midnight 12.0
 ## X-Credits: Some optimization patterns informed by studying Grid2 and other community addons. Secret aura tracking techniques from Harrek's Advanced Raid Frames (used with permission).
 ## Author: Danders
-## Version: v4.0.16-alpha.2
+## Version: v4.0.16
 ## X-Curse-Project-ID: 1389690
 ## X-Wago-ID: RNL9B46o
 ## IconTexture: Interface\AddOns\DandersFrames\Media\DF_Icon