wow/buffalo2: ObjectiveTracker/Frame.lua comparison

comparison ObjectiveTracker/Frame.lua @ 31:48b3e3959a0a

- clean up method arguments

author	Nenue
date	Thu, 14 Apr 2016 19:39:05 -0400
parents	7583684becf4
children	a3afe6c3771e

comparison

equal deleted inserted replaced

-:7583684becf4
+:48b3e3959a0a
 local headerHeight, headerColor, headerSpacing = 16, {1,.75,0,1}, 2
 local headerbg = {'VERTICAL', 1, 1, 0.5, 0.5, 1, 1, 0.5, 0}
 local headerFont, headerSize, headerOutline = [[Interface\Addons\SharedMedia_MyMedia\font\ArchivoNarrow-Bold.ttf]], 14, 'OUTLINE'
-local titlebg = {'HORIZONTAL', 1, 0, .7, .25, 1, 0, .7, .125}
+local titlebg = {'HORIZONTAL', 1, 0, .7, 0, 1, 0, .7, .2}
-local titlebg_daily = {'HORIZONTAL', 0, .7, 1, .25, 0, 1, .7, .125 }
+local titlebg_daily = {'HORIZONTAL', 0, .7, 1, 0, 0, 1, .7, .2 }
-local titlebg_account = {'HORIZONTAL', 0, .45, 1, .25, 0,  .45, 1, .125}
+local titlebg_account = {'HORIZONTAL', 0, .45, 1, 0, 0,  .45, 1, .2}
 local titleFont, titleSize, titleOutline = [[Interface\Addons\SharedMedia_MyMedia\font\ArchivoNarrow-Bold.ttf]], 16, 'OUTLINE'
 local textbg =  {'HORIZONTAL', 0, 0, 0, 0.4, 0, 0, 0, 0 }
 local textbg_daily = {'HORIZONTAL', 0, .7, 1, .1, 0, 1, .7, .075 }
 local textbg_account = {'HORIZONTAL', 0, .45, 1, 0.4, 0,  .41, 1, .085 }
 local selectionbg = {'HORIZONTAL', 1, 1, 1, 0, 1, 1, 1, 0.225}
 local titleSpacing, textSpacing, blockSpacing = 3, 3, 1
 local titleIndent, textIndent,selectionIndent = 2, 5, 50
 local lineColors = {
-text = {.5,.75,1},
+normal = {
+text = {.5,.75,1},
+},
+completed = {
+text = {1,0,.1}
+},
+failed = {
+text = {1,0,0 }
+},
+autocomplete = {
+text = {0,1,0 }
+},
+object = {
+text = {0,1,1}
+},
+monster = {
+text = {1,1,0}
+},
+item = {
+text = {1,.25,.5}
+}
 }
 local wrapperMaxWidth, wrapperMaxHeight = 270, 490 -- these are the hard bounds, actual *Height variables are changed
 local wrapperHeadFont, wrapperHeadSize, wrapperHeadOutline = [[Interface\Addons\SharedMedia_MyMedia\font\ArchivoNarrow-Bold.ttf]], 16, 'NONE'
 local wrapperPosition = {'RIGHT', UIParent, 'RIGHT', -84, 0 }
 --- Adds the given line to the current content and advances the anchor pointer to that new line for the following call.
 Default.AddLine = function(handler, block, text, attachment, template)
 local print = lprint
 local lineIndex = block.currentLine + 1
 local line = handler:GetLine(block)
+line.index = lineIndex
 line:ClearAllPoints()
 line:SetPoint('LEFT', block, 'LEFT', 0, 0)
-line:SetPoint('TOP', block.endPoint, 'BOTTOM', 0, -textSpacing)
+line:SetPoint('TOP', block.endPoint, 'BOTTOM', 0, 0)
 line:SetPoint('RIGHT', block, 'RIGHT', 0, 0)
 line:Show()
-local r, g, b, a = 1, 1, 1, 1
+print('     |cFF0088FFAddLine >>|r', block, '::',  block.endPoint:GetName(),'"'.. text .. '"', attachment, template)
-if lineColors[template] then
-r, g, b = unpack(lineColors[template])
-end
 line.status:SetText(text)
 line.height = floor(line.status:GetStringHeight()+.5) + textSpacing
 line:SetHeight(line.height)
+local r, g, b, a = 1, 1, 1, 1
+if lineColors[template] then
+r, g, b = unpack(lineColors[template].text)
+end
 line.status:SetTextColor(r, g, b, a)
 -- For progressbar and timer lines, status text may be used as the title heading
 if attachment then
-local widgetPosition = 0
+local widgetOffset = 0
-attachment:SetPoint('TOP', line, 'TOP', 0, -block.attachmentHeight)
+if text and #text >= 1 then
+widgetOffset = line.status:GetHeight() + textSpacing
+line.height = floor(line.status:GetStringHeight()+.5) + textSpacing + attachment.height
+print('     |cFFFF0088doing things with captioned widget')
+else
+print('     |cFFFF0088doing things with a widget')
+end
+attachment:SetPoint('TOP', line, 'TOP', 0, -widgetOffset)
 attachment:Show()
-if text and #text >= 1 then
+end
-widgetPosition = line.status:GetHeight() + textSpacing
-line.status:SetText(text)
+block.attachmentHeight = block.attachmentHeight + line.height
-line.height = floor(line.status:GetStringHeight()+.5) + textSpacing + attachment.height
-print('      - progressbar has text, adjust')
-end
-else
-print('     |cFFFF0088no attachments')
-end
-block.endIndex = line.index
-block.attachmentHeight = block.attachmentHeight + (line.height + textSpacing)
 print('     |cFF0088FFsetting line #'..lineIndex..' for|r', block.info.title, "\n            |cFF0088FFsize:|r", line.height,
 "|cFF0088FFpoint:|r", line:GetPoint(1), "|cFF0088FFwidget:|r", (line.widget and 'Y' or 'N'))
 block.currentLine = lineIndex
-block.endPoint = line
+block.endPoint = line.statusbg -- edge used for the next block
+return lineIndex
 end
 --- Creates or retrieves a complete line data object
 Default.GetLine = function(handler, block, lineIndex)
 local print = lprint
 local blockIndex = block.index
 local lines = block.lines
 if not lineIndex then
 lineIndex = block.currentLine + 1
-print('fetching the "next" line:', lineIndex)
+print('        fetching the "next" line:', lineIndex)
 else
-print('fetching explicit offset:', lineIndex)
+print('        fetching explicit offset:', lineIndex)
 end
 block.numLines = max(block.numLines, lineIndex)
-print('|cFF00FFFFnumLines:|r', block.numLines, '|cFF00FFFFcurrentLine:|r', block.currentLine)
+print('        |cFF00FFFFposition|r', block.currentLine, '|cFF00FFFFof|r|cFFFFFF00' , block.numLines)
 if not lines[lineIndex] then
 print('     |cFF00FF88created line #'..lineIndex..' from for '..handler.name..' block #'..blockIndex)
 lines[lineIndex] = CreateFrame('Frame', 'Vn'..handler.name .. blockIndex..'ObjectiveLine'..lineIndex, block, 'VeneerTrackerObjective')
 local line = lines[lineIndex]
 block.title:SetSpacing(c.TitleSpacing)
 block.title:SetPoint('TOP', block, 'TOP', 0, -titleSpacing)
 block.titlebg:SetTexture(1,1,1,1)
-block.titlebg:SetGradientAlpha(unpack(Module.colors.default.titlebg))
+block.titlebg:SetGradientAlpha(unpack(titlebg))
 block.titlebg:SetPoint('TOP', block, 'TOP', 0, 0)
 block.titlebg:SetPoint('BOTTOM', block.title, 'BOTTOM', 0, -titleSpacing)
 block.status:SetSpacing(c.TextSpacing)
 block.status:SetPoint('TOP', block.titlebg, 'BOTTOM', 0, -textSpacing)
 block.status:SetPoint('LEFT', block.titlebg, 'LEFT', textIndent, 0)
 block.statusbg:SetPoint('TOP', block.titlebg, 'BOTTOM', 0, 0)
 block.statusbg:SetPoint('BOTTOM', block, 'BOTTOM', 0, 0)
 block.statusbg:SetTexture(1,1,1,1)
-block.statusbg:SetGradientAlpha(unpack(Module.colors.default.textbg))
+block.statusbg:SetGradientAlpha(unpack(textbg))
 block.SelectionOverlay:SetGradientAlpha(unpack(Module.colors.default.selectionbg))
 block.SelectionOverlay:SetPoint('TOPLEFT', selectionIndent, 0)
 block.SelectionOverlay:SetPoint('BOTTOMRIGHT')
 end
 -- workaround for scrollchild issue where layers fall out of sync: in this case, it's by 1 vertical pixel
 --block.highlight:SetPoint('TOPLEFT', block, 'TOPLEFT', 0, 1)
 --block.lowlight:SetPoint('BOTTOMLEFT', block, 'BOTTOMLEFT', 0, 1)
-tagPoint, tagAnchor, tagRelative = handler:AddTag(block, 'frequencyTag', tagPoint, tagAnchor, tagRelative)
+if info.tagInfo then
-tagPoint, tagAnchor, tagRelative = handler:AddTag(block, 'typeTag', tagPoint, tagAnchor, tagRelative)
+tagPoint, tagAnchor, tagRelative = handler:AddTag(block, 'frequencyTag', tagPoint, tagAnchor, tagRelative)
-tagPoint, tagAnchor, tagRelative = handler:AddTag(block, 'completionTag', tagPoint, tagAnchor, tagRelative)
+tagPoint, tagAnchor, tagRelative = handler:AddTag(block, 'typeTag', tagPoint, tagAnchor, tagRelative)
+tagPoint, tagAnchor, tagRelative = handler:AddTag(block, 'completionTag', tagPoint, tagAnchor, tagRelative)
+end
 return block
 end
 --- Does the main iterations for populating block content.
 -- Hooked by corresponding handler functions where additional details need to be sorted.
 Default.UpdateObjectives = function(handler, block)
 local print = lprint
 local info = block.info
-print('   |cFF00FF00default objectives routine', block:GetName())
+print('|cFF00FF00default.objectives', block:GetName())
+-- reset the starting positions
 block.endPoint = block.titlebg
 block.attachmentHeight = 0
 block.currentLine = 0
--- reset the starting positions
+local displayObjectiveHeader = false
 block.attachmentHeight = 0
-block.endPoint = block.titlebg
+local text, attachment, template
-local completionScore, completionMax = 0, 0
+if info.statusKey and (Devian and Devian.InWorkspace()) then
-local displayObjectiveHeader = false
+handler:AddLine(block, info.statusKey, nil)
+end
---- The first line is going to be used no matter what, so it is hard-pulled.
--- It also ensures that we're in the right position for cleaning up the leftover lines.
-block.attachmentHeight = 0
-local text, attachment
 if info.description and #info.description >= 1 then
 print('   |cFF00FFFF  header line:|r', info.description)
 text = info.description
 handler:AddLine(block, text, nil)
 end
 if (info.isComplete or info.numObjectives == 0) and info.completionText then
 print('     overriding line #1 for completion text:', info.completionText)
 text = info.completionText
-Module.AddLine(block, text, nil)
+handler:AddLine(block, text, nil)
 else
 if info.objectives then
 for i, data in ipairs(info.objectives) do
 local line = handler:GetLine(block)
 displayObjectiveHeader = true
 line.height = 0
-text, attachment = handler:UpdateLine(block, line, data)
+text, attachment, template = handler:UpdateLine(block, line, data)
 print('     |cFF88FF00#', i, data.type, text)
-handler:AddLine(block, text, attachment)
+handler:AddLine(block, text, attachment, template)
 end
 end
 end
 block.lines[i]:ClearAllPoints()
 block.lines[i]:Hide()
 end
 if block.currentLine > 0 then
-block.attachmentHeight = block.attachmentHeight + textSpacing * 2
+block.attachmentHeight = block.attachmentHeight + textSpacing
 print('     |cFF00FF00attachment:', block.attachmentHeight)
 end
-if debug then
-for i, region in ipairs(block.debug) do
-for j = 1, region:GetNumPoints() do
-local _, target = region:GetPoint(j)
-if target:IsVisible() then
-region:Hide()
-else
-region:Show()
-end
-end
-end
-end
-block.completionScore = completionScore / completionMax
 end
 --- Module-specific display variables
 -- * height   - height of whatever display widget is involved in conveying the task
 -- * money    - boolean that determines listening for money events or not
 -- * progress - number ranging 0 to 2 indicating none/partial/full completion respectively
-Default.UpdateLine = function(block, line)
+Default.UpdateLine = function(handler, block, line, data)
 if line.finished then
 line.progress = 2
 elseif line.quantity > 0 then
 line.progress  = 1
 else
 line.progress = 0
 end
-return line.displayText, line.widget
+return data.text, line.widget, 'normal'
 end
 ----------
 --- Top level methods
 --- Queue any active item buttons for update for that frame

Mercurial > wow > buffalo2

comparison ObjectiveTracker/Frame.lua @ 31:48b3e3959a0a