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

Merge pull request #7 from EnsignPayton/bind-work

Browse Source 
Key Binding Works
This commit is contained in:
Crum
2018-02-28 07:20:29 -06:00
committed by GitHub
parent e9d7b1827f 3482c89c53
commit 5abe3c77ff
3 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElvUI/Core/core.lua
-1
View File
@@ -50,7 +50,6 @@ E["ModuleCallbacks"] = {["CallPriority"] = {}}
E["InitialModuleCallbacks"] = {["CallPriority"] = {}}
E["valueColorUpdateFuncs"] = {}
E.TexCoords = {.08, .92, .08, .92}
E.VehicleLocks = {}
E.CreditsList = {}
E.PixelMode = false
ElvUI/Modules/ActionBars/ActionBars.lua
+3 -1
View File
@@ -492,7 +492,9 @@ function AB:Initialize()
self:RawHook("ActionButton_GetPagedID")
-- self:SecureHook("PetActionBar_Update", "UpdatePet")
BonusActionBarFrame:Show()
if E.myclass == "WARRIOR" or E.myclass == "DRUID" then
BonusActionBarFrame:Show()
end
end
local function InitializeCallback()
ElvUI/Modules/ActionBars/Bind.lua
+19 -24
View File
@@ -6,7 +6,7 @@ local AB = E:GetModule("ActionBars");
local _G = _G
local select, tonumber, pairs, getn = select, tonumber, pairs, getn
local floor, mod = math.floor, math.mod
local find, format, upper = string.find, string.format, string.upper
local find, format, upper, sub = string.find, string.format, string.upper, string.sub
--WoW API / Variables
local hooksecurefunc = hooksecurefunc
local EnumerateFrames = EnumerateFrames
@@ -163,27 +163,17 @@ function AB:BindUpdate(button, spellmacro)
this:SetScript("OnHide", nil)
end)
else
bind.button.action = tonumber(button.action)
bind.button.name = button:GetName()
if not bind.button.name then return end
if (not bind.button.action or bind.button.action < 1 or bind.button.action > 132) and not (bind.button.keyBoundTarget) then
bind.button.bindstring = "CLICK "..bind.button.name..":LeftButton"
elseif bind.button.keyBoundTarget then
bind.button.bindstring = bind.button.keyBoundTarget
else
local modact = mod(1 + (bind.button.action - 1), 12)
if bind.button.action < 25 or bind.button.action > 72 then
bind.button.bindstring = "ACTIONBUTTON"..modact
elseif bind.button.action < 73 and bind.button.action > 60 then
bind.button.bindstring = "MULTIACTIONBAR1BUTTON"..modact
elseif bind.button.action < 61 and bind.button.action > 48 then
bind.button.bindstring = "MULTIACTIONBAR2BUTTON"..modact
elseif bind.button.action < 49 and bind.button.action > 36 then
bind.button.bindstring = "MULTIACTIONBAR4BUTTON"..modact
elseif bind.button.action < 37 and bind.button.action > 24 then
bind.button.bindstring = "MULTIACTIONBAR3BUTTON"..modact
end
bind.button.bindstring = bind.button.buttonType
if not bind.button.bindstring and (find(bind.button.name, "BonusActionButton") or find(bind.button.name, "ActionButton")) then
bind.button.bindstring = "ACTIONBUTTON"
end
if tonumber(sub(bind.button.name, -2)) then
bind.button.bindstring = bind.button.bindstring .. sub(bind.button.name, -2)
elseif tonumber(sub(bind.button.name, -1)) then
bind.button.bindstring = bind.button.bindstring .. sub(bind.button.name, -1)
end
GameTooltip:AddLine(L["Trigger"])
@@ -210,13 +200,18 @@ end
local script
local shapeshift = ShapeshiftButton1:GetScript("OnClick")
local pet = PetActionButton1:GetScript("OnClick")
local button = ActionButton1:GetScript("OnClick")
function AB:RegisterButton(b, override)
if b.IsObjectType and b.GetScript and b:IsObjectType("CheckButton") then
script = b:GetScript("OnClick")
if script == button or override then
if b.IsObjectType and b.GetScript and b:IsObjectType("CheckButton") then
local buttonName = b:GetName()
if find(buttonName, "MultiBarLeftButton")
or find(buttonName, "MultiBarRightButton")
or find(buttonName, "MultiBarBottomLeftButton")
or find(buttonName, "MultiBarBottomRightButton")
or find(buttonName, "BonusActionButton")
or find(buttonName, "ActionButton") or override then
HookScript(b, "OnEnter", function() self:BindUpdate(b) end)
script = b:GetScript("OnClick")
if script == shapeshift then
HookScript(b, "OnEnter", function() self:BindUpdate(b, "SHAPESHIFT") end)
elseif script == pet then