changeset 15:f660f1c1e0aa

Objective Widgets - determine completion by fractional value
author Nenue
date Mon, 04 Apr 2016 03:41:28 -0400
parents ed642234f017
children 880828018bf4
files ObjectiveFrame.lua ObjectiveWidgets.lua
diffstat 2 files changed, 7 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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))