From 32a2e8453f70decf297dd3dac3bdc0d02242e1fb Mon Sep 17 00:00:00 2001 From: Flamanis Date: Wed, 27 Sep 2023 15:32:04 -0500 Subject: [PATCH 1/7] Fix support for ElvUI with TotemPlates ElvUI does not force show their nameplates anymore as it can cause blocked actions. So TotemPlates would perma hide any ElvUI nameplate that was attached to a totem until a reload. This forces a call to show when the TotemPlate is removed. --- Modules/TotemPlates.lua | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/Modules/TotemPlates.lua b/Modules/TotemPlates.lua index e5e6ef0..be11830 100644 --- a/Modules/TotemPlates.lua +++ b/Modules/TotemPlates.lua @@ -209,6 +209,10 @@ function TotemPlates:NAME_PLATE_UNIT_REMOVED(unitID) nameplate.gladdyTotemFrame:SetParent(nil) tinsert(self.totemPlateCache, nameplate.gladdyTotemFrame) nameplate.gladdyTotemFrame = nil + --Show ElvUI nameplates when totem frame is removed. + if (TotemPlates.addon == "ElvUI") and nameplate.unitFrame then + nameplate.unitFrame:Show() + end end end @@ -402,7 +406,7 @@ function TotemPlates.OnUpdate(self) else self.selectionHighlight:SetAlpha(0) end - if (TotemPlates.addon == "Plater" or TotemPlates.addon == "Tukui" or TotemPlates.addon == "ElvUI") and self.parent and self.parent.unitFrame then + if (TotemPlates.addon == "Plater" or TotemPlates.addon == "Tukui") and self.parent and self.parent.unitFrame then self.parent.unitFrame:Hide() end end @@ -453,6 +457,10 @@ function TotemPlates:OnUnitEvent(unitID) nameplate.gladdyTotemFrame.totemName:SetText(Gladdy.db.npTotemColors["totem" .. totemDataEntry.id].customText or "") nameplate.gladdyTotemFrame.parent = nameplate nameplate.gladdyTotemFrame:Show() + --Hide ElvUI nameplates once instead of in OnUpdate + if (TotemPlates.addon == "ElvUI") and nameplate.unitFrame then + nameplate.unitFrame:Hide() + end TotemPlates:SetTotemAlpha(nameplate.gladdyTotemFrame, unitID) self:ToggleAddon(nameplate) self.activeTotemNameplates[unitID] = nameplate @@ -462,6 +470,10 @@ function TotemPlates:OnUnitEvent(unitID) nameplate.gladdyTotemFrame:SetParent(nil) tinsert(self.totemPlateCache, nameplate.gladdyTotemFrame) nameplate.gladdyTotemFrame = nil + --Show ElvUI nameplates when totem frame is removed. + if (TotemPlates.addon == "ElvUI") and nameplate.unitFrame then + nameplate.unitFrame:Show() + end end self:ToggleAddon(nameplate) else @@ -789,4 +801,4 @@ function TotemPlates:GetOptions() args = select(2, GetTotemColorDefaultOptions()) }, } -end \ No newline at end of file +end -- 2.39.2 From c122e2405498bf1753aa464f25a1fe789ed07cef Mon Sep 17 00:00:00 2001 From: Sumsebrum Date: Fri, 29 Sep 2023 20:37:54 +0200 Subject: [PATCH 2/7] #81 elvui totemplates fix --- Modules/TotemPlates.lua | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/Modules/TotemPlates.lua b/Modules/TotemPlates.lua index e5e6ef0..1902764 100644 --- a/Modules/TotemPlates.lua +++ b/Modules/TotemPlates.lua @@ -203,13 +203,13 @@ end function TotemPlates:NAME_PLATE_UNIT_REMOVED(unitID) local nameplate = C_NamePlate.GetNamePlateForUnit(unitID) self.activeTotemNameplates[unitID] = nil - --self:ToggleAddon(nameplate, true) if nameplate.gladdyTotemFrame then nameplate.gladdyTotemFrame:Hide() nameplate.gladdyTotemFrame:SetParent(nil) tinsert(self.totemPlateCache, nameplate.gladdyTotemFrame) nameplate.gladdyTotemFrame = nil end + self:ToggleAddon(nameplate, true) end --------------------------------------------------- @@ -373,23 +373,25 @@ function TotemPlates:ToggleAddon(nameplate, show) local addonFrames = { self:GetAddonFrame(nameplate) } if addonFrames and #addonFrames > 0 then if show then - for _,v in ipairs(addonFrames) do - if nameplate.unitFrame and nameplate.unitFrame.UpdateAllElements then + for _, frame in ipairs(addonFrames) do + if frame.UpdateAllElements then Gladdy:Debug("INFO", "TotemPlates:ToggleAddon - NAME_PLATE_UNIT_ADDED - nameplate.unitFrame:UpdateAllElements") - nameplate.unitFrame:UpdateAllElements("NAME_PLATE_UNIT_ADDED") + frame:Show() + frame:UpdateAllElements("NAME_PLATE_UNIT_ADDED") else Gladdy:Debug("INFO", "TotemPlates:ToggleAddon - NAME_PLATE_UNIT_ADDED - Show") - v:Show() + frame:Show() end end else - for _,v in ipairs(addonFrames) do - if nameplate.unitFrame and nameplate.unitFrame.UpdateAllElements then + for _, frame in ipairs(addonFrames) do + if frame.UpdateAllElements then Gladdy:Debug("INFO", "TotemPlates:ToggleAddon - NAME_PLATE_UNIT_REMOVED - nameplate.unitFrame:UpdateAllElements") - nameplate.unitFrame:UpdateAllElements("NAME_PLATE_UNIT_REMOVED") + frame:UpdateAllElements("NAME_PLATE_UNIT_REMOVED") + frame:Hide() else Gladdy:Debug("INFO", "TotemPlates:ToggleAddon - NAME_PLATE_UNIT_REMOVED - Hide") - v:Hide() + frame:Hide() end end end @@ -402,7 +404,7 @@ function TotemPlates.OnUpdate(self) else self.selectionHighlight:SetAlpha(0) end - if (TotemPlates.addon == "Plater" or TotemPlates.addon == "Tukui" or TotemPlates.addon == "ElvUI") and self.parent and self.parent.unitFrame then + if (TotemPlates.addon == "Plater" or TotemPlates.addon == "Tukui") and self.parent and self.parent.unitFrame then self.parent.unitFrame:Hide() end end @@ -454,7 +456,7 @@ function TotemPlates:OnUnitEvent(unitID) nameplate.gladdyTotemFrame.parent = nameplate nameplate.gladdyTotemFrame:Show() TotemPlates:SetTotemAlpha(nameplate.gladdyTotemFrame, unitID) - self:ToggleAddon(nameplate) + self:ToggleAddon(nameplate, false) self.activeTotemNameplates[unitID] = nameplate elseif totemDataEntry and not Gladdy.db.npTotemColors["totem" .. totemDataEntry.id].enabled and Gladdy.db.npTotemsHideDisabledTotems then if nameplate.gladdyTotemFrame then @@ -463,7 +465,7 @@ function TotemPlates:OnUnitEvent(unitID) tinsert(self.totemPlateCache, nameplate.gladdyTotemFrame) nameplate.gladdyTotemFrame = nil end - self:ToggleAddon(nameplate) + self:ToggleAddon(nameplate, false) else self:ToggleAddon(nameplate, true) end -- 2.39.2 From 5f8807a8795aa4e7c3fc9c8ff795d42935226ba4 Mon Sep 17 00:00:00 2001 From: Sumsebrum Date: Fri, 29 Sep 2023 20:42:19 +0200 Subject: [PATCH 3/7] bump version v2.25-Release --- Gladdy.lua | 4 ++-- Gladdy.toc | 2 +- Gladdy_BCC.toc | 2 +- Gladdy_Wrath.toc | 2 +- README.md | 6 +++++- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Gladdy.lua b/Gladdy.lua index 6f87120..3e599b4 100644 --- a/Gladdy.lua +++ b/Gladdy.lua @@ -26,11 +26,11 @@ local LibStub = LibStub --------------------------- -local MAJOR, MINOR = "Gladdy", 12 +local MAJOR, MINOR = "Gladdy", 13 local Gladdy = LibStub:NewLibrary(MAJOR, MINOR) local L Gladdy.version_major_num = 2 -Gladdy.version_minor_num = 0.24 +Gladdy.version_minor_num = 0.25 Gladdy.version_num = Gladdy.version_major_num + Gladdy.version_minor_num Gladdy.version_releaseType = RELEASE_TYPES.release Gladdy.version = PREFIX .. string.format("%.2f", Gladdy.version_num) .. "-" .. Gladdy.version_releaseType diff --git a/Gladdy.toc b/Gladdy.toc index c9067ad..a6c85f6 100644 --- a/Gladdy.toc +++ b/Gladdy.toc @@ -1,5 +1,5 @@ ## Title: Gladdy |cFFFF0000 game client not supported|r -## Version: 2.24-Release +## Version: 2.25-Release ## Notes: The most powerful arena AddOn for WoW Classic TBC/WotLK ## Author: XiconQoo, DnB_Junkee, Knall ## X-Email: contact me on discord Knall#1751 diff --git a/Gladdy_BCC.toc b/Gladdy_BCC.toc index af162a9..82fc2fb 100644 --- a/Gladdy_BCC.toc +++ b/Gladdy_BCC.toc @@ -1,6 +1,6 @@ ## Interface: 20504 ## Title: Gladdy - TBC -## Version: 2.24-Release +## Version: 2.25-Release ## Notes: The most powerful arena AddOn for WoW 2.5.4 ## Author: XiconQoo, DnB_Junkee, Knall ## X-Email: contact me on discord Knall#1751 diff --git a/Gladdy_Wrath.toc b/Gladdy_Wrath.toc index 5720984..6cb51f1 100644 --- a/Gladdy_Wrath.toc +++ b/Gladdy_Wrath.toc @@ -1,6 +1,6 @@ ## Interface: 30402 ## Title: Gladdy - WotLK -## Version: 2.24-Release +## Version: 2.25-Release ## Notes: The most powerful arena AddOn for WoW 3.4.2 ## Author: XiconQoo, DnB_Junkee, Knall ## X-Email: contact me on discord Knall#1751 diff --git a/README.md b/README.md index e765400..d5ea1cb 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ --- -## [v2.24-Release Download Here](https://github.com/XiconQoo/Gladdy-TBC/releases/download/v2.24-Release/Gladdy_Classic_v2.24-Release.zip) +## [v2.25-Release Download Here](https://github.com/XiconQoo/Gladdy-TBC/releases/download/v2.25-Release/Gladdy_Classic_v2.25-Release.zip) ###### Please consider donating if you like my work @@ -61,6 +61,7 @@ The goal is to make Gladdy highly configurable in it's appearance. Everything ca - [dfherr](https://github.com/dfherr) - [miraage](https://github.com/miraage) - [veiz](https://github.com/veiz) +- [Flamanis](https://github.com/Flamanis) Thank you! @@ -80,6 +81,9 @@ Thank you! ### Changes +### v2.25-Release +- fix TotemPlates interfering with ElvUI (thanks [Flamanis](https://github.com/Flamanis)) + ### v2.24-Release - fix for WotLK v30402 (update libs) - update DRList -- 2.39.2 From 535fedab1af279e87555ac1f8d6198f9f4ab536b Mon Sep 17 00:00:00 2001 From: Sumsebrum Date: Sat, 30 Sep 2023 20:44:22 +0200 Subject: [PATCH 4/7] plater fix --- Modules/TotemPlates.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Modules/TotemPlates.lua b/Modules/TotemPlates.lua index 1902764..99fc008 100644 --- a/Modules/TotemPlates.lua +++ b/Modules/TotemPlates.lua @@ -209,7 +209,9 @@ function TotemPlates:NAME_PLATE_UNIT_REMOVED(unitID) tinsert(self.totemPlateCache, nameplate.gladdyTotemFrame) nameplate.gladdyTotemFrame = nil end - self:ToggleAddon(nameplate, true) + if (self.addon ~= "Plater") then + self:ToggleAddon(nameplate, true) + end end --------------------------------------------------- -- 2.39.2 From 7930335294544c4a3137a67ac3c8fb27207564ad Mon Sep 17 00:00:00 2001 From: Sumsebrum Date: Sat, 30 Sep 2023 20:45:57 +0200 Subject: [PATCH 5/7] v2.26 --- Gladdy.lua | 4 ++-- Gladdy.toc | 2 +- Gladdy_BCC.toc | 2 +- Gladdy_Wrath.toc | 2 +- README.md | 5 ++++- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Gladdy.lua b/Gladdy.lua index 3e599b4..f43309e 100644 --- a/Gladdy.lua +++ b/Gladdy.lua @@ -26,11 +26,11 @@ local LibStub = LibStub --------------------------- -local MAJOR, MINOR = "Gladdy", 13 +local MAJOR, MINOR = "Gladdy", 14 local Gladdy = LibStub:NewLibrary(MAJOR, MINOR) local L Gladdy.version_major_num = 2 -Gladdy.version_minor_num = 0.25 +Gladdy.version_minor_num = 0.26 Gladdy.version_num = Gladdy.version_major_num + Gladdy.version_minor_num Gladdy.version_releaseType = RELEASE_TYPES.release Gladdy.version = PREFIX .. string.format("%.2f", Gladdy.version_num) .. "-" .. Gladdy.version_releaseType diff --git a/Gladdy.toc b/Gladdy.toc index a6c85f6..3054ce0 100644 --- a/Gladdy.toc +++ b/Gladdy.toc @@ -1,5 +1,5 @@ ## Title: Gladdy |cFFFF0000 game client not supported|r -## Version: 2.25-Release +## Version: 2.26-Release ## Notes: The most powerful arena AddOn for WoW Classic TBC/WotLK ## Author: XiconQoo, DnB_Junkee, Knall ## X-Email: contact me on discord Knall#1751 diff --git a/Gladdy_BCC.toc b/Gladdy_BCC.toc index 82fc2fb..29f188c 100644 --- a/Gladdy_BCC.toc +++ b/Gladdy_BCC.toc @@ -1,6 +1,6 @@ ## Interface: 20504 ## Title: Gladdy - TBC -## Version: 2.25-Release +## Version: 2.26-Release ## Notes: The most powerful arena AddOn for WoW 2.5.4 ## Author: XiconQoo, DnB_Junkee, Knall ## X-Email: contact me on discord Knall#1751 diff --git a/Gladdy_Wrath.toc b/Gladdy_Wrath.toc index 6cb51f1..2ae048f 100644 --- a/Gladdy_Wrath.toc +++ b/Gladdy_Wrath.toc @@ -1,6 +1,6 @@ ## Interface: 30402 ## Title: Gladdy - WotLK -## Version: 2.25-Release +## Version: 2.26-Release ## Notes: The most powerful arena AddOn for WoW 3.4.2 ## Author: XiconQoo, DnB_Junkee, Knall ## X-Email: contact me on discord Knall#1751 diff --git a/README.md b/README.md index d5ea1cb..d8dd275 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ --- -## [v2.25-Release Download Here](https://github.com/XiconQoo/Gladdy-TBC/releases/download/v2.25-Release/Gladdy_Classic_v2.25-Release.zip) +## [v2.26-Release Download Here](https://github.com/XiconQoo/Gladdy-TBC/releases/download/v2.26-Release/Gladdy_Classic_v2.26-Release.zip) ###### Please consider donating if you like my work @@ -81,6 +81,9 @@ Thank you! ### Changes +### v2.26-Release +- fix TotemPlates interfering with Plater (thanks again [Flamanis](https://github.com/Flamanis)) + ### v2.25-Release - fix TotemPlates interfering with ElvUI (thanks [Flamanis](https://github.com/Flamanis)) -- 2.39.2 From 468cbf24f348a3f1e0fa04aaa0628a9189edafd0 Mon Sep 17 00:00:00 2001 From: Sumsebrum Date: Tue, 3 Oct 2023 19:14:16 +0200 Subject: [PATCH 6/7] #81 NeatPlates fix & version v2.27-Release --- Gladdy.lua | 4 ++-- Gladdy.toc | 2 +- Gladdy_BCC.toc | 2 +- Gladdy_Wrath.toc | 2 +- Modules/TotemPlates.lua | 2 +- README.md | 3 +++ 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Gladdy.lua b/Gladdy.lua index f43309e..e3e57c5 100644 --- a/Gladdy.lua +++ b/Gladdy.lua @@ -26,11 +26,11 @@ local LibStub = LibStub --------------------------- -local MAJOR, MINOR = "Gladdy", 14 +local MAJOR, MINOR = "Gladdy", 15 local Gladdy = LibStub:NewLibrary(MAJOR, MINOR) local L Gladdy.version_major_num = 2 -Gladdy.version_minor_num = 0.26 +Gladdy.version_minor_num = 0.27 Gladdy.version_num = Gladdy.version_major_num + Gladdy.version_minor_num Gladdy.version_releaseType = RELEASE_TYPES.release Gladdy.version = PREFIX .. string.format("%.2f", Gladdy.version_num) .. "-" .. Gladdy.version_releaseType diff --git a/Gladdy.toc b/Gladdy.toc index 3054ce0..4e1646a 100644 --- a/Gladdy.toc +++ b/Gladdy.toc @@ -1,5 +1,5 @@ ## Title: Gladdy |cFFFF0000 game client not supported|r -## Version: 2.26-Release +## Version: 2.27-Release ## Notes: The most powerful arena AddOn for WoW Classic TBC/WotLK ## Author: XiconQoo, DnB_Junkee, Knall ## X-Email: contact me on discord Knall#1751 diff --git a/Gladdy_BCC.toc b/Gladdy_BCC.toc index 29f188c..ccfc980 100644 --- a/Gladdy_BCC.toc +++ b/Gladdy_BCC.toc @@ -1,6 +1,6 @@ ## Interface: 20504 ## Title: Gladdy - TBC -## Version: 2.26-Release +## Version: 2.27-Release ## Notes: The most powerful arena AddOn for WoW 2.5.4 ## Author: XiconQoo, DnB_Junkee, Knall ## X-Email: contact me on discord Knall#1751 diff --git a/Gladdy_Wrath.toc b/Gladdy_Wrath.toc index 2ae048f..a68954a 100644 --- a/Gladdy_Wrath.toc +++ b/Gladdy_Wrath.toc @@ -1,6 +1,6 @@ ## Interface: 30402 ## Title: Gladdy - WotLK -## Version: 2.26-Release +## Version: 2.27-Release ## Notes: The most powerful arena AddOn for WoW 3.4.2 ## Author: XiconQoo, DnB_Junkee, Knall ## X-Email: contact me on discord Knall#1751 diff --git a/Modules/TotemPlates.lua b/Modules/TotemPlates.lua index 99fc008..341bd2c 100644 --- a/Modules/TotemPlates.lua +++ b/Modules/TotemPlates.lua @@ -209,7 +209,7 @@ function TotemPlates:NAME_PLATE_UNIT_REMOVED(unitID) tinsert(self.totemPlateCache, nameplate.gladdyTotemFrame) nameplate.gladdyTotemFrame = nil end - if (self.addon ~= "Plater") then + if (self.addon == "ElvUI") then self:ToggleAddon(nameplate, true) end end diff --git a/README.md b/README.md index d8dd275..9eb35c0 100644 --- a/README.md +++ b/README.md @@ -81,6 +81,9 @@ Thank you! ### Changes +### v2.27-Release +- fix TotemPlates interfering with NeatPlates + ### v2.26-Release - fix TotemPlates interfering with Plater (thanks again [Flamanis](https://github.com/Flamanis)) -- 2.39.2 From 8bd027c61426ff6910e33f82c7a4d6142baeb212 Mon Sep 17 00:00:00 2001 From: Sumsebrum Date: Tue, 3 Oct 2023 19:18:46 +0200 Subject: [PATCH 7/7] v2.27-Release readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9eb35c0..46bc154 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ --- -## [v2.26-Release Download Here](https://github.com/XiconQoo/Gladdy-TBC/releases/download/v2.26-Release/Gladdy_Classic_v2.26-Release.zip) +## [v2.27-Release Download Here](https://github.com/XiconQoo/Gladdy-TBC/releases/download/v2.27-Release/Gladdy_Classic_v2.27-Release.zip) ###### Please consider donating if you like my work -- 2.39.2