WoWInterface SVN UrbanAchiever

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /
    from Rev 149 to Rev 150
    ↔ Reverse comparison
  •

Rev 149 → Rev 150

trunk/Main.lua
1980,6 → 1980,7
compDone = GetAchievementComparisonInfo(self.currentAch,1)
end
 
local numStatusBar = 0
 
self.frame.display.bar:Hide()
self.frame.display.compareBar:Hide()
2013,11 → 2014,13
self.frame.display.criteriaButtons[buttonNum].icon:Show()
offset = offset + 16
self.frame.display.criteriaButtons[buttonNum]:SetID(criteriaAssetID)
elseif (bit.band(criteriaFlags, 1) == 1) then
end
if (bit.band(criteriaFlags, 1) == 1) then
--Its a progress bar
offset = 1
self.frame.display.criteriaButtons[buttonNum]:Hide()
--self.frame.display.criteriaButtons[buttonNum]:Hide()
str = ""
numStatusBar = numStatusBar+1
 
self.frame.display.bar:Show()
self.frame.display.bar:SetMinMaxValues(0,criteriaReqQuantity)
2042,21 → 2045,32
 
end
--If theres a progress bar, theres no other achievements
break
end
if month then
self.frame.display.criteriaButtons[buttonNum].date = string.format(SHORTDATE, day, month, year);
--break
local buttonNumCurrent
local buttonNumEnd = buttonNum+2
for buttonNumCurrent=buttonNum, buttonNumEnd, 1 do
self.frame.display.criteriaButtons[buttonNumCurrent].icon:Hide()
self.frame.display.criteriaButtons[buttonNumCurrent].date = nil
self.frame.display.criteriaButtons[buttonNumCurrent].id = nil
self.frame.display.criteriaButtons[buttonNumCurrent].text:SetText('')
self.frame.display.criteriaButtons[buttonNumCurrent].offset:SetWidth(1)
end
buttonNum = buttonNumEnd+1
else
self.frame.display.criteriaButtons[buttonNum].date = nil;
if month then
self.frame.display.criteriaButtons[buttonNum].date = string.format(SHORTDATE, day, month, year);
else
self.frame.display.criteriaButtons[buttonNum].date = nil;
end
if id then
self.frame.display.criteriaButtons[buttonNum].id = id;
else
self.frame.display.criteriaButtons[buttonNum].id = nil;
end
self.frame.display.criteriaButtons[buttonNum].text:SetText(str)
self.frame.display.criteriaButtons[buttonNum].offset:SetWidth(offset)
buttonNum = buttonNum + 1
end
if id then
self.frame.display.criteriaButtons[buttonNum].id = id;
else
self.frame.display.criteriaButtons[buttonNum].id = nil;
end
self.frame.display.criteriaButtons[buttonNum].text:SetText(str)
self.frame.display.criteriaButtons[buttonNum].offset:SetWidth(offset)
buttonNum = buttonNum + 1
end
end
self.frame.criteriaScroll:SetMinMaxValues(0,math.max(GetAchievementNumCriteria(self.currentAch)-#self.frame.display.criteriaButtons, 0))
2067,7 → 2081,7
self.frame.criteriaScroll:Hide()
end
 
for a = GetAchievementNumCriteria(self.currentAch) + 1, #self.frame.display.criteriaButtons do
for a = GetAchievementNumCriteria(self.currentAch) + 1 + (numStatusBar*2), #self.frame.display.criteriaButtons do
self.frame.display.criteriaButtons[a]:Hide()
end
end