wow/reaction: classes/MultiCastButton.lua comparison

Reworked button creation to not use goofy event driven semantics.

comparison

equal deleted inserted replaced

-:9b9f5fc84d34
+:0e20f65375d5
 totemIDsBySlot = newtable()
 for i = 1, slotsPerPage do
 totemIDsBySlot[i] = self:GetAttribute("TOTEM_PRIORITY_"..i)
 end
--- these are set up in bar:SetupBarHeader()
+-- these are set up in bar:SetupBar()
 flyoutChildren = flyoutChildren or newtable()
 summonSpells = summonSpells or newtable()
 ]]
 local _onstate_multispellpage = -- function(self, stateid, newstate)
 { __index = Action } )
 ReAction.Button.MultiCast = MultiCast
 ReAction:RegisterBarType(MultiCast)
-function MultiCast:New( idx, btnConfig, bar )
+function MultiCast:New( btnConfig, bar, idx )
 local maxIndex = bar.nTotemSlots or 0
 if bar.summonSlot then
 maxIndex = maxIndex + 1
 end
 if bar.recallSlot then
 frame.icon:SetTexture(GetSpellTexture(GetSpellInfo(spellID)))
 frame.icon:SetTexCoord(0,1,0,1)
 end
 end
-function MultiCast.SetupBarHeader( bar ) -- call this as a static method
+function MultiCast:SetupBar( bar )
+Super.SetupBar(self,bar)
 local slot = 0
 local nTotemSlots = 0
 local summonSlot = nil
 local recallSlot = nil
 function f:UpdateFlyoutTextures(slot)
 flyout:UpdateTextures(slot)
 end
+-- re-execute setup when new spells are loaded
+if not f.events_registered then
+f:RegisterEvent("UPDATE_MULTI_CAST_ACTIONBAR")
+f:RegisterEvent("PLAYER_ENTERING_WORLD")
+-- Bar.frame does not use OnEvent
+f:SetScript("OnEvent",
+function()
+if not InCombatLockdown() then
+self:SetupBar(bar)
+end
+end)
+f.events_registered = true
+end
 f:Execute(_bar_init)
 end

Mercurial > wow > reaction