wow/buffalo2: ObjectiveFrame.lua comparison

comparison ObjectiveFrame.lua @ 22:9b3fa734abff

ObjectiveFrame - polish quest rewards display - implement money objectives - set line metrics in UpdateLine - set block metrics in UpdateBlock (sum of line metrics)

author	Nenue
date	Sat, 09 Apr 2016 07:32:45 -0400
parents	d5ee940de273
children

comparison

equal deleted inserted replaced

-:d5ee940de273
+:9b3fa734abff
 local blockSpacing = 1
 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 headerFont, headerSize, headerHeight = [[Interface\Addons\SharedMedia_MyMedia\font\ArchivoNarrow-Bold.ttf]], 18, 24
 local headerOutline, headerColor, headerSpacing = 'OUTLINE', {1,1,1,1}, 2
-local wrapperPosition = {'RIGHT', UIParent, 'RIGHT', -84, 0}
+local wrapperPosition = {'RIGHT', UIParent, 'RIGHT', -84, 0 }
+local rewardSize = 32
 local oprint = B.print('Objectives')
 local bprint = B.print('Block')
 local tprint = B.print('Tracker')
 local lprint = B.print('Line')
 block.statusbg:SetGradientAlpha(unpack(textbg))
 block.SelectionOverlay:SetPoint('TOPLEFT')
 block.SelectionOverlay:SetPoint('BOTTOMRIGHT')
+block.icon:SetSize(rewardSize, rewardSize)
+block.icon:SetPoint('TOPRIGHT', block, 'TOPRIGHT', -2, -2)
 --- methods for event handlers
 block.Select = handler.Select
 displayObjectiveHeader = true
 end
 local attachmentHeight = 0
 if info.objectives then
+attachmentHeight = textSpacing * 2
 for i, data in ipairs(info.objectives) do
 print('     |cFF88FF00#', i, data.type, data.text)
 displayObjectiveHeader = true
 local line = block:GetLine(i)
 line.height = 0
 block:UpdateLine(line, data)
 line:ClearAllPoints()
-if line.displayText then
+if line.widget then
+local widgetPosition = 0
+line.widget:SetPoint('TOP', line, 'TOP', 0, -widgetPosition)
+line.widget:Show()
+line.height = line.widget:GetHeight() + textSpacing
+if line.displayText and #line.displayText >= 1 then
+widgetPosition = line.status:GetHeight() + textSpacing
+line.status:SetText(line.displayText)
+line.height = floor(line.status:GetStringHeight()+.5) + textSpacing + line.widget.height
+print('      - progressbar has text, adjust')
+end
+elseif line.displayText then
 line.status:SetText(line.displayText)
-line.height = floor(line.status:GetStringHeight()+.5)
+line.height = floor(line.status:GetStringHeight()+.5) + textSpacing
 end
+attachmentHeight = attachmentHeight + line.height
-if line.widget then
-line.widget:SetPoint('TOP', line, 'TOP', 0, 0)
-line.widget:Show()
-end
 line:Show()
 line:SetPoint('LEFT', block, 'LEFT', 0, 0)
 line:SetPoint('TOP', block.endPoint, 'BOTTOM', 0, 0)
 line:SetPoint('RIGHT', block, 'RIGHT', 0, 0)
 line:SetHeight(line.height)
-attachmentHeight = attachmentHeight + line.height
 print('      sz', line:GetSize())
 print('      pt', line:GetPoint(1))
 print('     |cFF44BBFF#', i, 'anchoring line, size:', line.height, 'current endpoint:', line.statusbg)
 block.endPoint = line
 end
 if attachmentHeight > 0 then
-block.attachmentHeight = attachmentHeight + textSpacing * 2
+block.attachmentHeight = attachmentHeight
 print('     |cFF00FF00attachment:', block.attachmentHeight)
 end
 local lines = handler.lines[block.blockIndex]
-local numObjectives = info.numObjectives
+local numObjectives = #info.objectives
 local numLines = #lines
-if numLines > numObjectives then
+if lines and numLines > numObjectives then
 print('   has extra lines, need to clean up;', numLines, numObjectives)
 for  i = numObjectives+1, numLines do
 print('    hide', i, lines[i]:GetName())
 lines[i]:Hide()
 end
 end
 Quest.UpdateObjectives = function(handler, block)
 local print = lprint
 print('|cFF00FFFFUpdateObjectives()')
-Default.UpdateObjectives(handler, block)
 local info = block.info
 local completionText
 if info.isAutoComplete then
 local questID, popupType = GetAutoQuestPopUp(info.questLogIndex)
 if popupType == 'COMPLETE' then
 completionText = CLICK_TO_COMPLETE
 end
 end
-if not completionText then
+if info.isComplete then
-completionText = GetQuestLogCompletionText(info.questLogIndex)
+if not completionText then
-end
+completionText = GetQuestLogCompletionText(info.questLogIndex)
+end
-block.status:SetText()
+else
+Default.UpdateObjectives(handler, block)
+end
 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
 end
 line.displayColor = {r, g, b, a}
 line.status:SetTextColor(r, g, b, a)
 line.displayText = data.text
 return line
 end
 Bonus.UpdateLine = function(handler, block, line, data)
 local info = block.info
 local print = lprint
 line.displayColor = 'FFFFFF'
-if data.text and not info.title then
+line.displayText = data.text
-print('using first text item as title')
-info.title = data.text
-else
-line.displayText = data.text
-end
 line.progress = 0
 print('  ', data.objectiveIndex,'|cFFFF0088-|r', data.objectiveType, data.text)
 if data.objectiveType == 'progressbar' then
 line.widgetType = 'ProgressBar'
 print('    |cFFFF44DDpercent='..tostring(GetQuestProgressBarPercent(info.questID)))
 line.progress = 2
 end
 line.format = PERCENTAGE_STRING
 local widget = mod.SetWidget(line, data, 'ProgressBar', info.questID..'-'..data.objectiveIndex)
 print('    |cFFFF0022** text:|r', data.text, '|cFFFF0022value:|r', data.value, '|cFFFF0022max:|r', data.maxValue)
-widget:SetPoint('CENTER', line, 'CENTER', 0, 0)
+widget:SetPoint('TOP', line, 'TOP', 0, 0)
 line.widget = widget
 line.height = widget.height
 else
 line.displayText = data.text
 Default.Update = function (self, reason, ...)
 local print = tprint
 local tracker = self.frame
-print('|cFFFF4400'..tracker:GetName().. '|r:Update()', reason, ...)
 local blockIndex = 0
 local trackerHeight = floor(tracker.titlebg:GetHeight()+.5)
 self.currentAnchor = tracker.titlebg
 local numWatched = self:GetNumWatched()
 blockIndex = blockIndex + 1
 if watchIndex <= numWatched then
 local info = self:GetInfo(watchIndex)
 if info then
 local currentBlock = self:UpdateBlock(blockIndex, info)
-currentBlock:SetPoint('TOPLEFT', self.currentAnchor, 'BOTTOMLEFT', 0, -1)
+currentBlock:SetPoint('TOPLEFT', self.currentAnchor, 'BOTTOMLEFT', 0, 0)
 currentBlock:SetPoint('RIGHT', tracker,'RIGHT', 0, 0)
 self.currentAnchor = currentBlock
-print('    |cFFFFFF00'..watchIndex..'|r', '|cFF00FF00'..currentBlock:GetName()..'|r', currentBlock.height)
+print('    |cFFFFFF00'..watchIndex..'|r', '|cFF00FF00'..currentBlock:GetName()..'|r', currentBlock.height, trackerHeight)
 trackerHeight = trackerHeight + currentBlock.height
 numBlocks = max(numBlocks, watchIndex)
 actualBlocks = actualBlocks + 1
 else
 print('    |cFFFF0000bad GetInfo data for #'..watchIndex)
 tracker.previousHeight = tracker.height
 if numBlocks >= 1 then
 previousBlock = nil
-tracker.height = trackerHeight + tracker.titlebg:GetHeight()
+tracker.height = trackerHeight
 tracker:SetHeight(tracker.height)
 tracker:Show()
 else
 if info.rewardInfo then
 print('has immediate reward')
 if info.rewardInfo[1].type == 'currency' or info.rewardInfo[1].type == 'item' then
 block.icon:Show()
 block.iconLabel:SetText(info.rewardInfo[1].count)
-block.icon:SetSize(block.height, block.height)
+block.icon:SetPoint(tagPoint, tagAnchor, tagRelative, -2, -2)
-block.icon:SetPoint(tagPoint, tagAnchor, tagRelative, 0, 0)
 tagPoint, tagAnchor, tagRelative = 'TOPRIGHT', block.icon, 'TOPLEFT'
 block.icon:SetTexture(info.rewardInfo[1].texture)
 end
 else
 block.icon:Hide()
 local wrapperHeight = 0
 for id, handler in pairs(mod.orderedHandlers) do
 local frame = handler.frame
-print(format(' |cFF00FFFFbitcheck (%04X vs %04x+%04x):|r', reason, handler.updateReasonModule, handler.updateReasonEvents), band(reason, handler.updateReasonModule + handler.updateReasonEvents))
+print(format('|cFF00FFFF%s and(%04X vs %04x+%04x) = %04X|r', handler.name, reason, handler.updateReasonModule, handler.updateReasonEvents, band(reason, handler.updateReasonModule + handler.updateReasonEvents)))
 if band(reason, handler.updateReasonModule + handler.updateReasonEvents) > 0 then
 handler:Update(reason, ...)
 print(' |cFF00FF00'..id..'|r', handler.displayName, 'count:', handler.numWatched)
 insertingStuff = true
 else
 block:SetScript('OnUpdate', function()
 if block:GetBottom() and not InCombatLockdown() then
 print('  '..block:GetName()..' |cFF00FF00probe hit!')
 mod.UpdateBlockAction(block, itemButton, itemButton.previousItem) -- needs to be previousItem from this scope
 block:SetScript('OnUpdate', nil)
 end
 end)
 previousItem = itemButton
 else
 print('hidden block or unwatched quest')

Mercurial > wow > buffalo2

comparison ObjectiveFrame.lua @ 22:9b3fa734abff