This commit is contained in:
Crum
2019-01-02 21:30:28 -06:00
parent b75736e34d
commit 0cb4ff5283
+5 -4
View File
@@ -62,7 +62,7 @@ function AB:BindListener(key)
end end
E:Print(format(L["All keybindings cleared for |cff00ff00%s|r."], bind.button.name)) E:Print(format(L["All keybindings cleared for |cff00ff00%s|r."], bind.button.name))
self:BindUpdate(bind.button, bind.spellmacro) self:BindUpdate(bind.button, bind.spellmacro)
if bind.spellmacro~="MACRO" then GameTooltip:Hide() end if bind.spellmacro ~= "MACRO" then GameTooltip:Hide() end
return return
end end
@@ -84,6 +84,7 @@ function AB:BindListener(key)
local alt = IsAltKeyDown() and "ALT-" or "" local alt = IsAltKeyDown() and "ALT-" or ""
local ctrl = IsControlKeyDown() and "CTRL-" or "" local ctrl = IsControlKeyDown() and "CTRL-" or ""
local shift = IsShiftKeyDown() and "SHIFT-" or "" local shift = IsShiftKeyDown() and "SHIFT-" or ""
if not bind.spellmacro or bind.spellmacro == "PET" or bind.spellmacro == "SHAPESHIFT" then if not bind.spellmacro or bind.spellmacro == "PET" or bind.spellmacro == "SHAPESHIFT" then
SetBinding(alt..ctrl..shift..key, bind.button.bindstring) SetBinding(alt..ctrl..shift..key, bind.button.bindstring)
else else
@@ -91,7 +92,7 @@ function AB:BindListener(key)
end end
E:Print(alt..ctrl..shift..key..L[" |cff00ff00bound to |r"]..bind.button.name..".") E:Print(alt..ctrl..shift..key..L[" |cff00ff00bound to |r"]..bind.button.name..".")
self:BindUpdate(bind.button, bind.spellmacro) self:BindUpdate(bind.button, bind.spellmacro)
if bind.spellmacro~="MACRO" then GameTooltip:Hide() end if bind.spellmacro ~= "MACRO" then GameTooltip:Hide() end
end end
function AB:BindUpdate(button, spellmacro) function AB:BindUpdate(button, spellmacro)
@@ -113,12 +114,12 @@ function AB:BindUpdate(button, spellmacro)
if spellmacro == "MACRO" then if spellmacro == "MACRO" then
bind.button.id = bind.button:GetID() bind.button.id = bind.button:GetID()
if floor(.5 + select(2,MacroFrameTab1Text:GetTextColor()) * 10) / 10 == .8 then bind.button.id = bind.button.id + MAX_MACROS end if floor(.5 + select(2, MacroFrameTab1Text:GetTextColor()) * 10) / 10 == .8 then bind.button.id = bind.button.id + MAX_MACROS end
bind.button.name = GetMacroInfo(bind.button.id) bind.button.name = GetMacroInfo(bind.button.id)
GameTooltip:SetOwner(bind, "ANCHOR_TOP") GameTooltip:SetOwner(bind, "ANCHOR_TOP")
E:Point(GameTooltip, "BOTTOM", bind, "TOP", 0, 1) GameTooltip:SetPoint("BOTTOM", bind, "TOP", 0, 1)
GameTooltip:AddLine(bind.button.name, 1, 1, 1) GameTooltip:AddLine(bind.button.name, 1, 1, 1)
bind.button.bindings = {GetBindingKey(spellmacro.." "..bind.button.name)} bind.button.bindings = {GetBindingKey(spellmacro.." "..bind.button.name)}