wow/reaction: modules/ReAction_PetAction/ReAction

comparison modules/ReAction_PetAction/ReAction_PetAction.lua @ 77:da8ba8783924

- added revision updater to each code file - Changed button/bar class mechanic to metatable-based - Changed buttons to live within a sub-frame, to play nicely between show-empty-buttons and hidestates - bar frame is now available only via accessor - Changed some semantics with AddButton/PlaceButton - Cleaned up action buttons options, fixed hide-when-empty option - moved show-action-ID-label as a button method - converted drag overlay from nested-frame to :Raise() - fixed ReAction:SetConfigMode() to not call event when mode doesn't change - Fixed ordering for dynamic state tab (always last)

author	Flick <flickerstreak@gmail.com>
date	Mon, 23 Jun 2008 22:27:50 +0000
parents	06cd74bdc7da
children	42ec2938d65a

comparison

equal deleted inserted replaced

-:c8c8610fd864
+:da8ba8783924
 --[[
 ReAction Pet Action button module
 The button module implements standard action button functionality by wrapping Blizzard's
-PetActionButton frame and associated functions. It also provides some button layout
+PetActionButton frame and associated functions.
-modification tools.
 --]]
 -- local imports
 local ReAction = ReAction
 local L = ReAction.L
 local _G = _G
 local CreateFrame = CreateFrame
+ReAction:UpdateRevision("$Revision: 103 $")
 -- module declaration
 local moduleID = "PetAction"
 local module = ReAction:NewModule( moduleID )
+-- Button class declaration
+local Button = { }
 -- module methods
 function module:OnInitialize()
 self.db = ReAction.db:RegisterNamespace( moduleID,
 {
 for i = 1, n do
 if btnCfg[i] == nil then
 btnCfg[i] = {}
 end
 if btns[i] == nil then
-local ok, b = pcall(self.BtnClass.new, self.BtnClass, bar, i, btnCfg[i])
+local b = Button:New(bar,i,btnCfg[i])
-if ok and b then
+btns[i] = b
-btns[i] = b
+bar:AddButton(i,b)
-bar:AddButton(i,b)
+end
-end
+btns[i]:Refresh()
-else
-btns[i]:Refresh(bar,i)
-end
 end
 for i = n+1, #btns do
 if btns[i] then
-bar:RemoveButton(b)
+bar:RemoveButton(btns[i])
 btns[i] = btns[i]:Destroy()
 if btnCfg[i] then
 btnCfg[i] = nil
 end
 end
 b[newname], b[oldname] = b[oldname], nil
 end
 function module:OnConfigModeChanged(event, mode)
+for _, buttons in pairs(self.buttons) do
+for _, b in pairs(buttons) do
+b:ShowActionIDLabel(mode)
+end
+end
 for _, bar in ReAction:IterateBars() do
 if bar and self.buttons[bar] then
-for _, b in pairs(self.buttons[bar]) do
-if b then
-if mode then
-self:showActionIDLabel(b)
-else
-self:hideActionIDLabel(b)
-end
-end
-end
 local f = bar:GetFrame()
 if mode then
 UnregisterUnitWatch(f)
 f:Show()
 else
 end
 end
 end
 end
-function module:showActionIDLabel(button)
--- store the action ID label in the frame due to frame recycling
-if not button:GetFrame().actionIDLabel and button:GetActionID() then
-local label = button:GetFrame():CreateFontString(nil,"OVERLAY","GameFontNormalLarge")
-label:SetAllPoints()
-label:SetJustifyH("CENTER")
-label:SetShadowColor(0,0,0,1)
-label:SetShadowOffset(2,-2)
-label:SetText(tostring(button:GetActionID()))
-button:GetFrame().actionIDLabel = label
-end
-button:GetFrame().actionIDLabel:Show()
-end
-function module:hideActionIDLabel(button)
-if button:GetFrame().actionIDLabel then
-button:GetFrame().actionIDLabel:Hide()
-end
-end
 ---- Options ----
 function module:GetBarOptions(bar)
 return {
 type = "group",
 }
 }
 end
+------ Button class ------
 -- use-count of action IDs
 local nActionIDs = NUM_PET_ACTION_SLOTS
 local ActionIDList = setmetatable( {}, {
 __index = function(self, idx)
 end
 })
 local frameRecycler = {}
+function Button:New( bar, idx, config )
------- Button class ------
+-- create new self
-local Button = { }
+self = setmetatable( { }, { __index = Button } )
-local function Constructor( self, bar, idx, config )
 self.bar, self.idx, self.config = bar, idx, config
-local barFrame = bar:GetFrame()
 local name = config.name or ("ReAction_%s_Pet_%d"):format(bar:GetName(),idx)
 config.name = name
-self.name = config.name
+self.name = name
 config.actionID = ActionIDList[config.actionID] -- gets a free one if none configured
 -- have to recycle frames with the same name:
 -- otherwise you either get references to old textures because named CreateFrame()
 -- doesn't overwrite existing globals (below)
 -- or, if you set them to nil in the global table, you get taint because of the
 -- crappy PetActionBar code.
+local parent = bar:GetButtonFrame()
 local f = frameRecycler[name]
 if f then
-f:SetParent(barFrame)
+f:SetParent(parent)
-f:Show()
+else
-else
+f = CreateFrame("CheckButton", name, parent, "PetActionButtonTemplate")
-f = CreateFrame("CheckButton", name, barFrame, "PetActionButtonTemplate")
 end
 if config.actionID then
 f:SetID(config.actionID) -- PetActionButtonTemplate isn't a proper SecureActionButton
 end
 f:SetFrameStrata("MEDIUM")
-barFrame:SetAttribute("addchild",f)
 self.frame = f
 self.icon = _G[("%sIcon"):format(name)]
 self.acTex = _G[("%sAutoCastable"):format(name)]
 self.acModel = _G[("%sAutoCast"):format(name)]
 self.cooldown = _G[("%sCooldown"):format(name)]
 self.hotkey = _G[("%sHotKey"):format(name)]
 f:HookScript("OnDragStart", function() self:Update() end)
 f:HookScript("OnReceiveDrag", function() self:Update() end)
-	f:RegisterEvent("PLAYER_CONTROL_LOST");
+f:RegisterEvent("PLAYER_CONTROL_LOST");
 	f:RegisterEvent("PLAYER_CONTROL_GAINED");
 	f:RegisterEvent("PLAYER_FARSIGHT_FOCUS_CHANGED");
 	f:RegisterEvent("UNIT_PET");
 	f:RegisterEvent("UNIT_FLAGS");
 	f:RegisterEvent("UNIT_AURA");
 else
 self:Update()
 end
 end)
-self:Refresh(bar,idx)
+self:Refresh()
+return self
 end
 function Button:Destroy()
 local f = self.frame
 f:UnregisterAllEvents()
 self.frame = nil
 self.config = nil
 self.bar = nil
 end
-function Button:Refresh(bar,idx)
+function Button:Refresh()
-bar:PlaceButton(self, 30, 30)
+self.bar:PlaceButton(self, 30, 30)
 self:Update()
 self:UpdateHotkey()
 end
 function Button:GetFrame()
 function Button:UpdateHotkey()
 end
--- export as a class-factory to module
+function Button:ShowActionIDLabel(show)
-module.BtnClass = {
+if show then
-new = function(self, ...)
+-- store the action ID label in the frame due to frame recycling
-local x = { }
+if not self.actionIDLabel and self:GetActionID() then
-for k,v in pairs(Button) do
+local label = self.frame:CreateFontString(nil,"OVERLAY","GameFontNormalLarge")
-x[k] = v
+label:SetAllPoints()
-end
+label:SetJustifyH("CENTER")
-Constructor(x, ...)
+label:SetShadowColor(0,0,0,1)
-return x
+label:SetShadowOffset(2,-2)
-end
+label:SetText(tostring(self:GetActionID()))
-}
+self.actionIDLabel = label
+end
+self.actionIDLabel:Show()
+elseif self.actionIDLabel then
+self.actionIDLabel:Hide()
+end
+end

Mercurial > wow > reaction

comparison modules/ReAction_PetAction/ReAction_PetAction.lua @ 77:da8ba8783924