fix: #2228 - Cooldown bling appearing on groups with 0% opacity.

ascott18 · Sep 15, 2024 · c352e9b · c352e9b
1 parent e2ff3d9
commit c352e9b
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## v11.0.10
+* Fix: #2228 - Cooldown bling appearing on groups with 0% opacity.
+
 ## v11.0.9
 * Fix various Lua errors.
 

diff --git a/Components/IconModules/IconModule_CooldownSweep/CooldownSweep.lua b/Components/IconModules/IconModule_CooldownSweep/CooldownSweep.lua
@@ -207,7 +207,7 @@ function CooldownSweep:OnNewInstance(icon)
 		end
 	end
 	hooksecurefunc(icon, "SetAlpha", function(icon, alpha)
-		iconShown = alpha > 0
+		iconShown = alpha > 0 and icon:GetEffectiveAlpha() > 0
 		if not iconShown and blingShown then
 			self.cooldown:SetDrawBling(false)
 		elseif iconShown and not blingShown and self.shouldShowBling then

diff --git a/Options/CHANGELOG.lua b/Options/CHANGELOG.lua
@@ -3,6 +3,9 @@ if not TMW then return end
 TMW.CHANGELOG_LASTVER="10.0.0"
 
 TMW.CHANGELOG = [==[
+## v11.0.10
+* Fix: #2228 - Cooldown bling appearing on groups with 0% opacity.
+
 ## v11.0.9
 * Fix various Lua errors.
 

diff --git a/TellMeWhen-Cata.toc b/TellMeWhen-Cata.toc
@@ -18,7 +18,7 @@
 ## X-WoWI-ID: 10855
 ## X-Wago-ID: ZQ6aZqKW
 
-## Version: 11.0.9
+## Version: 11.0.10
 ## Author: Cybeloras of Aerie Peak
 ## IconTexture: Interface\Addons\TellMeWhen\Textures\LDB Icon
 ## AddonCompartmentFunc: TellMeWhen_OnAddonCompartmentClick

diff --git a/TellMeWhen-Classic.toc b/TellMeWhen-Classic.toc
@@ -18,7 +18,7 @@
 ## X-WoWI-ID: 10855
 ## X-Wago-ID: ZQ6aZqKW
 
-## Version: 11.0.9
+## Version: 11.0.10
 ## Author: Cybeloras of Aerie Peak
 ## IconTexture: Interface\Addons\TellMeWhen\Textures\LDB Icon
 ## AddonCompartmentFunc: TellMeWhen_OnAddonCompartmentClick

diff --git a/TellMeWhen.lua b/TellMeWhen.lua
@@ -34,22 +34,20 @@ end
 TELLMEWHEN_VERSION_FULL = TELLMEWHEN_VERSION .. " " .. TELLMEWHEN_VERSION_MINOR
 
 local REVISION = 1
-if #TELLMEWHEN_VERSION > 6 or REVISION >= 100 then
+if #TELLMEWHEN_VERSION > 7 or REVISION >= 100 then
 	return error("TELLMEWHEN: UNEXPECTEDLY HIGH VERSION/REVISION")
 end
 
 -- This number is used for running migrations, showing the last changelog version,
 -- and communicating new versions to other players.
--- For a TOC version 10.2.3 and a REVISION=45, it'll be `102345`.
-TELLMEWHEN_VERSIONNUMBER = tonumber(TELLMEWHEN_VERSION:gsub("%.", "") .. ("%02d"):format(REVISION))
+-- For a TOC version 10.2.3 and a REVISION=45, it'll be `10020345`.
+TELLMEWHEN_VERSIONNUMBER = tonumber(
+	TELLMEWHEN_VERSION:gsub("%.(%d+)", function(x) return ("%02d"):format(tonumber(x)) end) .. 
+	("%02d"):format(REVISION)
+)
 
 TELLMEWHEN_FORCECHANGELOG = 86005 -- if the user hasn't seen the changelog until at least this version, show it to them.
 
-
-if TELLMEWHEN_VERSION_MINOR == "dev" and not strfind(TELLMEWHEN_VERSIONNUMBER, TELLMEWHEN_VERSION:gsub("%.", ""), nil) then
-	return error("TELLMEWHEN: TELLMEWHEN_VERSION DOESN'T AGREE WITH TELLMEWHEN_VERSIONNUMBER")
-end
-
 TELLMEWHEN_MAXROWS = 20
 
 -- Put required libs here: (If they fail to load, all of TMW should fail to load)

diff --git a/TellMeWhen.toc b/TellMeWhen.toc
@@ -18,7 +18,7 @@
 ## X-WoWI-ID: 10855
 ## X-Wago-ID: ZQ6aZqKW
 
-## Version: 11.0.9
+## Version: 11.0.10
 ## Author: Cybeloras of Aerie Peak
 ## IconTexture: Interface\Addons\TellMeWhen\Textures\LDB Icon
 ## AddonCompartmentFunc: TellMeWhen_OnAddonCompartmentClick