Bluewhale/ElvUIModernized
1
0
Fork 0
mirror of https://github.com/Bluewhale1337/ElvUIModernized.git synced 2026-07-27 08:24:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

update ab

Browse Source
This commit is contained in:
Bunny67
2018-07-18 08:00:18 +03:00
parent 56ce7f120b
commit de74893739
1 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElvUI/Modules/ActionBars/ActionBars.lua
+40 -38
View File
@@ -446,46 +446,12 @@ function AB:FixKeybindText(button)
hotkey:SetPoint("TOPRIGHT", 0, -3) hotkey:SetPoint("TOPRIGHT", 0, -3)
end end
function _G.ActionButton_OnUpdate(elapsed)
if not this.updateTooltip then return end
this.updateTooltip = this.updateTooltip - elapsed
if this.updateTooltip > 0 then return end
if GameTooltip:IsOwned(this) then
ActionButton_SetTooltip()
else
this.updateTooltip = nil
end
end
function _G.ActionButton_GetPagedID(button)
if button.isBonus and CURRENT_ACTIONBAR_PAGE == 1 then
local offset = GetBonusBarOffset()
if offset == 0 and ElvUI_Bar1 and ElvUI_Bar1.lastBonusBar then
offset = ElvUI_Bar1.lastBonusBar
end
return button:GetID() + ((NUM_ACTIONBAR_PAGES + offset - 1) * NUM_ACTIONBAR_BUTTONS)
end
local parentName = button:GetParent():GetName()
if parentName == "ElvUI_Bar5" then
return button:GetID() + ((BOTTOMLEFT_ACTIONBAR_PAGE - 1) * NUM_ACTIONBAR_BUTTONS)
elseif parentName == "ElvUI_Bar2" then
return button:GetID() + ((BOTTOMRIGHT_ACTIONBAR_PAGE - 1) * NUM_ACTIONBAR_BUTTONS)
elseif parentName == "ElvUI_Bar4" then
return button:GetID() + ((LEFT_ACTIONBAR_PAGE - 1) * NUM_ACTIONBAR_BUTTONS)
elseif parentName == "ElvUI_Bar3" then
return button:GetID() + ((RIGHT_ACTIONBAR_PAGE - 1) * NUM_ACTIONBAR_BUTTONS)
else
return button:GetID() + ((CURRENT_ACTIONBAR_PAGE - 1) * NUM_ACTIONBAR_BUTTONS)
end
end
local function IsInShapeshiftForm() local function IsInShapeshiftForm()
for i = 1, GetNumShapeshiftForms() do for i = 1, GetNumShapeshiftForms() do
local _, name, active = GetShapeshiftFormInfo(i) local texture, _, active = GetShapeshiftFormInfo(i)
if name ~= "Moonkin Form" and active ~= nil then return true end if i ~= 5 and active ~= nil then
return true
end
end end
return false return false
end end
@@ -526,6 +492,42 @@ function AB:Initialize()
if E.myclass == "WARRIOR" or (E.myclass == "DRUID" and IsInShapeshiftForm()) then if E.myclass == "WARRIOR" or (E.myclass == "DRUID" and IsInShapeshiftForm()) then
BonusActionBarFrame:Show() BonusActionBarFrame:Show()
end end
function _G.ActionButton_OnUpdate(elapsed)
if not this.updateTooltip then return end
this.updateTooltip = this.updateTooltip - elapsed
if this.updateTooltip > 0 then return end
if GameTooltip:IsOwned(this) then
ActionButton_SetTooltip()
else
this.updateTooltip = nil
end
end
function _G.ActionButton_GetPagedID(button)
if button.isBonus and CURRENT_ACTIONBAR_PAGE == 1 then
local offset = GetBonusBarOffset()
if offset == 0 and ElvUI_Bar1 and ElvUI_Bar1.lastBonusBar then
offset = ElvUI_Bar1.lastBonusBar
end
return button:GetID() + ((NUM_ACTIONBAR_PAGES + offset - 1) * NUM_ACTIONBAR_BUTTONS)
end
local parentName = button:GetParent():GetName()
if parentName == "ElvUI_Bar5" then
return button:GetID() + ((BOTTOMLEFT_ACTIONBAR_PAGE - 1) * NUM_ACTIONBAR_BUTTONS)
elseif parentName == "ElvUI_Bar2" then
return button:GetID() + ((BOTTOMRIGHT_ACTIONBAR_PAGE - 1) * NUM_ACTIONBAR_BUTTONS)
elseif parentName == "ElvUI_Bar4" then
return button:GetID() + ((LEFT_ACTIONBAR_PAGE - 1) * NUM_ACTIONBAR_BUTTONS)
elseif parentName == "ElvUI_Bar3" then
return button:GetID() + ((RIGHT_ACTIONBAR_PAGE - 1) * NUM_ACTIONBAR_BUTTONS)
else
return button:GetID() + ((CURRENT_ACTIONBAR_PAGE - 1) * NUM_ACTIONBAR_BUTTONS)
end
end
end end
local function InitializeCallback() local function InitializeCallback()