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

1

Browse Source
This commit is contained in:
Bunny67
2017-12-30 23:28:06 +03:00
parent d4d261463a
commit 9c9f758419
2 changed files with 29 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2/3/4/5/6/7/ElvUI/Developer/Frame.lua
-1
View File
@@ -1,7 +1,6 @@
--Cache global variables --Cache global variables
--Lua functions --Lua functions
local _G = getfenv() local _G = getfenv()
local print, tostring = print, tostring
local format = string.format local format = string.format
--WoW API / Variables --WoW API / Variables
local GetMouseFocus = GetMouseFocus local GetMouseFocus = GetMouseFocus
2/3/4/5/6/7/ElvUI/Modules/ActionBars/ActionBars.lua
+29 -42
View File
@@ -211,9 +211,6 @@ function AB:CreateBar(id)
self:HookScript(button, "OnLeave", "Button_OnLeave") self:HookScript(button, "OnLeave", "Button_OnLeave")
end end
MainMenuBar:SetParent(bar)
BonusActionBarFrame:SetParent(bar)
bar.buttons = bar.actionButtons bar.buttons = bar.actionButtons
bar:RegisterEvent("UPDATE_BONUS_ACTIONBAR") bar:RegisterEvent("UPDATE_BONUS_ACTIONBAR")
@@ -226,11 +223,9 @@ function AB:CreateBar(id)
end end
bar.buttons = bar.bonusButtons bar.buttons = bar.bonusButtons
-- ShowBonusActionBar();
ShowBonusActionBar() else
else -- HideBonusActionBar();
HideBonusActionBar()
for i = 1, NUM_ACTIONBAR_BUTTONS do for i = 1, NUM_ACTIONBAR_BUTTONS do
bar.buttons[i]:SetParent(E.HiddenFrame) bar.buttons[i]:SetParent(E.HiddenFrame)
end end
@@ -244,7 +239,6 @@ function AB:CreateBar(id)
for i = 1, NUM_ACTIONBAR_BUTTONS do for i = 1, NUM_ACTIONBAR_BUTTONS do
local button = _G[self["barDefaults"]["bar"..id].name.."Button"..i] local button = _G[self["barDefaults"]["bar"..id].name.."Button"..i]
bar.buttons[i] = button bar.buttons[i] = button
bar.buttons[i].id = id
self:HookScript(button, "OnEnter", "Button_OnEnter") self:HookScript(button, "OnEnter", "Button_OnEnter")
self:HookScript(button, "OnLeave", "Button_OnLeave") self:HookScript(button, "OnLeave", "Button_OnLeave")
@@ -369,21 +363,13 @@ end
function AB:DisableBlizzard() function AB:DisableBlizzard()
MainMenuBar:EnableMouse(false) MainMenuBar:EnableMouse(false)
E:Kill(MainMenuExpBar)
E:Kill(MainMenuBarMaxLevelBar)
E:Kill(MainMenuBarPerformanceBarFrame)
BonusActionBarFrame:EnableMouse(false)
BonusActionBarFrame:DisableDrawLayer("OVERLAY")
PetActionBarFrame:EnableMouse(false) PetActionBarFrame:EnableMouse(false)
ShapeshiftBarFrame:EnableMouse(false) ShapeshiftBarFrame:EnableMouse(false)
local elements = { local elements = {
--MainMenuBar, MainMenuBar,
MainMenuBarArtFrame, MainMenuBarArtFrame,
--BonusActionBarFrame, BonusActionBarFrame,
PetActionBarFrame, PetActionBarFrame,
ShapeshiftBarFrame, ShapeshiftBarFrame,
ShapeshiftBarLeft, ShapeshiftBarLeft,
@@ -463,34 +449,34 @@ function AB:ActionButton_Update()
self:StyleButton(this) self:StyleButton(this)
end end
function AB: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
function AB:Initialize() function AB:Initialize()
self.db = E.db.actionbar self.db = E.db.actionbar
if E.private.actionbar.enable ~= true then return end if E.private.actionbar.enable ~= true then return end
function 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
self:DisableBlizzard() self:DisableBlizzard()
self:SetupMicroBar() self:SetupMicroBar()
@@ -503,6 +489,7 @@ function AB:Initialize()
--self:LoadKeyBinder() --self:LoadKeyBinder()
self:SecureHook("ActionButton_Update") self:SecureHook("ActionButton_Update")
self:RawHook("ActionButton_GetPagedID")
-- self:SecureHook("PetActionBar_Update", "UpdatePet") -- self:SecureHook("PetActionBar_Update", "UpdatePet")
end end