Mercurial > wow > skeletonkey

diff SkeletonKey/HotKey.lua @ 13:eeec4a600064

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- kb.bindings carries the exact values needed for matching GetActionInfo() outputs
author Nenue
date Thu, 28 Jul 2016 18:20:32 -0400
parents f6d1c192afc6
children 82170735e67c
line wrap: on
line diff
--- a/SkeletonKey/HotKey.lua	Thu Jul 28 17:45:17 2016 -0400
+++ b/SkeletonKey/HotKey.lua	Thu Jul 28 18:20:32 2016 -0400
@@ -117,6 +117,11 @@
   hooksecurefunc("ActionBarButtonEventsFrame_RegisterFrame", hotkey.RegisterFrame)
 end
 
+hotkey.ui = function()
+  hotkey.player()
+  hotkey.pet()
+end
+
 hotkey.world = function()
   hotkeyEvents["UPDATE_BINDINGS"] = {"actionbar"}
   hotkey.UPDATE_BINDINGS = hotkey.UpdateFromEvent
@@ -131,10 +136,9 @@
 
 -- requires all these arguments since non-actionbar buttons don't have all of said methods
 hotkey.UpdateSkeletonKeyText = function(frame, actionType, actionID, hasAction)
+  bindings = kb.GetBindings()
+  print(frame, actionType, actionID, hasAction)
   if bindings[actionType] then
-    if actionType == 'macro' then
-      actionID = GetMacroInfo(actionID)
-    end
     --print('|cFFFFFF00'..frame:GetName(), actionType, actionID, hasAction)
     local binds = bindings[actionType][actionID]
     if binds  then