LAB 0.60-9 alpha / restore Actionbar functionality

Author: Luckyone961

ElvUI_Libraries/Game/Shared/LibActionButton-1.0/LibActionButton-1.0.lua

@@ -1,7 +1,7 @@
 -- License: LICENSE.txt
 
 local MAJOR_VERSION = "LibActionButton-1.0-ElvUI"
-local MINOR_VERSION = 81 -- the real minor version is 147
+local MINOR_VERSION = 82 -- the real minor version is 151
 
 local LibStub = LibStub
 if not LibStub then error(MAJOR_VERSION .. " requires LibStub.") end
@@ -77,6 +77,7 @@ lib.buttonRegistry = lib.buttonRegistry or {}
 lib.activeButtons = lib.activeButtons or {}
 lib.actionButtons = lib.actionButtons or {}
 lib.nonActionButtons = lib.nonActionButtons or {}
+lib.actionButtonsNonUI = lib.actionButtonsNonUI or {}
 lib.activeAlerts = lib.activeAlerts or {}
 lib.activeAssist = lib.activeAssist or {}
 
@@ -134,9 +135,9 @@ local type_meta_map = {
 
 local GetFlyoutHandler
 local InitializeEventHandler, OnEvent, ForAllButtonsWithSpell, ForAllButtons
-local ButtonRegistry, ActiveButtons, ActionButtons, NonActionButtons = lib.buttonRegistry, lib.activeButtons, lib.actionButtons, lib.nonActionButtons
+local ButtonRegistry, ActiveButtons, ActionButtons, NonActionButtons, ActionButtonsNonUI = lib.buttonRegistry, lib.activeButtons, lib.actionButtons, lib.nonActionButtons, lib.actionButtonsNonUI
 
-local Update, UpdateButtonState, UpdateUsable, UpdateCount, UpdateCooldown, UpdateTooltip, UpdateNewAction, UpdateSpellHighlight, ClearNewActionHighlight
+local Update, UpdateButtonState, UpdateUsable, UpdateCount, UpdateCooldown, UpdateCooldownNumberHidden, UpdateTooltip, UpdateNewAction, UpdateSpellHighlight, ClearNewActionHighlight
 local StartFlash, StopFlash, UpdateFlash, UpdateHotkeys, UpdateRangeTimer, UpdateOverlayGlow
 local UpdateFlyout, ShowGrid, HideGrid, UpdateGrid, SetupSecureSnippets, WrapOnClick
 local ShowOverlayGlow, HideOverlayGlow
@@ -207,6 +208,7 @@ local DefaultConfig = {
 	cooldownCount = nil, -- nil: use cvar, true/false: enable/disable
 	lossOfControlCooldown = true,
 	flyoutDirection = "UP",
+	actionButtonUI = false, -- register the button with SetActionUIButton, this has some side-effects if the button changes from action type to another type, but is required for certain UI integrations. Recommended to only set on pure type=action buttons
 	useDrawBling = true,
 	handleOverlay = true,
 	text = {
@@ -318,6 +320,10 @@ function lib:CreateButton(id, name, header, config)
 	button:SetScript("PreClick", Generic.PreClick)
 	button:SetScript("PostClick", Generic.PostClick)
 	button:SetScript("OnEvent", Generic.OnButtonEvent)
+	button:SetScript("OnAttributeChanged", nil) -- inherited templates bring in a handler here which we don't want, so get rid of it
+
+	-- unwanted mixin functions, which we override through the metatable
+	button.HasAction = nil
 
 	button.id = id
 	button.header = header
@@ -1444,6 +1450,7 @@ function Generic:UpdateConfig(config)
 		self.Name:Show()
 	end
 
+	UpdateCooldownNumberHidden(self)
 	UpdateTextElements(self)
 	UpdateHotkeys(self)
 	UpdateGrid(self)
@@ -1577,6 +1584,8 @@ function OnEvent(_, event, arg1, arg2, arg3, arg4)
 	elseif event == "CVAR_UPDATE" then
 		if arg1 == "assistedCombatHighlight" then
 			wipe(lib.activeAssist)
+		elseif arg1 == "countdownForCooldowns" then
+			ForAllButtons(UpdateCooldownNumberHidden)
 		end
 	elseif event == "SPELLS_CHANGED" or event == "SPELL_FLYOUT_UPDATE" then
 		if UseCustomFlyout then
@@ -1635,7 +1644,11 @@ function OnEvent(_, event, arg1, arg2, arg3, arg4)
 		if TARGETAURA_ENABLED then
 			UpdateTargetAuras(event, arg1, arg2)
 		end
-	elseif (event == "ACTIONBAR_UPDATE_STATE" or event == "UNIT_ENTERED_VEHICLE" or event == "UNIT_EXITED_VEHICLE")
+	elseif event == "ACTIONBAR_UPDATE_STATE" then
+		for button in next, ActionButtonsNonUI do
+			UpdateButtonState(button)
+		end
+	elseif (event == "UNIT_ENTERED_VEHICLE" or event == "UNIT_EXITED_VEHICLE")
 		or (event == "TRADE_SKILL_SHOW" or event == "TRADE_SKILL_CLOSE"  or event == "ARCHAEOLOGY_CLOSED" or event == "TRADE_CLOSED") then
 		ForAllButtons(UpdateButtonState, true, event)
 	elseif event == "ACTION_RANGE_CHECK_UPDATE" then
@@ -2101,7 +2114,10 @@ function Generic:UpdateAction(force)
 		self._state_action = action
 
 		-- set action attribute for action buttons
-		self.action = self._state_type == "action" and action or nil
+		self.action = self._state_type == "action" and action or 0
+		if self.config.actionButtonUI then
+			SetActionUIButton(self, self.action, self.cooldown)
+		end
 
 		Update(self, 'UpdateAction')
 	end
@@ -2113,9 +2129,13 @@ function Update(self, which)
 		if self._state_type == "action" then
 			ActionButtons[self] = true
 			NonActionButtons[self] = nil
+			if not self.config.actionButtonUI then
+				ActionButtonsNonUI[self] = true
+			end
 		else
 			ActionButtons[self] = nil
 			NonActionButtons[self] = true
+			ActionButtonsNonUI[self] = nil
 		end
 
 		self:SetAlpha(1.0)
@@ -2128,6 +2148,7 @@ function Update(self, which)
 		ActiveButtons[self] = nil
 		ActionButtons[self] = nil
 		NonActionButtons[self] = nil
+		ActionButtonsNonUI[self] = nil
 
 		if gridCounter == 0 and not self.config.showGrid then
 			self:SetAlpha(0.0)
@@ -2363,6 +2384,16 @@ function UpdateCount(self)
 	self.Count:SetText(self:GetDisplayCount())
 end
 
+function UpdateCooldownNumberHidden(self)
+	local shouldBeHidden
+	if self.config.cooldownCount == nil then
+		shouldBeHidden = GetCVar("countdownForCooldowns") ~= "1"
+	else
+		shouldBeHidden = not self.config.cooldownCount
+	end
+	self.cooldown:SetHideCountdownNumbers(shouldBeHidden)
+end
+
 function ClearChargeCooldown(self)
 	if self.chargeCooldown then
 		CooldownFrame_Clear(self.chargeCooldown)
@@ -2469,6 +2500,7 @@ else
 		if hasLocCooldown and ((not hasCooldown) or ((locStart + locDuration) > (start + duration))) then
 			if self.cooldown.currentCooldownType ~= _G.COOLDOWN_TYPE_LOSS_OF_CONTROL then
 				self.cooldown.currentCooldownType = _G.COOLDOWN_TYPE_LOSS_OF_CONTROL
+				UpdateCooldownNumberHidden(self)
 			end
 
 			CooldownFrame_Set(self.cooldown, locStart, locDuration, true, true, modRate)
@@ -2477,6 +2509,7 @@ else
 		else
 			if self.cooldown.currentCooldownType ~= _G.COOLDOWN_TYPE_NORMAL then
 				self.cooldown.currentCooldownType = _G.COOLDOWN_TYPE_NORMAL
+				UpdateCooldownNumberHidden(self)
 			end
 
 			self.cooldown:SetScript("OnCooldownDone", OnCooldownDone, hasLocCooldown)
@@ -3023,7 +3056,7 @@ end
 
 -- fallback for pre-12.0
 
-local GetActionCount = C_ActionBar.GetActionUseCount or GetActionCount
+local GetActionCount = GetActionCount
 
 -- the remaining uses of GetActionCount can't deal with secrets, so disable on Midnight
 if WoWRetail then
@@ -3146,9 +3179,7 @@ if WoWClassic then
 			return LibClassicSpellActionCount:GetActionCount(self._state_action)
 		end
 	else -- if we don't have the library, only show count for items, like the default UI
-		Action.IsConsumableOrStackable = function(self)
-			return IsConsumableAction(self._state_action) or IsStackableAction(self._state_action) or (not IsItemAction(self._state_action) and GetActionCount(self._state_action) > 0)
-		end
+		Action.IsConsumableOrStackable = function(self) return IsItemAction(self._state_action) and (IsConsumableAction(self._state_action) or IsStackableAction(self._state_action)) end
 	end
 end
 
@@ -3173,22 +3204,31 @@ else
 end
 local GetSpellLossOfControlCooldownInfo = C_Spell and C_Spell.GetSpellLossOfControlCooldownInfo or GetSpellLoCCooldownInfoFallback
 
+local GetSpellTexture = C_Spell and C_Spell.GetSpellTexture or GetSpellTexture
+local GetSpellCastCount = C_Spell and C_Spell.GetSpellCastCount or GetSpellCount
+local IsAttackSpell = C_SpellBook and C_SpellBook.IsAutoAttackSpellBookItem or IsAttackSpell
+local IsCurrentSpell = C_Spell and C_Spell.IsCurrentSpell or IsCurrentSpell
+local IsAutoRepeatSpell = C_Spell and C_Spell.IsAutoRepeatSpell or IsAutoRepeatSpell
+local IsSpellUsable = C_Spell and C_Spell.IsSpellUsable or IsUsableSpell
+local IsSpellInRange = C_Spell and C_Spell.IsSpellInRange or IsSpellInRange
+
+local BOOKTYPE_SPELL = Enum.SpellBookSpellBank and Enum.SpellBookSpellBank.Player or "spell"
 -----------------------------------------------------------
 --- Spell Button
 Spell.HasAction                = function(self) return true end
 Spell.GetActionText            = function(self) return "" end
-Spell.GetTexture               = function(self) return C_Spell.GetSpellTexture(self._state_action) end
-Spell.GetCount                 = function(self) return C_Spell.GetSpellCastCount(self._state_action) end
+Spell.GetTexture               = function(self) return GetSpellTexture(self._state_action) end
+Spell.GetCount                 = function(self) return GetSpellCastCount(self._state_action) end
 Spell.GetChargeInfo            = function(self) return C_Spell.GetSpellCharges(self._state_action) end
 Spell.GetCooldownInfo          = function(self) return C_Spell.GetSpellCooldown(self._state_action) end
 Spell.GetLoCCooldownInfo       = function(self) return GetSpellLossOfControlCooldownInfo(self._state_action) end
-Spell.IsAttack                = function(self) return C_Spell.IsAutoAttackSpell(self._state_action) or nil end
+Spell.IsAttack                 = function(self) local slot = FindSpellBookSlotBySpellID(self._state_action) return slot and IsAttackSpell(slot, BOOKTYPE_SPELL) or nil end
 Spell.IsEquipped               = function(self) return nil end
-Spell.IsCurrentlyActive        = function(self) return C_Spell.IsCurrentSpell(self._state_action) end
-Spell.IsAutoRepeat            = function(self) return C_Spell.IsAutoRepeatSpell(self._state_action) or nil end
-Spell.IsUsable                 = function(self) return C_Spell.IsSpellUsable(self._state_action) end
+Spell.IsCurrentlyActive        = function(self) return IsCurrentSpell(self._state_action) end
+Spell.IsAutoRepeat             = function(self) local slot = FindSpellBookSlotBySpellID(self._state_action) return slot and IsAutoRepeatSpell(slot, BOOKTYPE_SPELL) or nil end
+Spell.IsUsable                 = function(self) return IsSpellUsable(self._state_action) end
 Spell.IsConsumableOrStackable  = function(self) return IsConsumableSpell(self._state_action) end
-Spell.IsUnitInRange           = function(self, unit) return C_Spell.IsSpellInRange(self._state_action, unit) or nil end
+Spell.IsUnitInRange            = function(self, unit) local slot = FindSpellBookSlotBySpellID(self._state_action) return slot and IsSpellInRange(slot, BOOKTYPE_SPELL, unit) or nil end
 Spell.SetTooltip               = function(self) return GameTooltip:SetSpellByID(self._state_action) end
 Spell.GetSpellId               = function(self) return self._state_action end