wow/buffalo2: ObjectiveTracker/Layout.lua comparison

comparison ObjectiveTracker/Layout.lua @ 44:756e8aeb040b

- Default.lua - simplified the response to SuperTrackedQuestID changes - tag icons work again

author	Nenue
date	Mon, 25 Apr 2016 19:37:13 -0400
parents	9480bd904f4c
children	dd1ae565f559

comparison

equal deleted inserted replaced

-:9480bd904f4c
+:756e8aeb040b
 local print = bprint
 local tracker = self.frame
 local info = block.info
 block.index = blockIndex
--- if animating, skip this segment
+print('blockschema', blockSchema, block.schema)
-if not block.isAnimating then
+if blockSchema ~= block.schema then
-print('blockschema', blockSchema, block.schema)
+T.UpdateSchema('block', block.schema)
-if blockSchema ~= block.schema then
+print('  ### activating block schema:|cFF0088FF', block.schema)
-T.UpdateSchema('block', block.schema)
+end
-print('  ### activating block schema:|cFF0088FF', block.schema)
-end
+block:SetWidth(T.Conf.Wrapper.Width)
+block.title:SetSpacing(titleSpacing)
-block:SetWidth(T.Conf.Wrapper.Width)
+block.title:SetPoint('TOP', block, 'TOP', 0, -titleSpacing)
-block.title:SetSpacing(titleSpacing)
+block.title:SetPoint('LEFT', block, 'LEFT', titleIndent, 0)
-block.title:SetPoint('TOP', block, 'TOP', 0, -titleSpacing)
+block.title:SetTextColor(unpack(titleColor))
-block.title:SetPoint('LEFT', block, 'LEFT', titleIndent, 0)
+block.titlebg:SetTexture(1,1,1,1)
-block.title:SetTextColor(unpack(titleColor))
+block.titlebg:SetGradientAlpha(unpack(titlebg))
-block.titlebg:SetTexture(1,1,1,1)
+block.titlebg:SetPoint('TOP', block, 'TOP', 0, 0)
-block.titlebg:SetGradientAlpha(unpack(titlebg))
+block.titlebg:SetPoint('BOTTOM', block.title, 'BOTTOM', 0, -titleSpacing)
-block.titlebg:SetPoint('TOP', block, 'TOP', 0, 0)
+block.status:SetSpacing(textSpacing)
-block.titlebg:SetPoint('BOTTOM', block.title, 'BOTTOM', 0, -titleSpacing)
+block.status:SetPoint('TOP', block.titlebg, 'BOTTOM', 0, -textSpacing)
-block.status:SetSpacing(textSpacing)
+block.status:SetPoint('LEFT', block.titlebg, 'LEFT', textIndent, 0)
-block.status:SetPoint('TOP', block.titlebg, 'BOTTOM', 0, -textSpacing)
+block.statusbg:SetPoint('TOP', block.titlebg, 'BOTTOM', 0, 0)
-block.status:SetPoint('LEFT', block.titlebg, 'LEFT', textIndent, 0)
+block.statusbg:SetPoint('BOTTOM', block, 'BOTTOM', 0, 0)
-block.statusbg:SetPoint('TOP', block.titlebg, 'BOTTOM', 0, 0)
+block.statusbg:SetTexture(1,1,1,1)
-block.statusbg:SetPoint('BOTTOM', block, 'BOTTOM', 0, 0)
+block.statusbg:SetGradientAlpha(unpack(textbg))
-block.statusbg:SetTexture(1,1,1,1)
+block.SelectionOverlay:SetGradientAlpha(unpack(selectionbg))
-block.statusbg:SetGradientAlpha(unpack(textbg))
+block.SelectionOverlay:SetPoint('TOPLEFT', selectionIndent, 0)
-block.SelectionOverlay:SetGradientAlpha(unpack(selectionbg))
+block.SelectionOverlay:SetPoint('BOTTOMRIGHT')
-block.SelectionOverlay:SetPoint('TOPLEFT', selectionIndent, 0)
-block.SelectionOverlay:SetPoint('BOTTOMRIGHT')
+local titleHeight = floor(block.title:GetHeight()+.5)
-local anchor, target, point, x, y = 'TOPRIGHT', block, 'TOPRIGHT', -2, -2
+local titlebgHeight = titleHeight + titleSpacing*2
-for i, tile in ipairs(block.rewardTile)  do
+block.titlebg:SetHeight(titlebgHeight)
---print(rewardSize)
-tile:SetSize(rewardSize, rewardSize)
+local statusHeight = floor(block.status:GetHeight()+.5)
-tile:ClearAllPoints()
+local statusbgHeight = statusHeight + textSpacing*2
-tile:SetPoint(anchor, target, point, x, y)
+local attachmentHeight =floor(block.attachmentHeight + .5)
-block.rewardLabel[i]:SetPoint('TOP', tile, 'TOP', 0, 0)
-anchor, target, point, x, y = 'TOPRIGHT', tile, 'TOPLEFT', -2, 0
+if attachmentHeight > 0 then
-end
+attachmentHeight = attachmentHeight + textSpacing
+end
-local titleHeight = floor(block.title:GetHeight()+.5)
+block.height = titlebgHeight + attachmentHeight
-local titlebgHeight = titleHeight + titleSpacing*2
+block:SetHeight(block.height)
-block.titlebg:SetHeight(titlebgHeight)
+local anchor, target, point, x, y = 'TOPRIGHT', block, 'TOPRIGHT', -2, -2
-local statusHeight = floor(block.status:GetHeight()+.5)
+for i, tile in ipairs(block.rewardTile)  do
-local statusbgHeight = statusHeight + textSpacing*2
+--print(rewardSize)
-local attachmentHeight =floor(block.attachmentHeight + .5)
+tile:SetSize(rewardSize, rewardSize)
+tile:ClearAllPoints()
-self.print('AddBlock', 'anchor to|cFF0088FF', self.currentAnchor:GetName())
+tile:SetPoint(anchor, target, point, x, y)
-self.print('AddBlock', 'attachment:|cFF00FF00', attachmentHeight, '|rtitle:|cFF00FF00', titlebgHeight, '|r('.. titleHeight..')')
+block.rewardLabel[i]:SetPoint('TOP', tile, 'TOP', 0, 0)
-if attachmentHeight > 0 then
+anchor, target, point, x, y = 'TOPRIGHT', tile, 'TOPLEFT', -2, 0
-attachmentHeight = attachmentHeight + textSpacing
+end
-end
+self.print('AddBlock', 'anchor to|cFF0088FF', self.currentAnchor:GetName())
-block.height = titlebgHeight + attachmentHeight
+self.print('AddBlock', 'attachment:|cFF00FF00', attachmentHeight, '|rtitle:|cFF00FF00', titlebgHeight, '|r('.. titleHeight..')')
-block:SetHeight(block.height)
-end
 if block.debug then
 local func = (B.Conf.GuidesMode == true) and 'Show' or 'Hide'
 for _, region in ipairs(block.debug) do
 region[func]()
 end
 block:Show()
 if Devian and Devian.InWorkspace() then
 block.DebugTab:SetParent(UIParent)
-block.DebugTab:SetPoint('TOPRIGHT', block, 'TOPLEFT', 0, 0)
+block.DebugTab:SetPoint('RIGHT', block.titlebg, 'LEFT', 0, 0)
 block.DebugTab.status:SetText(tostring(block.schema) .. ' @|cFF00FF00' .. tostring(block.posIndex) .. '|r #|cFFFFFF00'.. tostring(info.logIndex or info.id) .. '|r'..
-' H|cFFFFFF00' .. tostring(block.height) .. ' L|cFF00FFFF' .. tostring(block.numLines) ..'|r')
+' H|cFFFFFF00' .. tostring(block.height) .. ' L|cFF00FFFF' .. tostring(block.numLines) ..'|r ' .. (info.statusKey or ''))
 block.DebugTab:Show()
 end
 end
+local tagOrder = {'completion', 'frequency', 'type'}
 --- Used as an iterator of sorts for cascaded tag icon placements (the daily/faction/account icons)
-Default.AddTag = function (handler, block, tagInfo, tagPoint, tagAnchor, tagRelative)
+Default.AddTags = function (handler, block, tagInfo, tagCoords)
 local print = bprint
-for order, tagName in ipairs(block.info.tagInfo) do
+local tagPoint, tagAnchor, tagRelative = 'TOPRIGHT', block, 'TOPRIGHT'
-local tag = block[tagName]
+handler.print('AddTag', block:GetName(), tagInfo, tagCoords)
-if block.tagCoords[tagName] and tag then
+for order, key in ipairs(tagOrder) do
-tag:SetTexCoord(unpack(block.tagCoords[tagName]))
+local tag = block[key .. 'Tag']
+if tag and tagInfo[key] then
+tag:SetTexCoord(unpack(tagInfo[key]))
 tag:Show()
 tag:SetPoint(tagPoint, tagAnchor, tagRelative, 0, 0)
 tagPoint, tagAnchor, tagRelative = 'TOPRIGHT', tag, 'TOPLEFT'
 else
-block[tagName]:Hide()
+block[key .. 'Tag']:Hide()
 end
 end
 return tagPoint, tagAnchor, tagRelative
 end

Mercurial > wow > buffalo2

comparison ObjectiveTracker/Layout.lua @ 44:756e8aeb040b