wow/reaction: classes/Bar.lua comparison

comparison classes/Bar.lua @ 234:0e20f65375d5

Reworked button creation to not use goofy event driven semantics.

author	Flick
date	Tue, 22 Mar 2011 17:05:51 -0700
parents	8ba8ab8bf6dd
children	704f4a05a1d7

comparison

equal deleted inserted replaced

-:9b9f5fc84d34
+:0e20f65375d5
 end
 ---- Bar class ----
 local Bar   = { }
-local weak  = { __mode = "k" }
 local frameList = { }
 ReAction.Bar = Bar -- export to ReAction
-function Bar:New( name, config )
+function Bar:New( name, config, buttonClass )
 if type(config) ~= "table" then
 error("ReAction.Bar: config table required")
 end
 -- create new self
 self = setmetatable(
 {
-config  = config,
+config      = config,
-name    = name,
+name        = name,
-buttons = setmetatable( { }, weak ),
+buttons     = { },
-width   = config.width or 480,
+buttonClass = buttonClass,
-height  = config.height or 40,
+width       = config.width or 480,
+height      = config.height or 40,
 },
 {__index = self} )
 -- The frame type is 'Button' in order to have an OnClick handler. However, the frame itself is
 -- not mouse-clickable by the user.
 self.LBFGroup = g
 end
 ReAction.RegisterCallback(self, "OnConfigModeChanged")
+buttonClass:SetupBar(self)
 return self
 end
 function Bar:Destroy()
 local f = self:GetFrame()
+for idx, b in self:IterateButtons() do
+b:Destroy()
+end
 f:UnregisterAllEvents()
 self:ShowControls(false)
 ReAction.UnregisterAllCallbacks(self)
 LKB.UnregisterAllCallbacks(self)
 if self.LBFGroup then
 function Bar:SetName(name)
 if self.LBFGroup then
 -- LBF doesn't offer a method of renaming a group, so delete and remake the group.
 local c = self.config.ButtonFacade
 local g = ReAction.LBF:Group(L["ReAction"], name)
-for b in self:IterateButtons() do
+for idx, b in self:IterateButtons() do
 self.LBFGroup:RemoveButton(b:GetFrame(), true)
 g:AddButton(b:GetFrame())
 end
 self.LBFGroup:Delete(true)
 self.LBFGroup = g
 function Bar:GetFrame()
 -- this method is included for documentation purposes. It is overridden
 -- for each object in the :New() method.
 error("Invalid Bar object: used without initialization")
+end
+function Bar:GetButton(idx)
+return self.buttons[idx]
 end
 function Bar:GetConfig()
 return self.config
 end
 local cfg = self.config
 cfg.btnRows = r
 cfg.btnColumns = c
 cfg.spacing = s
 end
+self.buttonClass:SetupBar(self)
 ReAction:RefreshBar(self)
 end
 function Bar:GetAlpha()
 return self.config.alpha or 1.0
 self:UpdateDefaultStateAlpha()
 ReAction:RefreshBar(self)
 end
 function Bar:IterateButtons()
--- iterator returns button, idx and does NOT iterate in index order
+-- iterator returns idx, button, but does NOT iterate in index order
 return pairs(self.buttons)
 end
 --
 -- Methods
 --
 function Bar:SetConfigMode(mode)
 self:SetSecureData("showAll",mode)
 self:ShowControls(mode)
-for b in self:IterateButtons() do
+for idx, b in self:IterateButtons() do
 b:ShowGridTemp(mode)
 b:UpdateActionIDLabel(mode)
 end
 end
 function Bar:SetKeybindMode(mode)
 self:SetSecureData("showAll",mode)
-for b in self:IterateButtons() do
+for idx, b in self:IterateButtons() do
 b:SetKeybindMode(mode)
 end
 end
 function Bar:ApplyAnchor()
 end
 function Bar:AddButton(idx, button)
 local f = self:GetFrame()
--- store in a weak reverse-index array
+self.buttons[idx] = button
-self.buttons[button] = idx
 -- Store a properly wrapped reference to the child frame as an attribute
 -- (accessible via "frameref-btn#")
 f:SetFrameRef(format("btn%d",idx), button:GetFrame())
 -- button constructors are responsible for calling SkinButton
 end
 function Bar:RemoveButton(button)
-local idx = self.buttons[button]
+local idx = button:GetIndex()
 if idx then
 self:GetFrame():SetAttribute(format("frameref-btn%d",idx),nil)
-self.buttons[button] = nil
+self.buttons[idx] = nil
 end
 if self.LBFGroup then
 self.LBFGroup:RemoveButton(button:GetFrame(),true)
 end
 end
 function Bar:PlaceButton(button, baseW, baseH)
-local idx = self.buttons[button]
+local idx = button:GetIndex()
 if idx then
 local r, c, s = self:GetButtonGrid()
 local bh, bw = self:GetButtonSize()
 local row, col = floor((idx-1)/c), fmod((idx-1),c) -- zero-based
 local x, y = col*bw + (col+0.5)*s, -(row*bh + (row+0.5)*s)
 self.LBFGroup:AddButton(button:GetFrame(), data)
 end
 end
 function Bar:UpdateShowGrid()
-for button in self:IterateButtons() do
+for idx, button in self:IterateButtons() do
 button:UpdateShowGrid()
 end
 end
 function Bar:ShowControls(show)
 local f = self:GetFrame()
 if unit then
 f:SetAttribute("unit",unit)
 end
 if enable then
-RegisterUnitWatch(self:GetFrame(),true)
+if not self.unitwatch then
+RegisterUnitWatch(self:GetFrame(),true)
+end
 elseif self.unitwatch then
 UnregisterUnitWatch(self:GetFrame())
 end
 self.unitwatch = enable
 self:RefreshSecureState()

Mercurial > wow > reaction

comparison classes/Bar.lua @ 234:0e20f65375d5