Try to fix #312

Neuron.lua

@@ -556,19 +556,6 @@ function Neuron:UpdateStanceStrings()
 	end
 end
 
-
-
-function Neuron:ToggleButtonGrid(show)
-	for _,bar in pairs(Neuron.BARIndex) do
-		if bar.barType == "ActionBar" or bar.barType == "PetBar" then
-			for _, button in pairs(bar.buttons) do
-				button:UpdateObjectVisibility(show)
-			end
-		end
-	end
-end
-
-
 function Neuron:ToggleMainMenu()
 	---need to run the command twice for some reason. The first one only seems to open the Interface panel
 	InterfaceOptionsFrame_OpenToCategory("Neuron");

Objects/ACTIONBUTTON.lua

@@ -584,11 +584,20 @@ function ACTIONBUTTON:ACTIVE_TALENT_GROUP_CHANGED()
 end
 
 function ACTIONBUTTON:ACTIONBAR_SHOWGRID()
-	Neuron:ToggleButtonGrid(true)
+	local show = true
+	if self.barLock and self.barLockAlt and not IsAltKeyDown() then
+		show = false
+	elseif self.barLock and self.barLockCtrl and not IsControlKeyDown() then
+		show = false
+	elseif self.barLock and self.barLockShift and not IsShiftKeyDown() then
+		show = false
+	end
+
+	self:UpdateObjectVisibility(show)
 end
 
 function ACTIONBUTTON:ACTIONBAR_HIDEGRID()
-	Neuron:ToggleButtonGrid()
+	self:UpdateObjectVisibility()
 end
 
 function ACTIONBUTTON:UPDATE_MACROS()

Objects/ACTIONBUTTON_DragAndDrop.lua

@@ -66,7 +66,7 @@ function ACTIONBUTTON:OnDragStart()
 
 	end
 
-	Neuron:ToggleButtonGrid(true) --show the button grid if we have something picked up (i.e if macroDrag contains something)
+	self:ACTIONBAR_SHOWGRID() --show the button grid if we have something picked up (i.e if macroDrag contains something)
 end
 
 --This is the function that fires when a button is receiving a dragged item
@@ -126,7 +126,7 @@ function ACTIONBUTTON:OnReceiveDrag()
 
 	if macroCache[1] then
 		self:OnDragStart(macroCache) --If we picked up a new ability after dropping this one we have to manually call OnDragStart
-		Neuron:ToggleButtonGrid(true)
+		self:ACTIONBAR_SHOWGRID() --show the button grid if we have something picked up (i.e if macroDrag contains something)
 	else
 		SetCursor(nil)
 		ClearCursor() --if we did not pick up a new spell, clear the cursor