wow/worldplan: QuestPOI.lua comparison

comparison QuestPOI.lua @ 57:54aa7f8ebca8 v1.0-release

- fix profession quests showing when not enabled - fix profession quest time borders always coloring as urgent

author	Nenue
date	Fri, 20 Jan 2017 19:57:13 -0500
parents	0749e38081e7
children	bc09961d5a98

comparison

equal deleted inserted replaced

-:0749e38081e7
+:54aa7f8ebca8
 end
 local GetFactionInfoByID, GetQuestObjectiveInfo = GetFactionInfoByID, GetQuestObjectiveInfo
 function QuestPOI:OnEnter()
+if self.filtered and (self.questID ~= GetSuperTrackedQuestID()) then
+return
+end
 WorldMap_HijackTooltip(self.owningFrame);
-if self.filtered then
-return
-end
 self:SetFrameLevel(pinBaseIndex+100)
 self.Overlay:SetFrameLevel(pinBaseIndex+101)
 if previousHighlight then
 previousHighlight:SetFrameLevel(pinBaseIndex+previousHighlight:GetID())
 --WorldMapTooltip.recalculatePadding = true;
 --print(WorldMapTooltip:GetParent())
 --print(WorldMapTooltip:IsVisible())
 end
 function QuestPOI:OnLeave()
+if self.filtered and (self.questID ~= GetSuperTrackedQuestID()) then
+return
+end
 WorldMap_RestoreTooltip()
 self.MouseGlow:Hide()
 WorldMapTooltip:Hide();
 end
 --qprint('|cFFFFFF00popping new pin handler')
 self:StartFade()
 end
 if not self.isAnimating then
-self:SetAlpha(1) -- fix stuck alpha
+self:SetAlpha(db.PinAlpha) -- fix stuck alpha
 end
 self.Overlay:SetShown(true)
 end
 function QuestPOI:OnHide()
 qprint('|cFFFFFF00'..self:GetID()..'r:OnHide()')
 self.isAnimating = nil
 self:SetAlpha(db.PinAlpha)
 self.Overlay:SetShown(false)
 end
+-- different from owningFrame
 function QuestPOI:SetAnchor(owner, dX, dY, mapWidth, mapHeight)
 wqprint(self:GetName()..':SetAnchor', self.filtered, self.used)
 self:SetParent(owner)
 self:ClearAllPoints()
 self:SetFrameLevel(pinBaseIndex + self:GetID())
 self.Description = self.Overlay.Description
 self.timeLabel = self.Overlay.timeLabel
 self.updateRate = PIN_REQUEST_DELAY
 self.itemName = '|cFF0088FF' .. RETRIEVING_DATA..'|r'
-self:SetScript('OnMouseDown', TaskPOI_OnClick)
 self.Overlay:SetPoint('TOPLEFT', self, 'TOPLEFT', 0, 4)
 self.Overlay:SetPoint('BOTTOMRIGHT', self, 'BOTTOMRIGHT', 0, -4)
 end
+function QuestPOI:OnMouseDown(button)
+if button == 'RightButton' then
+SetSuperTrackedQuestID(nil)
+else
+TaskPOI_OnClick(self, button)
+end
+end
 function QuestPOI:OnEvent(event, ...)
 if event == 'SUPER_TRACKED_QUEST_CHANGED' then
 self.isStale = true
 end
 if self.worldQuestType ~= LE_QUEST_TAG_TYPE_PROFESSION then
 self:SetShown(false)
 end
 end
-if timeLeft and (timeLeft < 120) then
+if tl and (timeLeft < 120) then
 self.HighlightBorder:SetVertexColor(1,0,0,0.7)
 elseif self.isBounty then
 self.HighlightBorder:SetVertexColor(.25,.5,1,1)
 else
 self.HighlightBorder:SetVertexColor(0,0,0,0.7)
 self.timeLabel:SetShown(self.worldQuest and (self.maxAlertLevel >= 1))
 end
 function QuestPOI:Refresh (fromUser)
---rprint('|c'..(fromUser and 'FF0088FF' or 'FF00FF88' )..self:GetID()..'|r:Refresh() type =', self.rewardType, 'title =', self.title)
+rprint('|c'..(fromUser and 'FF0088FF' or 'FF00FF88' )..self:GetID()..'|r:Refresh() type =', self.rewardType, 'title =', self.title)
 local styleType = (self.isPending and STYLE_TYPE_PENDING) or self.rewardType
 local style,subStyle =  self:GetTypeInfo(self.rewardType)
 self.highlightWidth = subStyle.highlightWidth
 self.tagSize = subStyle.TagSize
 self.maxAlertLevel = subStyle.maxAlertLevel
 self.NoIcon = subStyle.NoIcon
-local questID = self:GetID()
+local questID = self.questID
 local iconBorder = self.RewardBorder
 local trackingBorder = self.HighlightBorder
 local icon = self.icon
 local count = self.count
 self.isBounty = WorldMapFrame.UIElementsFrame.BountyBoard:IsWorldQuestCriteriaForSelectedBounty(self.questID)
 self.EliteBorder:SetShown(self.isElite and not self.filtered)
 self:UpdateSize()
 self:UpdateStatus()
 self.isStale = nil
+-- signal filter info update
+WorldPlanSummary.isStale = true
 end
 local cvar_check = {
 [REWARD_CASH] = 'worldQuestFilterGold',
 [REWARD_ARTIFACT_POWER] = 'worldQuestFilterArtifactPower',
 [REWARD_CURRENCY] = 'worldQuestFilterOrderResources',
 [REWARD_REAGENT]= 'worldQuestFilterProfessionMaterials',
 [REWARD_GEAR] = 'worldQuestFilterEquipment',
 }
+function QuestPOI:CheckFilterRules ()
-function QuestPOI:IsFiltered ()
-local filtered
-local usingFilters
-for filterKey, value in pairs(db.UsedFilters) do
-usingFilters = true
-print('|cFFFF4400', filterKey, self[filterKey])
-if self[filterKey] ~= value then
-filtered = true
-end
-end
-if self.rewardType  and cvar_check[self.rewardType] then
-if not GetCVarBool(cvar_check[self.rewardType])  then
-filtered = true
-end
-end
-self.filtered = filtered
-end
-function QuestPOI:IsShowable ()
 local print = qprint
 local qType = self.worldQuestType
+local filtered
-if not self.worldQuest then
+local canShow = TQ_IsActive(self.questID)
---print('ignoring showable check')
-return self.used, self.filtered
-end
-self.used = TQ_IsActive(self.questID)
 if SpellCanTargetQuest() then
 -- hiding so player can click a valid target
 self.used = nil
 elseif qType == LE_QUEST_TAG_TYPE_PROFESSION then
-if (not self.isKnownProfession) and  (db.Config.ShowAllProfessionQuests == false) then
+if not(self.isKnownProfession or db.Config.ShowAllProfessionQuests) then
-self.used = nil
+canShow = nil
 end
 end
-rprint('  '..self.questID..':|cFFFFFF00IsShowable()|r ', self.used, self.title)
+if canShow then
+for filterKey, value in pairs(db.UsedFilters) do
+if self[filterKey] ~= value then
+if not self.filtered then
+print('|cFFFF4400filtering', filterKey, value, '~=', self[filterKey], self.title)
+end
+filtered = true
+end
+end
+if self.rewardType  and cvar_check[self.rewardType] then
+if not GetCVarBool(cvar_check[self.rewardType])  then
+filtered = true
+end
+end
+if canShow and self.filtered ~= filtered then
+self.isStale = true
+print('  '..self.questID..':|cFFFFFF00CheckFilterRules()|r ', canShow, filtered, self.title)
+end
+self.filtered = filtered
+end
+self.used = canShow
 end
 --- Fixes icons upon size update
 function QuestPOI:UpdateSize ()
 self:SetSize(highlightWidth, highlightWidth)
 if self.questID == GetSuperTrackedQuestID() then
 highlightWidth = highlightWidth + 2
+if self.filtered then
+self:SetAlpha(db.PinAlpha * 0.5)
+else
+self:SetAlpha(db.PinAlpha)
+end
 end
 if self.rarity and WORLD_QUEST_QUALITY_COLORS[self.rarity] then
 highlightWidth = highlightWidth + self.rarity
 end

Mercurial > wow > worldplan

comparison QuestPOI.lua @ 57:54aa7f8ebca8 v1.0-release