From 794d8eef84abc728294d9947e83932af5d2e2efa Mon Sep 17 00:00:00 2001 From: NoM0Re Date: Sat, 11 Jan 2025 20:23:49 +0100 Subject: [PATCH] from retail --- WeakAuras/Init.lua | 2 +- WeakAuras/RegionTypes/RegionPrototype.lua | 1 + WeakAuras/WeakAuras.lua | 2 ++ WeakAuras/WeakAuras.toc | 2 +- WeakAurasOptions/BuffTrigger2.lua | 4 ++-- WeakAurasOptions/Locales/enUS.lua | 2 +- WeakAurasOptions/WeakAurasOptions.lua | 12 +++++++----- WeakAurasOptions/WeakAurasOptions.toc | 2 +- 8 files changed, 16 insertions(+), 11 deletions(-) diff --git a/WeakAuras/Init.lua b/WeakAuras/Init.lua index 42ae8e9..af72783 100644 --- a/WeakAuras/Init.lua +++ b/WeakAuras/Init.lua @@ -8,7 +8,7 @@ WeakAuras.halfWidth = WeakAuras.normalWidth / 2 WeakAuras.doubleWidth = WeakAuras.normalWidth * 2 local versionStringFromToc = GetAddOnMetadata("WeakAuras", "Version") -local versionString = "4.1.5" +local versionString = "5.4.0" local buildTime = "20240701180000" local isAwesomeEnabled = C_NamePlate and C_NamePlate.GetNamePlateForUnit or false diff --git a/WeakAuras/RegionTypes/RegionPrototype.lua b/WeakAuras/RegionTypes/RegionPrototype.lua index 2ba84de..af109c5 100644 --- a/WeakAuras/RegionTypes/RegionPrototype.lua +++ b/WeakAuras/RegionTypes/RegionPrototype.lua @@ -383,6 +383,7 @@ end local function FrameTick(self) Private.StartProfileAura(self.id) + self.values.lastCustomTextUpdate = nil self.subRegionEvents:Notify("FrameTick") Private.StopProfileAura(self.id) end diff --git a/WeakAuras/WeakAuras.lua b/WeakAuras/WeakAuras.lua index 0135e57..73f25ed 100644 --- a/WeakAuras/WeakAuras.lua +++ b/WeakAuras/WeakAuras.lua @@ -3942,6 +3942,8 @@ local function startStopTimers(id, cloneId, triggernum, state) end local function ApplyStateToRegion(id, cloneId, region, parent) + -- Force custom text function to be run again + region.values.lastCustomTextUpdate = nil region:Update(); region.subRegionEvents:Notify("Update", region.state, region.states) diff --git a/WeakAuras/WeakAuras.toc b/WeakAuras/WeakAuras.toc index 7ae40e3..5f0602f 100644 --- a/WeakAuras/WeakAuras.toc +++ b/WeakAuras/WeakAuras.toc @@ -1,7 +1,7 @@ ## Interface: 30300 ## Title: WeakAuras ## Author: The WeakAuras Team -## Version: 4.1.5 +## Version: 5.4.0 ## Notes: A powerful, comprehensive utility for displaying graphics and information based on buffs, debuffs, and other triggers. ## Notes-esES: Potente y completa aplicación que te permitirá mostrar por pantalla múltiples diseños, basados en beneficios, perjuicios y otros activadores. ## Notes-deDE: Ein leistungsfähiges, umfassendes Addon zur grafischen Darstellung von Informationen von Auren, Cooldowns, Timern und vielem mehr. diff --git a/WeakAurasOptions/BuffTrigger2.lua b/WeakAurasOptions/BuffTrigger2.lua index 949f677..4b130cb 100644 --- a/WeakAurasOptions/BuffTrigger2.lua +++ b/WeakAurasOptions/BuffTrigger2.lua @@ -1152,7 +1152,7 @@ local function GetBuffTriggerOptions(data, triggernum) CreateNameOptions(aura_options, data, trigger, spellOptionsSize, true, false, "spellid", 22, "useExactSpellId", "auraspellids", - L["Spell ID"], L["Enter a Spell ID"], + L["Spell ID"], L["Enter a Spell ID. You can use the addon idTip to determine spell ids."], IsSingleMissing(trigger)) CreateNameOptions(aura_options, data, trigger, ignoreNameOptionSize, @@ -1163,7 +1163,7 @@ local function GetBuffTriggerOptions(data, triggernum) CreateNameOptions(aura_options, data, trigger, ignoreSpellOptionsSize, true, true, "ignorespellid", 42, "useIgnoreExactSpellId", "ignoreAuraSpellids", - L["Ignored Spell ID"], L["Enter a Spell ID"], + L["Ignored Spell ID"], L["Enter a Spell ID. You can use the addon idTip to determine spell ids."], IsSingleMissing(trigger)) OptionsPrivate.commonOptions.AddCommonTriggerOptions(aura_options, data, triggernum, true) diff --git a/WeakAurasOptions/Locales/enUS.lua b/WeakAurasOptions/Locales/enUS.lua index c0ad210..88fa6fa 100644 --- a/WeakAurasOptions/Locales/enUS.lua +++ b/WeakAurasOptions/Locales/enUS.lua @@ -212,7 +212,7 @@ If the entered number is a decimal (e.g. 0.5), fraction (e.g. 1/2), or percentag |cFF4444FFFor example:|r |cFF00CC00> 0|r will trigger when any unit of type '%s' is affected -|cFF00CC00= 100%%|r will trigger when ever unit of type '%s' is affected +|cFF00CC00= 100%%|r will trigger when every unit of type '%s' is affected |cFF00CC00!= 2|r will trigger when the number of units of type '%s' affected is not exactly 2 |cFF00CC00<= 0.8|r will trigger when less than 80%% of the units of type '%s' is affected (4 of 5 party members, 8 of 10 or 20 of 25 raid members) |cFF00CC00> 1/2|r will trigger when more than half of the units of type '%s' is affected diff --git a/WeakAurasOptions/WeakAurasOptions.lua b/WeakAurasOptions/WeakAurasOptions.lua index 414e799..c67c5ae 100644 --- a/WeakAurasOptions/WeakAurasOptions.lua +++ b/WeakAurasOptions/WeakAurasOptions.lua @@ -1006,12 +1006,13 @@ function OptionsPrivate.SortDisplayButtons(filter, overrideReset, id) child.frame:Show() child:AcquireThumbnail() frame.buttonsScroll:AddChild(child) + else + if not child.frame:IsShown() then + child.frame:Show() + child:AcquireThumbnail() + end + tinsert(frame.buttonsScroll.children, child) end - if not child.frame:IsShown() then - child.frame:Show() - child:AcquireThumbnail() - end - tinsert(frame.buttonsScroll.children, child) elseif child then child.frame:Hide() if child.ReleaseThumbnail then @@ -1061,6 +1062,7 @@ function OptionsPrivate.SortDisplayButtons(filter, overrideReset, id) child.frame:Show() child:AcquireThumbnail() frame.buttonsScroll:AddChild(child) + buttonsShown[slug] = true end if not child.frame:IsShown() then child.frame:Show() diff --git a/WeakAurasOptions/WeakAurasOptions.toc b/WeakAurasOptions/WeakAurasOptions.toc index a5f0431..89ad494 100644 --- a/WeakAurasOptions/WeakAurasOptions.toc +++ b/WeakAurasOptions/WeakAurasOptions.toc @@ -1,7 +1,7 @@ ## Interface: 30300 ## Title: WeakAuras Options ## Author: The WeakAuras Team -## Version: 4.1.5 +## Version: 5.4.0 ## Notes: Options for WeakAuras ## Notes-esES: Opciones para WeakAuras ## Notes-deDE: Optionen für WeakAuras