wow/buffalo2: ObjectiveUI.lua comparison

comparison ObjectiveUI.lua @ 8:7923243ae972

ObjectiveUI & ObjectiveEvents - securehook to API calls for compatibility with addons that work with the objective tracking interface - let the API hooks invoke ObjectiveUI functions when possible - ObjectiveUI framescript handlers should use the corresponding API call if possible, so that addon space can be fully aware of our actions - Sanity check cached data when possible during 'Remove' hooks ObjectiveInfo - Add cheevID to criteria info ObjectiveCore - Index quest tracker blocks by their watch offset, and use that to verify whether the given block frame should be released into pool ObjectiveFrame - Differentiate between visible and non-visible unused buttons, and only release when their quest has been dropped

author	Nenue
date	Fri, 01 Apr 2016 14:40:14 -0400
parents	5301c68f28d8
children	2698173edd40

comparison

equal deleted inserted replaced

-:5301c68f28d8
+:7923243ae972
 self:Open()
 end
 self.initialButton = nil
 self.modChatLink = nil
 self.modQuestWatch = nil
-print('|cFFFF8800'..tostring(self:GetName())..':MouseUp()|r ->',self.info.trackingID)
+print(IsModifiedClick("CHATLINK"), IsModifiedClick("QUESTWATCHTOGGLE"))
+print('|cFFFF8800'..tostring(self:GetName())..':MouseUp()|r')
 end
 Tracker.OnMouseDown = function(self, button)
 self.initialButton = button
 self.modChatLink = IsModifiedClick("CHATLINK")
 self.modQuestWatch = IsModifiedClick("QUESTWATCHTOGGLE")
 self:SetStyle('Active')
+print(IsModifiedClick("CHATLINK"), IsModifiedClick("QUESTWATCHTOGGLE"))
 print(self.info.title)
 end
 -----------------------------
 --- AUTO_QUEST
 end
 Quest.Remove = function(self)
 print('removing', self.info.questLogIndex, 'from watcher')
 RemoveQuestWatch(self.info.questLogIndex)
-mod.Quest.LogBlock[self.info.questLogIndex] = nil
-mod.Quest.QuestBlock[self.info.questID] = nil
-QuestPOIUpdateIcons()
-mod.UpdateWrapper()
 end
 -----------------------------
 --- CHEEVS
 Cheevs.Select = function(self)
 end
+Cheevs.Remove = function(self)
+RemoveTrackedAchievement(self.info.cheevID)
+end
+Cheevs.OnMouseUp = function(self)
+Tracker.OnMouseUp(self)
+self:SetStyle('CheevNormal')
+end
 Cheevs.Link = function(self)
 local achievementLink = GetAchievementLink(self.info.cheevID);
 if ( achievementLink ) then
 ChatEdit_InsertLink(achievementLink);
 end
-self:SetStyle('CheevNormal')
 end
 Cheevs.Open = function(self)
 if ( not AchievementFrame ) then
 AchievementFrame_LoadUI();
 local wr = mod.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(obj, info)
+local print = B.print('ObjectiveWidgets')
 local widgetType = obj.type
 local widget
+if wr[widgetType] and wr[widgetType].used[obj.criteriaID] then
-if not wr[widgetType] or #wr[widgetType].free == 0 then
+widget = wr[widgetType].used[obj.criteriaID]
-print('VeneerObjectiveCriteria' .. widgetType)
+print('|cFF00FF00Updating ('..obj.criteriaID..')', widget)
-widget = CreateFrame('Frame', nil, VeneerObjectiveScroll, 'VeneerObjectiveCriteria' .. widgetType)
+elseif not wr[widgetType] or #wr[widgetType].free == 0 then
-end
+widget = CreateFrame('Frame', 'VeneerObjective' .. widgetType .. (wr[widgetType] and (wr[widgetType].lastn+1) or (1)), VeneerObjectiveScroll, 'VeneerObjectiveCriteria' .. widgetType)
-local free = wr[widgetType].free
-local used = wr[widgetType].used
+print('|cFFFF0088Creating `'..widget:GetName()..'` id', wr[widgetType].lastn)
+else
-widget = tremove(free)
+widget = tremove(wr[widgetType].free)
-local index = #used+1
+print('|cFFFFFF00Acquiring released widget', widget:GetName())
-used[index] = widget
+end
-wr[widgetType].usedIndex[widget] = index
+wr[widgetType].used[obj.criteriaID] = widget
 widget.info = obj
 widget.parentInfo = info
 mod.InitializeWidget(widget)
 return widget
 end
---- Fired by OnLoad() when a new frame is spawned
+--- WidgetTemplate 'OnLoad'
 mod.RegisterWidget = function(frame)
+local print = B.print('ObjectiveWidgets')
 local widgetType = frame.widgetType
-local obj = frame.info
 if not wr[frame.widgetType] then
 print('|cFFFF4400[[WidgetTemplate]]|r', widgetType)
-wr[widgetType] = { lastn = 0, free = {}, used = {}, usedIndex = {}, freeIndex = {} }
+wr[widgetType] = { lastn = 1, free = {}, used = {}, usedIndex = {}, freeIndex = {} }
-end
+else
-tinsert(wr[frame.widgetType].free, frame)
+print('|cFF0088FF+ [[WidgetTemplate]]r', widgetType, wr[widgetType].lastn)
-end
+wr[widgetType].lastn = wr[widgetType].lastn + 1
+end
+end
+--- WidgetTemplate 'OnShow'
 mod.InitializeWidget = setmetatable({}, {
 __call = function(t, frame)
 -- todo: config pull
 local maxWidth = 250
 frame:RegisterEvent('CRITERIA_EARNED')
 return t[frame.widgetType](frame)
 end,
 })
+--- WidgetTemplate 'OnEvent'
 mod.UpdateWidget = setmetatable({}, {
 __call = function(t, frame)
 if not frame.widgetType then
 error('Invalid widget template, needs .widgetType')
 return
 return t[frame.widgetType](frame)
 end
 })
+--- WidgetTemplate 'OnHide'
 mod.ReleaseWidget = function(frame)
+local print = B.print('ObjectiveWidgets')
 local reg = wr[frame.widgetType]
-if reg and reg.usedIndex[frame] then
+if reg and reg.used[frame.info.criteriaID] then
-tremove(reg.used, reg.usedIndex[frame])
+reg.used[frame.info.criteriaID] = nil
-reg.usedIndex[frame] = nil
+frame.info = nil
+frame.parentInfo = nil
 frame:UnregisterAllEvents()
 tinsert(reg.free, frame)
+print('|cFFBBBBBBreleased from service', frame:GetName())
+end
+end
+--- RemoveTrackedAchievement post-hook
+mod.CleanWidgets = function()
+local print = B.print('ObjectiveWidgets')
+local tracked = {GetTrackedAchievements() }
+for type, reg in pairs(mod.WidgetRegistry) do
+print('collecting', type)
+for criteriaID, frame in pairs(reg.used) do
+local id = frame.info.cheevID
+if id and not tContains(tracked, id) then
+print('  untracked achievement', id, 'associated with', criteriaID, frame:GetName())
+frame:Hide()
+end
+end
 end
 end
 mod.WidgetParams = {
 ['ProgressBar'] = {
 quantityString = {SetFontObject = _G.VeneerFontNormal}
 }
 }
 mod.InitializeWidget.ProgressBar = function(self)
+local print = B.print('ObjectiveWidgets')
 local params = mod.WidgetParams[self.widgetType]
 self.height = params.height
 self:SetHeight(20)
 self.bg:SetHeight(20)
-self.fg:SetHeight(18)
+self.fg:SetHeight(16)
 self.fg:SetPoint('BOTTOMLEFT', self.bg, 'BOTTOMLEFT', 1, 1)
 self.quantityString:SetFontObject(params.quantityString.SetFontObject)
 self.quantityString:SetText(self.info.quantityString)
 end
 mod.UpdateWidget.ProgressBar = function (self)
+local print = B.print('ObjectiveWidgets')
 local quantity, requiredQuantity = self.info.quantity, self.info.requiredQuantity
-self.fg:SetPoint('TOPLEFT', self, 'TOPLEFT', 0, 0)
 if self.info.finished then
 self.fg:SetWidth(self.bg:GetWidth() - 2)
 elseif quantity == 0 then
 self.fg:Hide()
 else
 self.fg:Show()
-self.fg:SetWidth(self:GetWidth() * (quantity / requiredQuantity))
+self.fg:SetWidth((self:GetWidth()-2) * (quantity / requiredQuantity))
 end
+end
-end

Mercurial > wow > buffalo2

comparison ObjectiveUI.lua @ 8:7923243ae972