mirror of
https://github.com/Bluewhale1337/ElvUIModernized.git
synced 2026-07-27 08:24:44 +00:00
update #53
This commit is contained in:
@@ -159,6 +159,12 @@ function AB:PositionAndSizeBar(barName)
|
|||||||
button:SetAlpha(self.db[barName].alpha)
|
button:SetAlpha(self.db[barName].alpha)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if self.db[barName].inheritGlobalFade then
|
||||||
|
bar:SetParent(self.fadeParent)
|
||||||
|
else
|
||||||
|
bar:SetParent(E.UIParent)
|
||||||
|
end
|
||||||
|
|
||||||
self:StyleButton(button)
|
self:StyleButton(button)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -257,6 +263,8 @@ function AB:CreateBar(id)
|
|||||||
end
|
end
|
||||||
|
|
||||||
function AB:UpdateButtonSettings()
|
function AB:UpdateButtonSettings()
|
||||||
|
if E.private.actionbar.enable ~= true then return end
|
||||||
|
|
||||||
for button, _ in pairs(self["handledButtons"]) do
|
for button, _ in pairs(self["handledButtons"]) do
|
||||||
if button then
|
if button then
|
||||||
self:StyleButton(button, button.noBackdrop)
|
self:StyleButton(button, button.noBackdrop)
|
||||||
@@ -340,12 +348,24 @@ function AB:StyleButton(button, noBackdrop)
|
|||||||
end
|
end
|
||||||
|
|
||||||
function AB:Bar_OnEnter()
|
function AB:Bar_OnEnter()
|
||||||
|
if this:GetParent() == self.fadeParent then
|
||||||
|
if not self.fadeParent.mouseLock then
|
||||||
|
E:UIFrameFadeIn(self.fadeParent, 0.2, self.fadeParent:GetAlpha(), 1)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
if this.mouseover then
|
if this.mouseover then
|
||||||
UIFrameFadeIn(this, 0.2, this:GetAlpha(), this.db.alpha)
|
UIFrameFadeIn(this, 0.2, this:GetAlpha(), this.db.alpha)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function AB:Bar_OnLeave()
|
function AB:Bar_OnLeave()
|
||||||
|
if this:GetParent() == self.fadeParent then
|
||||||
|
if not self.fadeParent.mouseLock then
|
||||||
|
E:UIFrameFadeOut(self.fadeParent, 0.2, self.fadeParent:GetAlpha(), 1 - self.db.globalFadeAlpha)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
if this.mouseover then
|
if this.mouseover then
|
||||||
UIFrameFadeOut(this, 0.2, this:GetAlpha(), 0)
|
UIFrameFadeOut(this, 0.2, this:GetAlpha(), 0)
|
||||||
end
|
end
|
||||||
@@ -353,6 +373,12 @@ end
|
|||||||
|
|
||||||
function AB:Button_OnEnter()
|
function AB:Button_OnEnter()
|
||||||
local bar = (this:GetParent() == BonusActionBarFrame or this:GetParent() == MainMenuBarArtFrame) and ElvUI_Bar1 or this:GetParent()
|
local bar = (this:GetParent() == BonusActionBarFrame or this:GetParent() == MainMenuBarArtFrame) and ElvUI_Bar1 or this:GetParent()
|
||||||
|
if bar:GetParent() == self.fadeParent then
|
||||||
|
if not self.fadeParent.mouseLock then
|
||||||
|
UIFrameFadeIn(self.fadeParent, 0.2, self.fadeParent:GetAlpha(), 1)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
if bar.mouseover then
|
if bar.mouseover then
|
||||||
UIFrameFadeIn(bar, 0.2, bar:GetAlpha(), bar.db.alpha)
|
UIFrameFadeIn(bar, 0.2, bar:GetAlpha(), bar.db.alpha)
|
||||||
end
|
end
|
||||||
@@ -360,11 +386,34 @@ end
|
|||||||
|
|
||||||
function AB:Button_OnLeave()
|
function AB:Button_OnLeave()
|
||||||
local bar = (this:GetParent() == BonusActionBarFrame or this:GetParent() == MainMenuBarArtFrame) and ElvUI_Bar1 or this:GetParent()
|
local bar = (this:GetParent() == BonusActionBarFrame or this:GetParent() == MainMenuBarArtFrame) and ElvUI_Bar1 or this:GetParent()
|
||||||
|
if bar:GetParent() == self.fadeParent then
|
||||||
|
if not self.fadeParent.mouseLock then
|
||||||
|
UIFrameFadeOut(self.fadeParent, 0.2, self.fadeParent:GetAlpha(), 1 - self.db.globalFadeAlpha)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
if bar.mouseover then
|
if bar.mouseover then
|
||||||
UIFrameFadeOut(bar, 0.2, bar:GetAlpha(), 0)
|
UIFrameFadeOut(bar, 0.2, bar:GetAlpha(), 0)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function AB:FadeParent_OnEvent()
|
||||||
|
if (event == "SPELLCAST_START"
|
||||||
|
or event == "SPELLCAST_STOP"
|
||||||
|
or event == "UNIT_HEALTH") and arg1 ~= "player" then return end
|
||||||
|
|
||||||
|
local cur, max = UnitHealth("player"), UnitHealthMax("player")
|
||||||
|
local target = UnitExists("target")
|
||||||
|
local combat = UnitAffectingCombat("player")
|
||||||
|
if (cur ~= max) or target or combat then
|
||||||
|
this.mouseLock = true
|
||||||
|
UIFrameFadeIn(this, 0.2, this:GetAlpha(), 1)
|
||||||
|
else
|
||||||
|
this.mouseLock = false
|
||||||
|
UIFrameFadeOut(this, 0.2, this:GetAlpha(), 1 - AB.db.globalFadeAlpha)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
function AB:DisableBlizzard()
|
function AB:DisableBlizzard()
|
||||||
MainMenuBar:EnableMouse(false)
|
MainMenuBar:EnableMouse(false)
|
||||||
PetActionBarFrame:EnableMouse(false)
|
PetActionBarFrame:EnableMouse(false)
|
||||||
@@ -454,6 +503,16 @@ function AB:Initialize()
|
|||||||
|
|
||||||
if E.private.actionbar.enable ~= true then return end
|
if E.private.actionbar.enable ~= true then return end
|
||||||
|
|
||||||
|
self.fadeParent = CreateFrame("Frame", "Elv_ABFade", UIParent)
|
||||||
|
self.fadeParent:SetAlpha(1 - self.db.globalFadeAlpha)
|
||||||
|
self.fadeParent:RegisterEvent("PLAYER_REGEN_DISABLED")
|
||||||
|
self.fadeParent:RegisterEvent("PLAYER_REGEN_ENABLED")
|
||||||
|
self.fadeParent:RegisterEvent("PLAYER_TARGET_CHANGED")
|
||||||
|
self.fadeParent:RegisterEvent("SPELLCAST_START")
|
||||||
|
self.fadeParent:RegisterEvent("SPELLCAST_STOP")
|
||||||
|
self.fadeParent:RegisterEvent("UNIT_HEALTH")
|
||||||
|
self.fadeParent:SetScript("OnEvent", self.FadeParent_OnEvent)
|
||||||
|
|
||||||
self:DisableBlizzard()
|
self:DisableBlizzard()
|
||||||
|
|
||||||
self:SetupMicroBar()
|
self:SetupMicroBar()
|
||||||
|
|||||||
Reference in New Issue
Block a user