wow/buffalo2: ObjectiveTracker/Frame.lua comparison

comparison ObjectiveTracker/Frame.lua @ 29:adcd7c328d07

code collation cleaning

author	Nenue
date	Wed, 13 Apr 2016 21:53:24 -0400
parents	c33c17dd97e7
children	7583684becf4

comparison

equal deleted inserted replaced

-:c33c17dd97e7
+:adcd7c328d07
 local UnitLevel, IsQuestWatched, UIParent = UnitLevel, IsQuestWatched, UIParent
 local GetAutoQuestPopUp, GetQuestLogCompletionText = GetAutoQuestPopUp, GetQuestLogCompletionText
 local PERCENTAGE_STRING, GetQuestProgressBarPercent = PERCENTAGE_STRING, GetQuestProgressBarPercent
 local Default, AutoQuest, Quest, Bonus, Cheevs = T.DefaultHandler, T.AutoQuest, T.Quest, T.Bonus, T.Cheevs
 local InCombatLockdown, format, lshift, CreateFrame = InCombatLockdown, format, bit.lshift, CreateFrame
+local IsModifiedClick, ChatEdit_GetActiveWindow = IsModifiedClick, ChatEdit_GetActiveWindow
 local print = B.print('Tracker')
 local unitLevel = 1
 local OBJECTIVE_TRACKER_UPDATE_REASON = OBJECTIVE_TRACKER_UPDATE_REASON
 local debug = false
 --------------------------------------------------------------------
 T.AddBlock = function(self, block)
 local print = bprint
 local tracker = self.frame
 local info = block.info
-currentBlock:SetPoint('TOPLEFT', self.currentAnchor, 'BOTTOMLEFT', 0, 0)
+block:SetPoint('TOPLEFT', self.currentAnchor, 'BOTTOMLEFT', 0, 0)
-currentBlock:SetPoint('RIGHT', tracker,'RIGHT', 0, 0)
+block:SetPoint('RIGHT', tracker,'RIGHT', 0, 0)
-self.currentAnchor = currentBlock
+self.currentAnchor = block
-print('    |cFFFFFF00'..tracker.height..'|r', '|cFF00FF00'..currentBlock:GetName()..'|r', currentBlock.height, tracker.height)
+print('    |cFFFFFF00'..tracker.height..'|r', '|cFF00FF00'..block:GetName()..'|r', block.height, tracker.height)
-tracker.height = tracker.height + currentBlock.height
+tracker.height = tracker.height + block.height
-tracker.numBlocks = max(tracker.numBlocks, info.blockIndex)
+self.numBlocks = max(self.numBlocks, info.blockIndex)
-tracker.actualBlocks = tracker.actualBlocks + 1
+self.actualBlocks = self.actualBlocks + 1
 end
 --- Used as an iterator of sorts for cascaded tag icon placements (the daily/faction/account icons)
 T.AddTag = function (block, tagName, tagPoint, tagAnchor, tagRelative)
 local print = bprint
 end
 return lines[lineIndex]
 end
 --- Creates or retrieves a complete block frame object
 T.GetBlock = function(handler, blockIndex)
 local print = bprint
 local block = handler.usedBlocks[blockIndex]
 local c = T.Conf.Wrapper
 block.index = blockIndex
-block.SetStyle = T.SetBlockStyle
 block:SetWidth(c.Width)
 block.title:SetSpacing(c.TitleSpacing)
 block.title:SetPoint('TOP', block, 'TOP', 0, -titleSpacing)
 tracker.title:SetFont(headerFont, headerSize, headerOutline)
 tracker.titlebg:SetHeight(headerHeight)
 tracker.title:SetTextColor(unpack(headerColor))
 self.currentAnchor = tracker.titlebg
-local numWatched = self:GetNumWatched()
+self.numWatched = self:GetNumWatched()
-local numBlocks = self.numBlocks
+self.actualBlocks = 0
-local actualBlocks = 0
 for watchIndex = 1, 25 do
 blockIndex = blockIndex + 1
-if watchIndex <= numWatched then
+if watchIndex <= self.numWatched then
 local info = self:GetInfo(watchIndex)
 if info then
 local currentBlock = self:UpdateBlock(blockIndex, info)
-T.AddBlock(currentBlock)
+T.AddBlock(self, currentBlock)
 else
 print('    |cFFFF0000bad GetInfo data for #'..watchIndex)
 end
-elseif watchIndex <= numBlocks then
+elseif watchIndex <= self.actualBlocks then
 local used = self.usedBlocks
 local free = self.freeBlocks
 print('clean up dead quest block')
 if used[blockIndex] then
 used[blockIndex]:Hide()
 print('  |cFFFF9900END|r @', blockIndex)
 break -- done with quest stuff
 end
 end
-self.numWatched = numWatched
-self.numBlocks = numBlocks
+if self.actualBlocks >= 1 then
-self.actualBlocks = actualBlocks
-if numBlocks >= 1 then
 tracker.height = tracker.height + headerHeight
 tracker:Show()
 if tracker.wasEmpty then
 tracker.headerFade:Play()
 tracker.wasEmpty = nil
 end
 if tracker.height ~= tracker.previousHeight then
 tracker:SetHeight(tracker.height)
 end
+print('    |cFFFFFF00', tracker.height, tracker:GetWidth())
 else
 tracker:Hide()
 tracker.wasEmpty = true
 end
 T.UpdateItemButtonCooldown = function(button)
 end
-Default.Select = function(self)
+Default.Select = function(handler, block)
-T:Update(self.watchReasonModule)
+T:Update(handler.watchReasonModule)
 end
-Default.Open = function(self)
+Default.Open = function(handler, block)
-T:Update(self.watchReasonModule)
+T:Update(handler.watchReasonModule)
 end
-Default.Remove = function(self)
+Default.Remove = function(handler, block)
-T:Update(self.watchReasonModule)
+T:Update(handler.watchReasonModule)
 end
-Default.Report = function(self)
+Default.Report = function(handler, block)
-print('Stats:', self.numWatched,'items tracked,', self.numBlocks,'blocks assigned.')
+print('Stats:', handler.numWatched,'items tracked,', handler.numBlocks,'blocks assigned.')
 end
 Default.OnMouseUp = function(self, button)
 print(self.handler.name, self.mainStyle, self.subStyle)
 if button == 'LeftButton' then
 if IsModifiedClick("CHATLINK") and ChatEdit_GetActiveWindow() then
-self:Link()
+self.Link(self.handler, self)
 elseif IsModifiedClick("QUESTWATCHTOGGLE") then
-self:Remove()
+self.Remove(self.handler, self)
 else
-self:Select()
+self.Select(self.handler, self)
 end
 elseif button == 'RightButton' then
-self:Open()
+self.Open(self.handler, self)
 end
 self.initialButton = nil
 self.modChatLink = nil
 self.modQuestWatch = nil
-mod:Update(self.handler.updateReasonModule)
+T:Update(self.handler.updateReasonModule)
 print('|cFFFF8800'..tostring(self:GetName())..':MouseUp()|r')
 end
 Default.OnMouseDown = function(self, button)
-print(IsModifiedClick("CHATLINK"), IsModifiedClick("QUESTWATCHTOGGLE"))
 print(self.info.title)
 end

Mercurial > wow > buffalo2

comparison ObjectiveTracker/Frame.lua @ 29:adcd7c328d07