diff ReAction.lua @ 209:3e451836ce6d 1.1 Beta 3

Merge c24ac8ee1e45857c35b8f241a3782e884ee9c7c0
author Flick <flickerstreak@gmail.com>
date Thu, 18 Nov 2010 13:09:14 -0800
parents 443d2ea4be86 c24ac8ee1e45
children e275a8663a16
line wrap: on
line diff
--- a/ReAction.lua	Thu Nov 18 13:06:14 2010 -0800
+++ b/ReAction.lua	Thu Nov 18 13:09:14 2010 -0800
@@ -49,6 +49,7 @@
   self.callbacks = LibStub("CallbackHandler-1.0"):New(self)
   LKB.RegisterCallback(self,"LIBKEYBOUND_ENABLED")
   LKB.RegisterCallback(self,"LIBKEYBOUND_DISABLED")
+  LKB.RegisterCallback(self, "LIBKEYBOUND_MODE_COLOR_CHANGED","LIBKEYBOUND_ENABLED")
   self:RegisterEvent("PLAYER_REGEN_DISABLED")
   self:InitializeOptions()
 end
@@ -271,6 +272,9 @@
 
 function ReAction:SetConfigMode( mode )
   if mode ~= self.configMode then
+    if mode then
+      self:SetKeybindMode(false)
+    end
     self.configMode = mode
     self.callbacks:Fire("OnConfigModeChanged", mode)
   end
@@ -283,10 +287,14 @@
 function ReAction:SetKeybindMode( mode )
   if mode ~= self.kbMode then
     if mode then
+      self:SetConfigMode(false)
       LKB:Activate()
     else
       LKB:Deactivate()
     end
+    for _, bar in self:IterateBars() do
+      bar:SetKeybindMode(mode)
+    end
     self.kbMode = LKB:IsShown() or false
   end
 end