Mercurial > wow > skeletonkey

diff SkeletonKey/HotKey.lua @ 57:9eebce04e69b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Prevent bind settings from being updated in combat. - Close the UI during combat. - Resolve conflicting keybinds and inform the user of any results. - Resolve conflicts for talents, but only when they are active.
author Nenue
date Mon, 22 Aug 2016 09:24:02 -0400
parents a545933ddf3d
children d8bb2629fea8
line wrap: on
line diff
--- a/SkeletonKey/HotKey.lua	Sun Aug 21 07:19:01 2016 -0400
+++ b/SkeletonKey/HotKey.lua	Mon Aug 22 09:24:02 2016 -0400
@@ -111,7 +111,7 @@
   if bindings[indexKey] then
     --print('|cFFFFFF00'..frame:GetName(), actionType, actionID, hasAction)
     local binds = bindings[indexKey]
-    if binds  then
+    if binds and (not frame.HotKey:IsVisible()) then
       if hasAction then
         local bindingsText = kb.BindingString(unpack(binds))
 
@@ -121,6 +121,10 @@
           hotkeyText[frame]:SetFont(frame.HotKey:GetFont())
           hotkeyText[frame]:SetTextColor(frame.HotKey:GetTextColor())
           hotkeyText[frame]:SetPoint('TOPRIGHT', frame.HotKey, 'TOPRIGHT')
+
+          hooksecurefunc(frame.HotKey, 'SetVertexColor', function(self, r,g,b,a)
+            hotkeyText[frame]:SetTextColor(r,g,b,a)
+          end)
         end
 
         hotkeyText[frame]:SetText(bindingsText)