Commit e6eb7840 authored by Simpy's avatar Simpy 🐹
Browse files

Merge remote-tracking branch 'elvui/beta' into ptr

parents d91e4e1a b9556fc3
......@@ -29,8 +29,10 @@ function DB:AzeriteBar_Update(event, unit)
if not azeriteItemLocation or (DB.db.azerite.hideAtMaxLevel and C_AzeriteItem_IsAzeriteItemAtMaxLevel()) or E.mylevel > 50 then
bar:Hide()
bar.holder:Hide()
else
bar:Show()
bar.holder:Show()
local cur, max = C_AzeriteItem_GetAzeriteItemXPInfo(azeriteItemLocation)
local currentLevel = C_AzeriteItem_GetPowerLevel(azeriteItemLocation)
......
......@@ -43,9 +43,11 @@ function DB:ExperienceBar_Update()
local bar = DB.StatusBars.Experience
if not DB.db.experience.enable or (bar.db.hideAtMaxLevel and not DB:ExperienceBar_ShouldBeVisible()) then
bar:Hide()
bar.holder:Hide()
return
else
bar:Show()
bar.holder:Show()
end
CurrentXP, XPToLevel, RestedXP = UnitXP('player'), UnitXPMax('player'), GetXPExhaustion()
......
......@@ -15,9 +15,11 @@ function DB:HonorBar_Update(event, unit)
local bar = DB.StatusBars.Honor
if not DB.db.honor.enable or (event == 'PLAYER_FLAGS_CHANGED' and unit ~= 'player') then
bar:Hide()
bar.holder:Hide()
return
else
bar:Show()
bar.holder:Show()
end
CurrentHonor, MaxHonor, CurrentLevel = UnitHonor('player'), UnitHonorMax('player'), UnitHonorLevel('player')
......
......@@ -18,9 +18,11 @@ function DB:ReputationBar_Update()
if not name or (DB.db.reputation.hideBelowMaxLevel and not IsPlayerAtEffectiveMaxLevel()) then
bar:Hide()
bar.holder:Hide()
return
else
bar:Show()
bar.holder:Show()
end
local displayString, textFormat = '', DB.db.reputation.textFormat
......
......@@ -49,6 +49,7 @@ function DB:ThreatBar_Update()
if percent and percent > 0 and (isInGroup or petExists) then
local name = UnitName('target')
bar:Show()
bar.holder:Show()
if percent == 100 then
--Build threat list
......@@ -94,6 +95,7 @@ function DB:ThreatBar_Update()
end
else
bar:Hide()
bar.holder:Hide()
end
wipe(bar.list)
......
......@@ -323,6 +323,21 @@ function M:SetGetMinimapShape()
Minimap:Size(E.db.general.minimap.size, E.db.general.minimap.size)
end
function M:SetupHybridMinimap()
local MapCanvas = _G.HybridMinimap.MapCanvas
MapCanvas:SetMaskTexture('Interface\\Buttons\\WHITE8X8')
MapCanvas:SetScript('OnMouseWheel', M.Minimap_OnMouseWheel)
MapCanvas:SetScript('OnMouseDown', M.Minimap_OnMouseDown) -- HybridMinimap seems not able to use ping see: Blizzard_HybridMinimap @Simpy
MapCanvas:SetScript('OnMouseUp', E.noop)
end
function M:HybridMinimapOnLoad(addon)
if addon == 'Blizzard_HybridMinimap' then
M:SetupHybridMinimap()
E:UnregisterEvent(self, M.HybridMinimapOnLoad)
end
end
function M:Initialize()
if not E.private.general.minimap.enable then return end
self.Initialized = true
......@@ -407,6 +422,7 @@ function M:Initialize()
self:RegisterEvent('ZONE_CHANGED_INDOORS', 'Update_ZoneText')
self:RegisterEvent('ZONE_CHANGED', 'Update_ZoneText')
self:RegisterEvent('ADDON_LOADED')
self:RegisterEvent('ADDON_LOADED', M.HybridMinimapOnLoad)
self:UpdateSettings()
end
......
......@@ -3,6 +3,8 @@ local S = E:GetModule('Skins')
local _G = _G
local pairs, unpack = pairs, unpack
local C_Spell_GetMawPowerBorderAtlasBySpellID = C_Spell.GetMawPowerBorderAtlasBySpellID
local hooksecurefunc = hooksecurefunc
local headers = {
......@@ -211,22 +213,6 @@ function S:ObjectiveTrackerFrame()
hooksecurefunc(minimize, 'SetCollapsed', UpdateMinimizeButton)
end
end
-- The Maw - Torghast: Scenario Tracker Buff Block
_G.ScenarioBlocksFrame.MawBuffsBlock.Container.List:HookScript('OnShow', function(frame)
if not frame.buffPool then return end
for mawBuff in frame.buffPool:EnumerateActive() do
if mawBuff:IsShown() and not mawBuff.IsSkinned then
mawBuff.Border:SetAlpha(0)
mawBuff.CircleMask:Hide()
mawBuff.CountRing:SetAlpha(0)
mawBuff.HighlightBorder:SetColorTexture(1, 1, 1, .25)
S:HandleIcon(mawBuff.Icon)
mawBuff.IsSkinned = true
end
end
end)
end
S:AddCallback('ObjectiveTrackerFrame')
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment