Skip to content
This repository was archived by the owner on Jan 21, 2024. It is now read-only.

Commit 5ed46de

Browse files
committed
fix #421, should fix both drag and drop and cooldown transparency
1 parent 07d34cb commit 5ed46de

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

Objects/ACTIONBUTTON.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ function ACTIONBUTTON:LoadData(spec, state)
7575
end
7676

7777
function ACTIONBUTTON:UpdateObjectVisibility(show)
78-
if self:HasAction() or show or self.showGrid or Neuron.buttonEditMode or Neuron.barEditMode or Neuron.bindingMode then
78+
if self:HasAction() or #Neuron.macroDrag > 0 or show or self.showGrid or Neuron.buttonEditMode or Neuron.barEditMode or Neuron.bindingMode then
7979
self.isShown = true
8080
else
8181
self.isShown = false

Objects/ACTIONBUTTON_DragAndDrop.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
local ACTIONBUTTON = Neuron.ACTIONBUTTON
1111

1212
local macroDrag = {} --this is a table that holds onto the contents of the current macro being dragged
13+
Neuron.macroDrag = macroDrag --class level handle for checking during show/hide states
1314

1415
local macroCache = {} --this will hold onto any previous contents of our button
1516

Objects/BUTTON.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,8 @@ function BUTTON:CancelCooldownTimer(stopAnimation)
134134
if stopAnimation then
135135
CooldownFrame_Clear(self.Cooldown) --clear the cooldown frame
136136
end
137+
138+
self:UpdateObjectVisibility()
137139
end
138140

139141

0 commit comments

Comments
 (0)