Add an option to hide all glows when out of combat

ntowle · ntowle · commit 9fec738bca90 · 2026-04-05T14:56:08.000-04:00
diff --git a/HideButtonGlow.lua b/HideButtonGlow.lua
@@ -1,6 +1,6 @@
 local addonName, HideButtonGlow = ...
 
-local CreateFrame, GetActionInfo, DEFAULT_CHAT_FRAME, Settings, GetSpellName = CreateFrame, GetActionInfo, DEFAULT_CHAT_FRAME, Settings, C_Spell.GetSpellName
+local CreateFrame, GetActionInfo, DEFAULT_CHAT_FRAME, Settings, GetSpellName, InCombatLockdown = CreateFrame, GetActionInfo, DEFAULT_CHAT_FRAME, Settings, C_Spell.GetSpellName, InCombatLockdown
 local L = LibStub("AceLocale-3.0"):GetLocale("HideButtonGlow")
 
 local EventFrame = CreateFrame("Frame")
@@ -19,6 +19,9 @@ function EventFrame:PLAYER_LOGIN(event)
 	if type(HideButtonGlowDB.hideAll) ~= "boolean" then
 		HideButtonGlowDB.hideAll = false
 	end
+	if type(HideButtonGlowDB.hideOutOfCombat) ~= "boolean" then
+		HideButtonGlowDB.hideOutOfCombat = false
+	end
 	if type(HideButtonGlowDB.debugMode) ~= "boolean" then
 		HideButtonGlowDB.debugMode = false
 	end
@@ -78,6 +81,10 @@ do
 end
 
 function HideButtonGlow:ShouldHideGlow(spellId)
+	if HideButtonGlowDB.hideOutOfCombat and not InCombatLockdown() then
+		self:AddDebugMessageWithSpell(L.debug_combat:format(L.debug_filtered), spellId)
+		return true
+	end
 	-- check if the "hide all" option is set
 	if HideButtonGlowDB.hideAll then
 		if HideButtonGlowDB.allowed[spellId] then
diff --git a/HideButtonGlow.toc b/HideButtonGlow.toc
@@ -23,4 +23,4 @@
 Locales\enUS.lua
 Locales\[TextLocale].lua [AllowLoadTextLocale deDE, esES, esMX, frFR, itIT, koKR, ptBR, ruRU, zhCN, zhTW]
 HideButtonGlow.lua
-options.lua
+Options.lua
diff --git a/Locales/deDE.lua b/Locales/deDE.lua
@@ -2,11 +2,14 @@ local L = LibStub("AceLocale-3.0"):NewLocale("HideButtonGlow", "deDE")
 
 --L.debug_allowed = "Allowing glow for '%s' (ID %d)."
 --L.debug_filtered = "Filtered glow for '%s' (ID %d)."
+--L.debug_combat = "Not in combat: %s"
 --L.options = "Options"
 --L.hide_all = "Hide all glows"
 --L.hide_all_desc = "Hide all spell glows, except for those under \"Allowed Spells\"."
 --L.debug_mode = "Debug mode"
 --L.debug_mode_desc = "Prints all filtered/unfiltered spells to chat. Useful for finding spell IDs, or checking how your settings work."
+--L.hide_out_of_combat = "Hide all when out of combat"
+--L.hide_out_of_combat_desc = "Always hide all spell glows if you are out of combat. Ignores the allow list."
 --L.filtered_spells = "Filtered Spells"
 --L.filtered_spells_desc = "Input spell names or spell IDs to prevent button glow for those abilities."
 --L.add_filter = "Add Spell to Filter List"
diff --git a/Locales/enUS.lua b/Locales/enUS.lua
@@ -2,11 +2,14 @@ local L = LibStub("AceLocale-3.0"):NewLocale("HideButtonGlow", "enUS", true)
 
 L.debug_allowed = "Allowing glow for '%s' (ID %d)."
 L.debug_filtered = "Filtered glow for '%s' (ID %d)."
+L.debug_combat = "Not in combat: %s"
 L.options = "Options"
 L.hide_all = "Hide all glows"
 L.hide_all_desc = "Hide all spell glows, except for those under \"Allowed Spells\"."
 L.debug_mode = "Debug mode"
 L.debug_mode_desc = "Prints all filtered/unfiltered spells to chat. Useful for finding spell IDs, or checking how your settings work."
+L.hide_out_of_combat = "Hide all when out of combat"
+L.hide_out_of_combat_desc = "Always hide all spell glows if you are out of combat. Ignores the allow list."
 L.filtered_spells = "Filtered Spells"
 L.filtered_spells_desc = "Input spell names or spell IDs to prevent button glow for those abilities."
 L.add_filter = "Add Spell to Filter List"
diff --git a/Locales/esES.lua b/Locales/esES.lua
@@ -2,11 +2,14 @@ local L = LibStub("AceLocale-3.0"):NewLocale("HideButtonGlow", "esES")
 
 --L.debug_allowed = "Allowing glow for '%s' (ID %d)."
 --L.debug_filtered = "Filtered glow for '%s' (ID %d)."
+--L.debug_combat = "Not in combat: %s"
 --L.options = "Options"
 --L.hide_all = "Hide all glows"
 --L.hide_all_desc = "Hide all spell glows, except for those under \"Allowed Spells\"."
 --L.debug_mode = "Debug mode"
 --L.debug_mode_desc = "Prints all filtered/unfiltered spells to chat. Useful for finding spell IDs, or checking how your settings work."
+--L.hide_out_of_combat = "Hide all when out of combat"
+--L.hide_out_of_combat_desc = "Always hide all spell glows if you are out of combat. Ignores the allow list."
 --L.filtered_spells = "Filtered Spells"
 --L.filtered_spells_desc = "Input spell names or spell IDs to prevent button glow for those abilities."
 --L.add_filter = "Add Spell to Filter List"
diff --git a/Locales/esMX.lua b/Locales/esMX.lua
@@ -2,11 +2,14 @@ local L = LibStub("AceLocale-3.0"):NewLocale("HideButtonGlow", "esMX")
 
 --L.debug_allowed = "Allowing glow for '%s' (ID %d)."
 --L.debug_filtered = "Filtered glow for '%s' (ID %d)."
+--L.debug_combat = "Not in combat: %s"
 --L.options = "Options"
 --L.hide_all = "Hide all glows"
 --L.hide_all_desc = "Hide all spell glows, except for those under \"Allowed Spells\"."
 --L.debug_mode = "Debug mode"
 --L.debug_mode_desc = "Prints all filtered/unfiltered spells to chat. Useful for finding spell IDs, or checking how your settings work."
+--L.hide_out_of_combat = "Hide all when out of combat"
+--L.hide_out_of_combat_desc = "Always hide all spell glows if you are out of combat. Ignores the allow list."
 --L.filtered_spells = "Filtered Spells"
 --L.filtered_spells_desc = "Input spell names or spell IDs to prevent button glow for those abilities."
 --L.add_filter = "Add Spell to Filter List"
diff --git a/Locales/frFR.lua b/Locales/frFR.lua
@@ -2,11 +2,14 @@ local L = LibStub("AceLocale-3.0"):NewLocale("HideButtonGlow", "frFR")
 
 --L.debug_allowed = "Allowing glow for '%s' (ID %d)."
 --L.debug_filtered = "Filtered glow for '%s' (ID %d)."
+--L.debug_combat = "Not in combat: %s"
 --L.options = "Options"
 --L.hide_all = "Hide all glows"
 --L.hide_all_desc = "Hide all spell glows, except for those under \"Allowed Spells\"."
 --L.debug_mode = "Debug mode"
 --L.debug_mode_desc = "Prints all filtered/unfiltered spells to chat. Useful for finding spell IDs, or checking how your settings work."
+--L.hide_out_of_combat = "Hide all when out of combat"
+--L.hide_out_of_combat_desc = "Always hide all spell glows if you are out of combat. Ignores the allow list."
 --L.filtered_spells = "Filtered Spells"
 --L.filtered_spells_desc = "Input spell names or spell IDs to prevent button glow for those abilities."
 --L.add_filter = "Add Spell to Filter List"
diff --git a/Locales/itIT.lua b/Locales/itIT.lua
@@ -2,11 +2,14 @@ local L = LibStub("AceLocale-3.0"):NewLocale("HideButtonGlow", "itIT")
 
 --L.debug_allowed = "Allowing glow for '%s' (ID %d)."
 --L.debug_filtered = "Filtered glow for '%s' (ID %d)."
+--L.debug_combat = "Not in combat: %s"
 --L.options = "Options"
 --L.hide_all = "Hide all glows"
 --L.hide_all_desc = "Hide all spell glows, except for those under \"Allowed Spells\"."
 --L.debug_mode = "Debug mode"
 --L.debug_mode_desc = "Prints all filtered/unfiltered spells to chat. Useful for finding spell IDs, or checking how your settings work."
+--L.hide_out_of_combat = "Hide all when out of combat"
+--L.hide_out_of_combat_desc = "Always hide all spell glows if you are out of combat. Ignores the allow list."
 --L.filtered_spells = "Filtered Spells"
 --L.filtered_spells_desc = "Input spell names or spell IDs to prevent button glow for those abilities."
 --L.add_filter = "Add Spell to Filter List"
diff --git a/Locales/koKR.lua b/Locales/koKR.lua
@@ -2,11 +2,14 @@ local L = LibStub("AceLocale-3.0"):NewLocale("HideButtonGlow", "koKR")
 
 --L.debug_allowed = "Allowing glow for '%s' (ID %d)."
 --L.debug_filtered = "Filtered glow for '%s' (ID %d)."
+--L.debug_combat = "Not in combat: %s"
 --L.options = "Options"
 --L.hide_all = "Hide all glows"
 --L.hide_all_desc = "Hide all spell glows, except for those under \"Allowed Spells\"."
 --L.debug_mode = "Debug mode"
 --L.debug_mode_desc = "Prints all filtered/unfiltered spells to chat. Useful for finding spell IDs, or checking how your settings work."
+--L.hide_out_of_combat = "Hide all when out of combat"
+--L.hide_out_of_combat_desc = "Always hide all spell glows if you are out of combat. Ignores the allow list."
 --L.filtered_spells = "Filtered Spells"
 --L.filtered_spells_desc = "Input spell names or spell IDs to prevent button glow for those abilities."
 --L.add_filter = "Add Spell to Filter List"
diff --git a/Locales/ptBR.lua b/Locales/ptBR.lua
@@ -2,11 +2,14 @@ local L = LibStub("AceLocale-3.0"):NewLocale("HideButtonGlow", "ptBR")
 
 --L.debug_allowed = "Allowing glow for '%s' (ID %d)."
 --L.debug_filtered = "Filtered glow for '%s' (ID %d)."
+--L.debug_combat = "Not in combat: %s"
 --L.options = "Options"
 --L.hide_all = "Hide all glows"
 --L.hide_all_desc = "Hide all spell glows, except for those under \"Allowed Spells\"."
 --L.debug_mode = "Debug mode"
 --L.debug_mode_desc = "Prints all filtered/unfiltered spells to chat. Useful for finding spell IDs, or checking how your settings work."
+--L.hide_out_of_combat = "Hide all when out of combat"
+--L.hide_out_of_combat_desc = "Always hide all spell glows if you are out of combat. Ignores the allow list."
 --L.filtered_spells = "Filtered Spells"
 --L.filtered_spells_desc = "Input spell names or spell IDs to prevent button glow for those abilities."
 --L.add_filter = "Add Spell to Filter List"
diff --git a/Locales/ruRU.lua b/Locales/ruRU.lua
@@ -3,11 +3,14 @@ local L = LibStub("AceLocale-3.0"):NewLocale("HideButtonGlow", "ruRU")
 --Translator ZamestoTV
 L.debug_allowed = "Разрешено свечение для '%s' (ID %d)."
 L.debug_filtered = "Отфильтровано свечение для '%s' (ID %d)."
+--L.debug_combat = "Not in combat: %s"
 L.options = "Настройки"
 L.hide_all = "Скрыть все свечения"
 L.hide_all_desc = "Скрыть все свечения заклинаний, кроме тех, что указаны в списке \"Разрешённые заклинания\"."
 L.debug_mode = "Режим отладки"
 L.debug_mode_desc = "Выводит все отфильтрованные и неотфильтрованные заклинания в чат. Полезно для поиска ID заклинаний или проверки работы настроек."
+--L.hide_out_of_combat = "Hide all when out of combat"
+--L.hide_out_of_combat_desc = "Always hide all spell glows if you are out of combat. Ignores the allow list."
 L.filtered_spells = "Отфильтрованные заклинания"
 L.filtered_spells_desc = "Введите названия заклинаний или их ID, чтобы запретить свечение кнопок для этих способностей."
 L.add_filter = "Добавить заклинание в список фильтров"
diff --git a/Locales/zhCN.lua b/Locales/zhCN.lua
@@ -2,11 +2,14 @@ local L = LibStub("AceLocale-3.0"):NewLocale("HideButtonGlow", "zhCN")
 
 --L.debug_allowed = "Allowing glow for '%s' (ID %d)."
 --L.debug_filtered = "Filtered glow for '%s' (ID %d)."
+--L.debug_combat = "Not in combat: %s"
 --L.options = "Options"
 --L.hide_all = "Hide all glows"
 --L.hide_all_desc = "Hide all spell glows, except for those under \"Allowed Spells\"."
 --L.debug_mode = "Debug mode"
 --L.debug_mode_desc = "Prints all filtered/unfiltered spells to chat. Useful for finding spell IDs, or checking how your settings work."
+--L.hide_out_of_combat = "Hide all when out of combat"
+--L.hide_out_of_combat_desc = "Always hide all spell glows if you are out of combat. Ignores the allow list."
 --L.filtered_spells = "Filtered Spells"
 --L.filtered_spells_desc = "Input spell names or spell IDs to prevent button glow for those abilities."
 --L.add_filter = "Add Spell to Filter List"
diff --git a/Locales/zhTW.lua b/Locales/zhTW.lua
@@ -2,11 +2,14 @@ local L = LibStub("AceLocale-3.0"):NewLocale("HideButtonGlow", "zhTW")
 
 --L.debug_allowed = "Allowing glow for '%s' (ID %d)."
 --L.debug_filtered = "Filtered glow for '%s' (ID %d)."
+--L.debug_combat = "Not in combat: %s"
 --L.options = "Options"
 --L.hide_all = "Hide all glows"
 --L.hide_all_desc = "Hide all spell glows, except for those under \"Allowed Spells\"."
 --L.debug_mode = "Debug mode"
 --L.debug_mode_desc = "Prints all filtered/unfiltered spells to chat. Useful for finding spell IDs, or checking how your settings work."
+--L.hide_out_of_combat = "Hide all when out of combat"
+--L.hide_out_of_combat_desc = "Always hide all spell glows if you are out of combat. Ignores the allow list."
 --L.filtered_spells = "Filtered Spells"
 --L.filtered_spells_desc = "Input spell names or spell IDs to prevent button glow for those abilities."
 --L.add_filter = "Add Spell to Filter List"
diff --git a/Options.lua b/Options.lua
@@ -21,6 +21,7 @@ LibStub("AceConfigRegistry-3.0"):RegisterOptionsTable(addonName, {
                 hideAll = {
                     order = 2,
                     type = "toggle",
+                    width = 1,
                     name = L.hide_all,
                     desc = L.hide_all_desc,
                     get = function()
@@ -30,9 +31,23 @@ LibStub("AceConfigRegistry-3.0"):RegisterOptionsTable(addonName, {
                         HideButtonGlowDB.hideAll = not HideButtonGlowDB.hideAll
                     end
                 },
-                debugMode = {
+                hideOutOfCombat = {
                     order = 3,
                     type = "toggle",
+                    width = 2,
+                    name = L.hide_out_of_combat,
+                    desc = L.hide_out_of_combat_desc,
+                    get = function()
+                        return HideButtonGlowDB.hideOutOfCombat
+                    end,
+                    set = function()
+                        HideButtonGlowDB.hideOutOfCombat = not HideButtonGlowDB.hideOutOfCombat
+                    end
+                },
+                debugMode = {
+                    order = 4,
+                    type = "toggle",
+                    width = "full",
                     name = L.debug_mode,
                     desc = L.debug_mode_desc,
                     get = function()
@@ -43,23 +58,23 @@ LibStub("AceConfigRegistry-3.0"):RegisterOptionsTable(addonName, {
                     end
                 },
                 hiddenSpellHeader = {
-                    order = 4,
+                    order = 5,
                     type = "header",
                     name = L.filtered_spells,
                     hidden = function()
                         return HideButtonGlowDB.hideAll
                     end
                 },
                 hiddenSpellDescription = {
-                    order = 5,
+                    order = 6,
                     type = "description",
                     name = L.filtered_spells_desc,
                     hidden = function()
                         return HideButtonGlowDB.hideAll
                     end
                 },
                 hiddenSpellAdd = {
-                    order = 6,
+                    order = 7,
                     type = "input",
                     width = "full",
                     name = L.add_filter,
@@ -98,7 +113,7 @@ LibStub("AceConfigRegistry-3.0"):RegisterOptionsTable(addonName, {
                     end
                 },
                 hiddenSpellDelete = {
-                    order = 7,
+                    order = 8,
                     type = "multiselect",
                     width = "full",
                     name = L.delete_filter,
