Skip to content

Commit d0cb035

Browse files
committed
Address PR #206 review nits
- TOC: remove the 4 orphaned comment lines left under AuraDesigner/Config after the LinkedAuras entry was deleted. - Factory.lua: fix two stale comments that still described the removed legacy read-path engine / P5-pending test mode. - TestMode: the per-frame AD test block called the deleted Engine:UpdateTestFrame (silent no-op). Route it through Factory Sync/ClearFrame — the same path as the bulk UpdateAllTestAuraDesigner, so per-frame and bulk previews can't drift. - Migration: the *UseFactory dev toggles were profile-ROOT keys, but the strip only swept the per-mode tables. Add a root-level strip. - Locale: alphabetise the new Comet / Blink keys.
1 parent 88a36db commit d0cb035

5 files changed

Lines changed: 30 additions & 18 deletions

File tree

AuraDesigner/Factory.lua

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ local addonName, DF = ...
1717
-- a native SetDurationBar-driven StatusBar for the bar, one 1-slot container per configured
1818
-- indicator, many coexisting). Placed duration text supports colour-by-time via the #205 discrete
1919
-- BUCKET formatter (C-side |c escapes — no Lua time read). framealpha / nametext / healthtext are
20-
-- 12.1 casualties (see NOTES at the file foot). Sound + showWhenMissing are P4.5. The legacy
21-
-- engine stays fully intact behind DF:UseFactoryForAD.
20+
-- 12.1 casualties (see NOTES at the file foot). Sound + showWhenMissing are P4.5. The factory
21+
-- is the only AD render path now — the legacy read-path engine was removed.
2222
--
2323
-- COMBAT / SECRET obligations (delegated to the DF.AuraContainer handle, the #205-proven
2424
-- path): containers are created/enabled OUT of combat and deferred to PLAYER_REGEN_ENABLED
@@ -44,8 +44,8 @@ local DBG = "AD"
4444
-- ============================================================
4545

4646
-- Render gate: is the native AD path active for this frame right now? Hard-gated to
47-
-- 12.1 (IsSupported) and OFF in test mode (the legacy preview painter owns test mode
48-
-- until native test mode ships in P5). Default ON: only an explicit false disables it.
47+
-- 12.1 (IsSupported) and OFF in test mode the test drives call the factory
48+
-- themselves (DF:UpdateAllTestAuraDesigner), so the live path must not double-drive.
4949
function DF:UseFactoryForAD(frame, db)
5050
return DF.AuraContainer and DF.AuraContainer.IsSupported()
5151
and not (DF.testMode or DF.raidTestMode)

Core.lua

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4106,6 +4106,21 @@ DF._MainEventDispatcher = function(self, event, arg1)
41064106
end
41074107
end
41084108
end
4109+
-- The *UseFactory dev toggles lived at the profile ROOT (DF.db.adUseFactory,
4110+
-- not per-mode), so strip them there too. Harmless orphans otherwise.
4111+
local ROOT_LEGACY_KEYS = { "buffUseFactory", "debuffUseFactory",
4112+
"defensiveUseFactory", "missingBuffUseFactory", "dispelOverlayUseFactory",
4113+
"adUseFactory" }
4114+
local function StripRootLegacyKeys(root)
4115+
if not root then return end
4116+
for _, key in ipairs(ROOT_LEGACY_KEYS) do root[key] = nil end
4117+
end
4118+
StripRootLegacyKeys(DF.db)
4119+
if DandersFramesDB_v2 and DandersFramesDB_v2.profiles then
4120+
for _, profile in pairs(DandersFramesDB_v2.profiles) do
4121+
StripRootLegacyKeys(profile)
4122+
end
4123+
end
41094124

41104125
-- v5.0 (12.1): the dispel overlay's Custom Colors mode was removed during
41114126
-- the alpha (never in any distributed build — belt-and-braces for alpha

DandersFrames.toc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,6 @@ Features\Dispel.lua
121121

122122
# Aura Designer
123123
AuraDesigner\Config.lua
124-
# secret in some cases, which floods the error log via the UNIT_AURA guard.
125-
# Only consumer is Symbiotic Relationship target inference for Resto Druid;
126-
# minor functionality loss. Re-enable once Blizzard provides a non-secret
127-
# path or after the guard is rewritten to use string comparison.
128124
AuraDesigner\AuraAdapter.lua
129125
AuraDesigner\Engine.lua
130126
AuraDesigner\Factory.lua

Locales/enUS.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1813,14 +1813,14 @@ L["Animation Particles"] = true
18131813
L["Animation Scale"] = true
18141814
L["Animation Thickness"] = true
18151815
L["Border Animation"] = true
1816+
L["Blink"] = true
18161817
L["Chase"] = true
1818+
L["Comet"] = true
18171819
L["Corner Length"] = true
18181820
L["Corners Only"] = true
18191821
L["Flash"] = true
18201822
L["Ripple"] = true
18211823
L["Segment Reveal"] = true
1822-
L["Comet"] = true
1823-
L["Blink"] = true
18241824
L["Sides Axis"] = true
18251825
L["Sides Only"] = true
18261826
L["Wipe"] = true

TestMode/TestMode.lua

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1171,15 +1171,16 @@ function DF:UpdateTestFrame(frame, index, applyLayout)
11711171
end
11721172
end
11731173

1174-
-- Update Aura Designer test indicators
1175-
if db.testShowAuraDesigner and DF:IsAuraDesignerEnabled(frame) then
1176-
local ADEngine = DF.AuraDesigner and DF.AuraDesigner.Engine
1177-
if ADEngine and ADEngine.UpdateTestFrame then
1178-
ADEngine:UpdateTestFrame(frame)
1174+
-- Update Aura Designer test indicators through the factory containers — the
1175+
-- SAME path as the bulk DF:UpdateAllTestAuraDesigner, so the per-frame and
1176+
-- bulk previews can't drift (the legacy Engine:UpdateTestFrame is gone).
1177+
local ADFactory = DF.AuraDesigner and DF.AuraDesigner.Factory
1178+
if ADFactory then
1179+
if db.testShowAuraDesigner and DF:IsAuraDesignerEnabled(frame) then
1180+
ADFactory:SyncFrame(frame)
1181+
else
1182+
ADFactory:ClearFrame(frame)
11791183
end
1180-
else
1181-
local ADEngine = DF.AuraDesigner and DF.AuraDesigner.Engine
1182-
if ADEngine then ADEngine:ClearFrame(frame) end
11831184
end
11841185

11851186
-- Update selection and aggro highlights for test mode

0 commit comments

Comments
 (0)