Some stuff for DCS compatibility
Darth Predator [12-26-16 - 17:30]
Some stuff for DCS compatibility
diff --git a/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua b/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua
index 2206f8e..1beaf55 100644
--- a/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua
+++ b/ElvUI_SLE/modules/Armory/CharacterArmory/CharacterArmory.lua
@@ -693,26 +693,7 @@ function CA:Setup_CharacterArmory()
self.Setup_CharacterArmory = nil
end
--- function CA:ScanData()
- -- self.NeedUpdate = nil
-
- -- if not self.DurabilityUpdated then
- -- self.NeedUpdate = self:Update_Durability() or self.NeedUpdate
- -- end
-
- -- if self.GearUpdated ~= true then
- -- self.NeedUpdate = self:Update_Gear() or self.NeedUpdate
- -- end
-
- -- if not self.NeedUpdate and self:IsShown() then
- -- self:SetScript('OnUpdate', nil)
- -- self:Update_Display(true)
- -- elseif self.NeedUpdate then
- -- self:SetScript('OnUpdate', self.ScanData)
- -- end
--- end
-
-function CA:ScanData(...)
+function CA:ScanData()
self.NeedUpdate = nil
if not self.DurabilityUpdated then
@@ -725,18 +706,10 @@ function CA:ScanData(...)
if not self.NeedUpdate and self:IsShown() then
self:SetScript('OnUpdate', nil)
+ self:Update_Display(true)
elseif self.NeedUpdate then
self:SetScript('OnUpdate', self.ScanData)
end
-
- if DCS_Check then DCS_Check() end
-end
-
-local function DCS_Check()
- if _G["DCS_ExpandCheck"] then
- _G["DCS_ExpandCheck"]:SetFrameLevel(_G["CharacterModelFrame"]:GetFrameLevel() + 2)
- DCS_Check = nil
- end
end
function CA:Update_Durability()
@@ -1684,7 +1657,13 @@ KF.Modules.CharacterArmory = function()
end
CA:ElvOverlayToggle()
- if SLE._Compatibility["DejaCharacterStats"] then return end
+ if SLE._Compatibility["DejaCharacterStats"] then
+ PaperDollFrame.ExpandButton:SetFrameLevel(_G["CharacterModelFrame"]:GetFrameLevel() + 2)
+ PaperDollFrame.ExpandButton:ClearAllPoints()
+ PaperDollFrame.ExpandButton:SetPoint("TOPRIGHT", CA, 14, 8)
+ PaperDollFrame.ExpandButton:SetSize(32, 32)
+ return
+ end
--Resize and reposition god damned ilevel text
_G["CharacterStatsPane"].ItemLevelFrame:SetPoint("TOP", _G["CharacterStatsPane"].ItemLevelCategory, "BOTTOM", 0, 6)
CA:UpdateIlvlFont()