# HG changeset patch # User Nenue # Date 1459755688 14400 # Node ID f660f1c1e0aa70deacece266c32944d7b0381571 # Parent ed642234f017ee1286df3d4e5b1fab2366a6d958 Objective Widgets - determine completion by fractional value diff -r ed642234f017 -r f660f1c1e0aa ObjectiveFrame.lua --- a/ObjectiveFrame.lua Mon Apr 04 03:16:22 2016 -0400 +++ b/ObjectiveFrame.lua Mon Apr 04 03:41:28 2016 -0400 @@ -362,9 +362,9 @@ line.displayText = line.text end - line.progess = 0 + line.progress = 0 + print(' ', line.index,'|cFFFF0088-|r', line.objectiveType, line.text) if line.objectiveType == 'progressbar' then - print(' |cFFFF0088==|r', line.type, line.text) line.widgetType = 'ProgressBar' print(' |cFFFF44DDpercent='..tostring(GetQuestProgressBarPercent(info.questID))) line.value = GetQuestProgressBarPercent(info.questID) or 0 @@ -376,8 +376,7 @@ end line.format = PERCENTAGE_STRING line.widget = mod.SetWidget(line, info, 'ProgressBar', info.questID..'-'..line.index) - print('line.type =', line.type) - print(' ** qtyStr:', line.quantityString, 'qty:', line.value, 'assetID:', line.questID) + print(' ** text:', line.text, 'value:', line.value, 'max:', line.maxValue) else line.widget = nil end diff -r ed642234f017 -r f660f1c1e0aa ObjectiveWidgets.lua --- a/ObjectiveWidgets.lua Mon Apr 04 03:16:22 2016 -0400 +++ b/ObjectiveWidgets.lua Mon Apr 04 03:41:28 2016 -0400 @@ -310,9 +310,8 @@ mod.InitializeWidget = setmetatable({}, { __call = function(t, frame) -- todo: config pull - local maxWidth = 250 - frame:SetWidth(maxWidth) + frame:SetWidth(mod.Conf.Wrapper.WrapperWidth - mod.Conf.Style.Format.status.Indent * 2) frame:SetScript('OnEvent', mod.UpdateWidget[frame.widgetType]) if frame.info.isCurrency then frame:RegisterEvent('CHAT_MSG_CURRENCY') @@ -418,10 +417,10 @@ end - if self.line.finished then + if quantity == 0 then + self.fg:Hide() + elseif quantity >= requiredQuantity then self.fg:SetWidth(self.bg:GetWidth() - self.indent) - elseif quantity == 0 then - self.fg:Hide() else self.fg:Show() self.fg:SetWidth((self.bg:GetWidth() -self.indent) * (quantity / requiredQuantity))