wow/worldplan: ClassPlan.lua comparison

comparison ClassPlan.lua @ 117:a4dfdd4f1cf3 v7.3.2-20171215

- Fixed filter pins not working on Argus maps - More taint counter-measures

author	Nenue
date	Fri, 15 Dec 2017 16:38:09 -0500
parents	b2be2de2b133
children

comparison

equal deleted inserted replaced

-:bf4a36378bb9
+:a4dfdd4f1cf3
 local profileName = name .. '-' .. realm
 self.profile = characters[profileName] or {
 showItems = true
 }
+self.profileName = profileName
 self.characters = characters
 characters[profileName] = self.profile
 local classColor = RAID_CLASS_COLORS[select(2, UnitClass('player'))]
 local className = UnitClass('player')
 print('|cFF00FF00  event', event)
 frame:RegisterEvent(event)
 end
 frame.sortedItems = {}
 for index, listKey in ipairs(frame.listKey) do
+self.profile[listKey] = self.profile[listKey] or {}
 frame.profile = self.profile
 frame.data = self.data
-self.profile[listKey] = self.profile[listKey] or {}
 local listTitle = frame.listTitle[index]
 setmetatable(self.profile[listKey], { __tostring = function() return listTitle end })
 frame.sortedItems[listKey] = {}
 frame.maxItems = self.maxItems
 end
 --- Update space
 local max = math.max
 function ClassPlan:RefreshData()
-local detailsFailed
 for index, handler in pairs(self.Handlers) do
 print(' |cFF00FF00'..handler:GetName()..' data update|r')
 handler:RefreshData()
 end
-if detailsFailed then
-db.print('Unable to obtain player details. Trying again later.')
-else
 self.requestingData = nil
-end
 end
 function ClassPlan:Update()
 print('|cFF00FFFF'..self:GetName()..'Refresh()|r')
 self.currentHeight = 0
 for index, handler in ipairs(self.Handlers) do
 local itemsHeight = handler:UpdateItems()
 if itemsHeight then
 self.currentHeight = max(itemsHeight, self.currentHeight)
+print('calc height', handler, self.currentHeight)
 end
 end
 local index = 1
 for key, info in pairs(self.data.characters) do
 button.isMine = (info == self.profile)
 button:Update()
 button:Show()
 index = index + 1
 end
+for i = index, #self.characterButtons do
+self.characterButtons[i]:Hide()
+end
 self.HeaderInset:SetHeight(CP_HEADER_SIZE)
 self.HeaderInset:ClearAllPoints()
 self.HeaderInset:SetPoint('TOPLEFT' ,self, 'TOPLEFT')
 self.HeaderInset:SetPoint('RIGHT' ,self, 'RIGHT')
 ListTab:ClearAllPoints()
 ListTab:SetPoint('TOPLEFT', frame, 'TOPLEFT', 0, 0)
 ListTab:SetPoint('BOTTOMRIGHT', frame, 'TOPRIGHT', 0, -CP_HEADER_SIZE)
 ListTab.Label:SetText(frame.listTitle[frame.currentListIndex])
 ListTab:Show()
-print(ListTab:GetSize())
+print(ListTab:GetName(), ListTab:GetSize())
 end
 self.currentHeight = max(self.currentHeight, frame.currentHeight or 0)
 end
 self:SetHeight(self.currentHeight + self.HeaderInset:GetHeight() + self.ClassStripe:GetHeight())
 end
 function ClassPlanHandlerBase:RefreshData()
 print('|cFF0088FF'..self:GetName()..':RefreshData()')
 local activeKey = self.activeKey
-local detailsFailed
 self.truncatedItems = 0
 self.currentTime = time()
 if self:GetParent().profile then
 self:GetPlayerData()
-else
-detailsFailed  = true
 end
 for _, listKey in ipairs(self.listKey) do
 local sortedItems = self.sortedItems[listKey]
 wipe(sortedItems)
 for key, profile in pairs(self.data.characters) do
 self.Owner:SetText(ownerText)
 self.Name:SetText(self.name)
 self.Name:SetTextColor(data.classColor.r, data.classColor.g, data.classColor.b)
 end
-function ClassPlanHandlerBase:Acquire(id)
+function ClassPlanHandlerBase:Reanchor() end
-end
-function ClassPlanHandlerBase:FreeBlock (block)
-end
 function ClassPlanHandlerBase:UpdateItems()
 print('|cFF0088FF '..self:GetName()..':UpdateItems()|r', self.activeKey)
 self.MoreItemsUp:Hide()
 self.MoreItemsDown:Hide()
 if (not sortedItems[scrollOffset+1]) or (numItems <= self.maxItems) then
 scrollOffset = 0
 elseif (numItems > self.maxItems) and (scrollOffset > (numItems - self.maxItems)) then
 scrollOffset = (numItems - self.maxItems)
 end
+if self.OnUpdateRequested then
+local overrideHeight = self:OnUpdateRequested()
+if overrideHeight then
+return overrideHeight
+end
+end
 self.ListTab.Count:SetText(numItems)
 self.blocks = self.blocks or  {}
 local blocks = self.blocks
 local lastProfile
 end
 self.scrollOffset = scrollOffset
 self.isStale = nil
+if self.OnItemsUpdated then
+return self:OnItemsUpdated()
+end
 return totalHeight
 end
 function ClassPlanEntryBase:OnAnimFinished()
 end
 end
 function ClassPlanHeaderMixin:OnClick ()
 local frame = self:GetParent()
 frame:SetList()
 if frame.OnHeaderClick then
-frame.OnHeaderClick(frame)
+frame:OnHeaderClick()
 end
 end
 ClassPlanCharacterButtonMixin = {
 }
 end
 self.Icon:SetDesaturated((not self.showItems))
 self.SelectGlow:SetShown(self.isMine)
 end
+function ClassPlanCharacterButtonMixin:OnLoad()
+self:RegisterForClicks('AnyDown')
+end
 function ClassPlanCharacterButtonMixin:OnEnter()
 if not self.profileKey then
 return
 end
 GameTooltip:SetOwner(self, 'ANCHOR_RIGHT')
 local info = ClassOrderPlan.data.characters[self.profileKey]
-GameTooltip:AddLine(self.characterName, self.classColor.r, self.classColor.g, self.classColor.b)
+GameTooltip:AddLine(self.characterName .. ' - ' .. self.characterRealm, self.classColor.r, self.classColor.g, self.classColor.b)
 local numItems = 0
 if info.missions then
 GameTooltip:AddLine(#info.missions .. ' mission'..((#info.missions == 1) and '' or 's')..' in progress')
 end
 if info.shipments then
 GameTooltip:Hide()
 end
 end
 function ClassPlanCharacterButtonMixin:OnClick(button, down)
-print('OnClick', self.profileKey)
 local clist = ClassOrderPlan.data.characters
 if button == 'RightButton' then
-for _, profile in pairs(clist) do
-profile.showItems = true
+if IsShiftKeyDown() then
-end
+print('delete profile', self.profileKey)
+clist[self.profileKey] = nil
+else
+for _, profile in pairs(clist) do
+profile.showItems = true
+end
+end
 else
 if clist[self.profileKey].showItems then
 clist[self.profileKey].showItems = nil
 else
 clist[self.profileKey].showItems = true
 end
 for i, handler in ipairs(ClassOrderPlan.Handlers) do
 handler.isStale = true
 end
 ClassOrderPlan:RefreshData()
 ClassOrderPlan:Update()
-print(clist[self.profileKey].showItems)
+print('OnClick', self.profileKey)
-end
+print( clist[self.profileKey] and clist[self.profileKey].showItems)
+end

Mercurial > wow > worldplan

comparison ClassPlan.lua @ 117:a4dfdd4f1cf3 v7.3.2-20171215