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

WIP - detecting actual key bindings now

Browse Source
This commit is contained in:
Logan Payton
2018-02-27 23:57:13 -05:00
parent e9d7b1827f
commit 627b7c4501
1 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElvUI/Modules/ActionBars/Bind.lua
+18 -24
View File
@@ -6,7 +6,7 @@ local AB = E:GetModule("ActionBars");
local _G = _G local _G = _G
local select, tonumber, pairs, getn = select, tonumber, pairs, getn local select, tonumber, pairs, getn = select, tonumber, pairs, getn
local floor, mod = math.floor, math.mod 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 --WoW API / Variables
local hooksecurefunc = hooksecurefunc local hooksecurefunc = hooksecurefunc
local EnumerateFrames = EnumerateFrames local EnumerateFrames = EnumerateFrames
@@ -163,27 +163,17 @@ function AB:BindUpdate(button, spellmacro)
this:SetScript("OnHide", nil) this:SetScript("OnHide", nil)
end) end)
else else
bind.button.action = tonumber(button.action)
bind.button.name = button:GetName() bind.button.name = button:GetName()
if not bind.button.name then return end bind.button.bindstring = bind.button.buttonType
if (not bind.button.action or bind.button.action < 1 or bind.button.action > 132) and not (bind.button.keyBoundTarget) then if not bind.button.bindstring and find(bind.button.name, "BonusActionButton") then
bind.button.bindstring = "CLICK "..bind.button.name..":LeftButton" bind.button.bindstring = "ACTIONBUTTON"
elseif bind.button.keyBoundTarget then end
bind.button.bindstring = bind.button.keyBoundTarget
else if tonumber(sub(bind.button.name, -2)) then
local modact = mod(1 + (bind.button.action - 1), 12) bind.button.bindstring = bind.button.bindstring .. sub(bind.button.name, -2)
if bind.button.action < 25 or bind.button.action > 72 then elseif tonumber(sub(bind.button.name, -1)) then
bind.button.bindstring = "ACTIONBUTTON"..modact bind.button.bindstring = bind.button.bindstring .. sub(bind.button.name, -1)
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
end end
GameTooltip:AddLine(L["Trigger"]) GameTooltip:AddLine(L["Trigger"])
@@ -210,13 +200,17 @@ end
local script local script
local shapeshift = ShapeshiftButton1:GetScript("OnClick") local shapeshift = ShapeshiftButton1:GetScript("OnClick")
local pet = PetActionButton1:GetScript("OnClick") local pet = PetActionButton1:GetScript("OnClick")
local button = ActionButton1:GetScript("OnClick")
function AB:RegisterButton(b, override) function AB:RegisterButton(b, override)
if b.IsObjectType and b.GetScript and b:IsObjectType("CheckButton") then if b.IsObjectType and b.GetScript and b:IsObjectType("CheckButton") then
script = b:GetScript("OnClick") local buttonName = b:GetName()
if script == button or override then if find(buttonName, "MultiBarLeftButton")
or find(buttonName, "MultiBarRightButton")
or find(buttonName, "MultiBarBottomLeftButton")
or find(buttonName, "MultiBarBottomRightButton")
or find(buttonName, "BonusActionButton") or override then
HookScript(b, "OnEnter", function() self:BindUpdate(b) end) HookScript(b, "OnEnter", function() self:BindUpdate(b) end)
script = b:GetScript("OnClick")
if script == shapeshift then if script == shapeshift then
HookScript(b, "OnEnter", function() self:BindUpdate(b, "SHAPESHIFT") end) HookScript(b, "OnEnter", function() self:BindUpdate(b, "SHAPESHIFT") end)
elseif script == pet then elseif script == pet then