From c7891cfac3245104c03d1e39a19ed2ac64f28e9e Mon Sep 17 00:00:00 2001 From: MilleXIV Date: Sun, 4 Sep 2016 10:38:53 -0400 Subject: [PATCH] Fixing error with popups, see #42 --- modules/talent.lua | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/modules/talent.lua b/modules/talent.lua index bc18973..92a0a91 100644 --- a/modules/talent.lua +++ b/modules/talent.lua @@ -118,21 +118,6 @@ function TalentModule:Refresh() self.talentFrame:SetSize(self.specFrame:GetWidth(), xb:GetHeight()) - local popupPadding = xb.constants.popupPadding - if db.general.barPosition == 'TOP' then - popupPadding = -(popupPadding) - end - - self.specPopup:SetPoint(db.general.barPosition, self.specFrame, xb.miniTextPosition, 0, popupPadding) - self.specPopupTexture:SetColorTexture(db.color.barColor.r, db.color.barColor.g, db.color.barColor.b, db.color.barColor.a) - self.specPopupTexture:SetAllPoints() - self.specPopup:Hide() - - self.lootSpecPopup:SetPoint(db.general.barPosition, self.specFrame, xb.miniTextPosition, 0, popupPadding) - self.lootSpecPopupTexture:SetColorTexture(db.color.barColor.r, db.color.barColor.g, db.color.barColor.b, db.color.barColor.a) - self.lootSpecPopupTexture:SetAllPoints() - self.lootSpecPopup:Hide() - local relativeAnchorPoint = 'LEFT' local xOffset = db.general.moduleSpacing local anchorFrame = xb:GetFrame('clockFrame') @@ -147,10 +132,12 @@ function TalentModule:Refresh() end end self.talentFrame:SetPoint('RIGHT', anchorFrame, relativeAnchorPoint, -(xOffset), 0) + self:CreateSpecPopup() + self:CreateLootSpecPopup() end function TalentModule:UpdateArtifactBar(artifactId) - return; + if true then return; end local _, artifactData = self.LAD:GetArtifactInfo(artifactId) self.specBar:SetMinMaxValues(0, artifactData.maxPower) self.specBar:SetValue(artifactData.power) @@ -214,6 +201,7 @@ function TalentModule:RegisterFrameEvents() end else self.lootSpecPopup:Hide() + self:CreateSpecPopup() self.specPopup:Show() end end @@ -228,6 +216,7 @@ function TalentModule:RegisterFrameEvents() end else self.specPopup:Hide() + self:CreateLootSpecPopup() self.lootSpecPopup:Show() end end @@ -335,6 +324,18 @@ function TalentModule:CreateSpecPopup() popupWidth = (self.specOptionString:GetStringWidth() + self.extraPadding) end self.specPopup:SetSize(popupWidth, popupHeight + xb.constants.popupPadding) + + local popupPadding = xb.constants.popupPadding + if db.general.barPosition == 'TOP' then + popupPadding = -(popupPadding) + end + + self.specPopup:ClearAllPoints() + self.specPopupTexture:ClearAllPoints() + self.specPopup:SetPoint(db.general.barPosition, self.specFrame, xb.miniTextPosition, 0, popupPadding) + self.specPopupTexture:SetColorTexture(db.color.barColor.r, db.color.barColor.g, db.color.barColor.b, db.color.barColor.a) + self.specPopupTexture:SetAllPoints() + self.specPopup:Hide() end function TalentModule:CreateLootSpecPopup() @@ -437,6 +438,18 @@ function TalentModule:CreateLootSpecPopup() popupWidth = (self.lootSpecOptionString:GetStringWidth() + self.extraPadding) end self.lootSpecPopup:SetSize(popupWidth, popupHeight + xb.constants.popupPadding) + + local popupPadding = xb.constants.popupPadding + if db.general.barPosition == 'TOP' then + popupPadding = -(popupPadding) + end + + self.lootSpecPopup:ClearAllPoints() + self.lootSpecPopupTexture:ClearAllPoints() + self.lootSpecPopup:SetPoint(db.general.barPosition, self.specFrame, xb.miniTextPosition, 0, popupPadding) + self.lootSpecPopupTexture:SetColorTexture(db.color.barColor.r, db.color.barColor.g, db.color.barColor.b, db.color.barColor.a) + self.lootSpecPopupTexture:SetAllPoints() + self.lootSpecPopup:Hide() end function TalentModule:ShowTooltip() -- 1.7.9.5