wow/buffalo2: ObjectiveTracker/ObjectiveWidgets.lua comparison

comparison ObjectiveTracker/ObjectiveWidgets.lua @ 24:66b927b46776

Refine the XML data logic, and sort out some EnableMouse inconsistencies.

author	Nenue
date	Mon, 11 Apr 2016 09:07:40 -0400
parents	e837384ac363
children

comparison

equal deleted inserted replaced

-:e837384ac363
+:66b927b46776
 local B = select(2,...).frame
-local mod = B:RegisterModule("ObjectiveTracker", _G.VeneerObjectiveWrapper, 'BuffFrame')
+local T = B:RegisterModule("ObjectiveTracker", _G.VeneerObjectiveWrapper, 'BuffFrame')
 local print = B.print('WidgetFactory')
-local UIParent = UIParent
+local _G, UIParent = _G, UIParent
 local GetQuestLogSpecialItemInfo, IsQuestLogSpecialItemInRange, GetQuestLogSpecialItemCooldown = GetQuestLogSpecialItemInfo, IsQuestLogSpecialItemInRange, GetQuestLogSpecialItemCooldown
 local CooldownFrame_SetTimer, SetItemButtonTextureVertexColor, CreateFrame, VeneerObjectiveScroll = CooldownFrame_SetTimer, SetItemButtonTextureVertexColor, CreateFrame, VeneerObjectiveScroll
-local tremove, tinsert, tContains, pairs, setmetatable = tremove, tinsert, tContains, pairs, setmetatable
+local tremove, tContains, pairs, ipairs, setmetatable, floor = tremove, tContains, pairs, ipairs, setmetatable, floor
+local SetItemButtonTexture, SetItemButtonCount = SetItemButtonTexture, SetItemButtonCount
+local ToggleWorldMap, GetTrackedAchievements, GetTasksTable = ToggleWorldMap, GetTrackedAchievements, GetTasksTable
+-- GLOBALS: Veneer_QuestObjectiveItem_UpdateCooldown, Veneer_QuestObjectiveItem_OnUpdate
 --- frame refs
 local Wrapper = _G.VeneerObjectiveWrapper
 local Scroller = Wrapper.scrollArea
 local CloseButton = Wrapper.CloseButton
 local QuestMapButton = Wrapper.QuestMapButton
 local Scroll = _G.VeneerObjectiveScroll
+local usedButtons = T.Quest.itemButtons
-local panelButtons = {
+local freeButtons = T.Quest.freeButtons
+T.buttons = {
 CloseButton = {
 closedSwatch = {
 [[Interface\Buttons\UI-Panel-QuestHideButton]],
 [[Interface\Buttons\UI-Panel-QuestHideButton]],
 0, 0.5, 0.5, 1,
 }
 }
 local Scroller_OnShow = function()
 Wrapper.watchMoneyReasons = 0;
---mod:Update()
+--T:Update()
---mod:OnInitialize()
+--T:OnInitialize()
 for i, region in ipairs(Wrapper.headerComplex) do
 region:Show()
 end
 end
 end
 self:SetVerticalScroll(s)
 B.Conf.ObjectiveScroll = s
 print('|cFF00FF00OnMouseWheel', 'from = ', from, 'scroll =', s, ' range =', r, 'current =', self:GetVerticalScroll())
-mod.UpdateActionButtons('SCROLLING')
+T.UpdateActionButtons('SCROLLING')
 end
 local UpdatePanelButton = function (self, state)
-state = state and B.Conf.FrameState[state] or 1
+state = state or true
-local swatch = (state == 1) and self.openSwatch or self.closedSwatch
+local swatch = (state == true) and self.openSwatch or self.closedSwatch
+print((state ~= true) and 'closedSwatch' or 'openSwatch')
 self:SetNormalTexture(swatch[1])
 self:SetPushedTexture(swatch[2])
 if #swatch >= 6 then
 self:GetNormalTexture():SetTexCoord(swatch[3], swatch[4], swatch[5], swatch[6])
 end
 end
 local OnClick = {}
 OnClick.CloseButton = function(self)
-Wrapper:Minimize()
+T:SetEnabled()
-UpdatePanelButton(self, self.parent)
+UpdatePanelButton(self, T.Conf.enabled)
 end
 OnClick.QuestMapButton = function()
 ToggleWorldMap()
 end
-mod.InitializeWidgets = function()
+T.InitializeWidgets = function()
+local panelButtons = T.buttons
 --- tracker scroll
 Scroller:SetScript('OnMouseWheel', Scroller_OnMouseWheel)
 Scroller:SetScript('OnShow', Scroller_OnShow)
 Scroller:SetScript('OnHide', Scroller_OnHide)
 for name, swatch in pairs(panelButtons) do
 button.openSwatch = source.openSwatch
 button.closedSwatch = source.closedSwatch
 if OnClick[name] then
 button:SetScript('OnClick', OnClick[name])
 end
-UpdatePanelButton(button, button.parent)
+UpdatePanelButton(button, T.Conf.enabled)
 end
 end
 ----------------------------------------------------------------------------------------
---- XML and script code lifted from "QuestKing 2" by Barjack,
+--- modified version of the itemButton initializer used by Barjack's 'QuestKing 2' addon,
----   found at http://mods.curse.com/addons/wow/questking
+--- url: http://mods.curse.com/addons/wow/questking
 ----------------------------------------------------------------------------------------
-local usedButtons = mod.Quest.itemButtons
+T.SetItemButton = function(block, info)
-local freeButtons = mod.Quest.freeButtons
-mod.SetItemButton = function(block, info)
 local itemInfo = info.specialItem
 if not itemInfo then
 return
 end
---- Quest.GetInfo().specialItem :: {link = link, charges = charges, icon = icon, start = start, duration = duration, enable = enable}
 local itemButton
 if not info.itemButton then
 if #freeButtons >= 1 then
 print('    |cFF00FFFFfound a free button')
 if itemButton.block then
 itemButton.block.itemButton = nil
 itemButton.block = nil
 end
 else
-local buttonIndex = mod.Quest.numButtons + #freeButtons + 1
+local buttonIndex = T.Quest.numButtons + #freeButtons + 1
 itemButton = CreateFrame('Button', 'VeneerQuestItemButton' .. buttonIndex, UIParent, 'VeneerItemButtonTemplate')
 itemButton.buttonIndex = buttonIndex
 itemButton:SetSize(36, 36)
 itemButton:GetNormalTexture():SetSize(36 * (5/3), 36 * (5/3))
 print('    |cFFFF4400starting new button', itemButton:GetName())
 end
-mod.Quest.numButtons = mod.Quest.numButtons + 1
+T.Quest.numButtons = T.Quest.numButtons + 1
 else
 itemButton = info.itemButton
 print('    |cFF00FF00found assigned button', itemButton:GetName())
 end
 Veneer_QuestObjectiveItem_UpdateCooldown(itemButton);
 return itemButton
 end
 --- Clear an itemButton from the given block
-mod.FreeItemButtons = function(block)
+T.FreeItemButtons = function(block)
 if block.itemButton then
 local itemButton = block.itemButton
 if itemButton.questID ~= block.info.questID then
 block.itemButton = nil
-itemButton.block = mod.Quest.InfoBlock[itemButton.questID]
+itemButton.block = T.Quest.InfoBlock[itemButton.questID]
 else
 itemButton.block = nil
 itemButton:Hide()
 usedButtons[itemButton.questID] = nil
 freeButtons[#freeButtons + 1] = itemButton
-mod.Quest.numButtons = mod.Quest.numButtons - 1
+T.Quest.numButtons = T.Quest.numButtons - 1
 print('|cFFFF0088released', itemButton:GetName(),'and', block:GetName())
 end
 end
 end
 if (rangeTimer) then
 rangeTimer = rangeTimer - elapsed
 if (rangeTimer <= 0) then
 local link, item, charges, showItemWhenComplete = GetQuestLogSpecialItemInfo(self.questLogIndex)
 if ((not charges) or (charges ~= self.charges)) then
-mod:Update()
+T:Update()
 return
 end
 local count = self.HotKey
 local valid = IsQuestLogSpecialItemInRange(self.questLogIndex)
 assetID = assetID,
 quantityString = quantityString,
 criteriaID = criteriaID,
 ]]
 local newWidgetID = 0
-mod.WidgetRegistry = {}
+T.WidgetRegistry = {}
-local wr = mod.WidgetRegistry
+local wr = T.WidgetRegistry
 --- Get a usable widget for the given achievement criteria set.
 -- Returns a frame object with dimensioning parameters needed to size the receiving tracker block
-mod.SetWidget = function(line, data, objectiveType, objectiveKey)
+T.SetWidget = function(line, data, objectiveType, objectiveKey)
 local print = B.print('ObjectiveWidgets')
 local widgetType = objectiveType
 local widget
 if wr[widgetType] and wr[widgetType].used[objectiveKey] then
 widget = wr[widgetType].used[objectiveKey]
 wr[widgetType].used[objectiveKey] = widget
 widget.line = line
 widget.objective = data
 widget.key = objectiveKey
-mod.InitializeWidget(widget)
+T.InitializeWidget(widget)
 return widget
 end
 --- WidgetTemplate 'OnLoad'
-mod.RegisterWidget = function(frame)
+T.RegisterWidget = function(frame)
 local print = B.print('ObjectiveWidgets')
 local widgetType = frame.widgetType
 if not wr[frame.widgetType] then
 print('|cFFFF4400[[WidgetTemplate]]|r', widgetType)
 wr[widgetType] = { lastn = 1, free = {}, used = {}, usedIndex = {}, freeIndex = {} }
 wr[widgetType].lastn = wr[widgetType].lastn + 1
 end
 end
 --- WidgetTemplate 'OnShow'
-mod.InitializeWidget = setmetatable({}, {
+T.InitializeWidget = setmetatable({}, {
 __call = function(t, frame)
 -- todo: config pull
-frame:SetWidth(mod.Conf.Wrapper.Width - mod.Conf.Style.Format.status.Indent * 2)
+frame:SetWidth(T.Conf.Wrapper.Width - T.Conf.Style.Format.status.Indent * 2)
-frame:SetScript('OnEvent', mod.UpdateWidget[frame.widgetType])
+frame:SetScript('OnEvent', T.UpdateWidget[frame.widgetType])
 frame:RegisterEvent('TRACKED_ACHIEVEMENT_UPDATE')
 frame:RegisterEvent('TRACKED_ACHIEVEMENT_LIST_CHANGED')
 frame:RegisterEvent('CRITERIA_UPDATE')
 frame:RegisterEvent('CRITERIA_COMPLETE')
 frame:RegisterEvent('CRITERIA_EARNED')
 t[frame.widgetType](frame)
-mod.UpdateWidget[frame.widgetType](frame)
+T.UpdateWidget[frame.widgetType](frame)
 end,
 })
 --- WidgetTemplate 'OnEvent'
-mod.UpdateWidget = setmetatable({}, {
+T.UpdateWidget = setmetatable({}, {
 __call = function(t, frame)
 if not frame.widgetType then
 error('Invalid widget template, needs .widgetType')
 return
 end
 return t[frame.widgetType](frame)
 end
 })
 --- WidgetTemplate 'OnHide'
-mod.ReleaseWidget = function(frame)
+T.ReleaseWidget = function(frame)
 --[[
 local print = B.print('ObjectiveWidgets')
 local reg = wr[frame.widgetType]
 if reg and reg.used[frame.key] then
 reg.used[frame.key] = nil
 end
 ]]
 end
 --- RemoveTrackedAchievement post-hook
-mod.CleanWidgets = function()
+T.CleanWidgets = function()
 local print = B.print('ObjectiveWidgets')
 local tracked = {GetTrackedAchievements() }
 local tasks = GetTasksTable()
-for type, reg in pairs(mod.WidgetRegistry) do
+for type, reg in pairs(T.WidgetRegistry) do
 print('collecting', type)
 for key, frame in pairs(reg.used) do
 if frame.objective.cheevID then
 local id = frame.objective.cheevID
 end
 end
-mod.defaults.WidgetStyle = {
+T.defaults.WidgetStyle = {
 }
 local progressHeight = 16
 local progressBorder = 1
 local progressIndent = 3
 local progressFont = _G.VeneerCriteriaFontNormal
-mod.InitializeWidget.ProgressBar = function(self)
+T.InitializeWidget.ProgressBar = function(self)
-local c = mod.Conf.Wrapper
+local c = T.Conf.Wrapper
 self.height = progressHeight + c.TextSpacing
 self.width = c.Width - c.TextSpacing
 self.indent = progressIndent
 self:SetHeight(progressHeight)
 self.fg:SetHeight(progressHeight - progressBorder *  2)
 self.status:SetFontObject(progressFont)
 self.status:SetText(self.objective.quantityString)
 end
-mod.UpdateWidget.ProgressBar = function (self)
+T.UpdateWidget.ProgressBar = function (self)
 local quantity, requiredQuantity = self.objective.value, self.objective.maxValue
 print('update vals:')
 for k,v in pairs(self.line) do
 print(k, v)
 end
 self.fg:Hide()
 end
 end
-mod.InitializeWidget.Hidden = function (self)
+T.InitializeWidget.Hidden = function (self)
 self.height = 0
 end
-mod.UpdateWidget.Hidden = function (self)
+T.UpdateWidget.Hidden = function (self)
 self.height=  0
 end

Mercurial > wow > buffalo2

comparison ObjectiveTracker/ObjectiveWidgets.lua @ 24:66b927b46776