wow/worldplan: ClassPlan.lua comparison

comparison ClassPlan.lua @ 5:4e1883842abf

- use of SetShown() for combat visibility toggle

author	Nenue
date	Tue, 18 Oct 2016 01:50:06 -0400
parents	4c7e9efec4b5
children	48001b6a9496

comparison

equal deleted inserted replaced

-:4c7e9efec4b5
+:4e1883842abf
 if self:IsVisible() then
 self:Refresh()
 end
 end
+MissionsHandler.OnGetItem = function(data)
+if data.missionEndTime < GI_currentTime then
+data.isComplete = true
+end
+end
 MissionsHandler.FreeBlock = function(self, block)
 end
 MissionsHandler.SortHandler = function (a,b)
 local result = false
 self:Refresh()
 end
 end
 function core:OnLoad ()
-self:RegisterUnitEvent('UNIT_PORTRAIT_UPDATE', 'player')
 self:RegisterEvent('PLAYER_LOGIN')
 self:RegisterEvent('PLAYER_ENTERING_WORLD')
 self:RegisterEvent('ADDON_LOADED')
 self:RegisterEvent('PLAYER_REGEN_ENABLED')
+self:RegisterEvent('PLAYER_REGEN_DISABLED')
 -- Blizzard_GarrisonUI already fires a shipment data request for GARRISON_SHIPMENT_RECEIVED; this is unlikely to
 self:AddHandler('missions', MissionsHandler)
 self:AddHandler('shipments', ShipmentsHandler)
 function core:Reanchor()
 self:ClearAllPoints()
+local anchorTo = 'TOP'
 self.anchorParent = UIParent
 for i, name in ipairs(parentFrames) do
 local frame = _G[name]
 if frame then
 if not BOUND_FRAMES[frame] then
-BOUND_FRAMES[frame] = {visible = frame:IsVisible()}
+BOUND_FRAMES[frame] = {visible = (frame:IsVisible() and frame:IsShown())}
 hooksecurefunc(frame, 'Show', function()
 BOUND_FRAMES[frame].visible = true
 print(frame:GetName(), 'Show', 'reanchor trigger')
 self:Reanchor()
 end)
 hooksecurefunc(frame, 'Hide', function()
-BOUND_FRAMES[frame].visible = false
+BOUND_FRAMES[frame].visible = nil
 print(frame:GetName(), 'Hide', 'reanchor trigger')
 self:Reanchor()
 end)
 end
-print('f:', frame:GetName(), frame:IsVisible())
+print('f:', frame:GetName(), BOUND_FRAMES[frame].visible)
 if BOUND_FRAMES[frame].visible then
 self.anchorParent = frame
+anchorTo = 'BOTTOM'
 break
 end
 end
 end
-print('|cFFFF8800Using ' .. tostring(self.anchorParent:GetName()) .. ' as anchor point')
+print('|cFFFF8800Using ' .. tostring(self.anchorParent:GetName()) .. '-'..anchorTo..' as anchor point')
-if self:IsVisible() then
+if self:IsShown() then
-self:SetPoint('TOP', ClassPlanButton, 'BOTTOM', 0, 0)
 ClassPlanButton.Background:Show()
 ClassPlanButton:SetWidth(600)
 else
 ClassPlanButton.Background:Hide()
 ClassPlanButton:SetWidth(200)
 end
-ClassPlanButton:SetPoint('TOP', self.anchorParent, (self.anchorPoint == UIParent) and 'TOP' or 'BOTTOM', 0, 0)
+self:SetPoint('TOP', ClassPlanButton, 'BOTTOM', 0, 0)
+ClassPlanButton:ClearAllPoints()
+ClassPlanButton:SetPoint('TOP', self.anchorParent, anchorTo, 0, 0)
+print(ClassPlanButton:GetPoint(1))
 end
 function core:AddHandler(name, prototype)
 self.prototypes[name] = setmetatable(prototype, {
 __index = blockTemplate,
 end
 end
 function core:OnEvent (event, ...)
 print(event)
-if event == 'UNIT_PORTRAIT_UPDATE' then
+if event == 'PLAYER_REGEN_DISABLED' then
-SetPortraitTexture(self.portrait, 'player')
+self:SetShown(false)
+elseif event == 'PLAYER_REGEN_ENABLED' then
+self:SetShown(true)
 elseif event == 'PLAYER_LOGIN' then
 if not self.initialized then
 self:Setup()
 end
 elseif self.initialized and self.events[event] then
 local SetOwnerData = function(self, data)
 local name, realm = string.match(data.profileKey, "(.+)%-(.+)")
 local ownerText = '|c'.. data.classColor.colorStr .. name .. '|r'
-if realm ~= GI_currentRealm then
+--if realm ~= GI_currentRealm then
-ownerText = ownerText .. ' (' .. realm .. ')'
+--ownerText = ownerText .. ' (' .. realm .. ')'
-end
+--end
 self.Owner:SetText(ownerText)
-self.Background:SetColorTexture(data.classColor.r, data.classColor.g, data.classColor.b)
+self.Name:SetTextColor(data.classColor.r, data.classColor.g, data.classColor.b)
+if self.isComplete then
+self.TimeLeft:SetText('Complete!')
+self.Background:SetColorTexture(.25,.25,.25,1)
+else
+self.Background:SetColorTexture(0,0,0,0.5)
+end
 end
 function core:RefreshItems(configKey, prototype)
 local sortedItems = self.sortedItems[configKey]
 if type(block[k]) ~= 'function' then
 block[k] = v
 end
 end
 block:Refresh(data)
+print(block.isComplete, block.missionEndTime, block.name)
 SetOwnerData(block, data)
 block:Show()
 lastProfile = data.profileKey
 end
 self:Reanchor()
 self:SetHeight(self.currentHeight)
 end
 function core:Toggle()
-if self:IsVisible() then
+if self:IsShown() then
 self:Hide()
 else
 self:Show()
 end
 if self.data then
-self.data.IsShown = self:IsVisible()
+self.data.IsShown = self:IsShown()
 end
 end
 function core:OnUpdate()
 if self.fadeTimer and self.fadeTimer < GetTime() then
 end
 end
 end
 function MissionsHandler:OnComplete()
-self.isComplete = true
+print('flagging complete', self.name)
 self:Refresh()
 end
 function MissionsHandler:OnUpdate()
 if self.isComplete then
 local r,g,b = 1, 1, 1
 if self.isRare then
 r,g,b = 0.1, 0.4, 1
+self.IconBorder:SetVertexColor(r, g, b, 1)
 end
 --self.missionData = data
-self.Label:SetText(self.name)
+self.Name:SetText(self.name)
-self.Label:SetTextColor(r, g, b)
 if #self.rewards >= 1 then
 self.Icon:SetTexture(self.rewards[1].icon or GetItemIcon(self.rewards[1].itemID))
 self.rewardInfo = self.rewards[1]
 else
 self.Icon:SetAtlas(self.typeAtlas, false)
 end
-if self.isComplete then
-self.TimeLeft:SetText('Complete!')
-end
-self.Background:SetAlpha(self.isComplete and 1 or 0.1)
 end
 function MissionsHandler:OnEnter()
 if self.rewardInfo and self.rewardInfo.itemID then

Mercurial > wow > worldplan

comparison ClassPlan.lua @ 5:4e1883842abf