From 662e55f3e28c916b4c30da1305450b738f6ce985 Mon Sep 17 00:00:00 2001 From: Merathilis Date: Wed, 27 Dec 2023 13:21:24 +0100 Subject: [PATCH 01/55] Rename Garrison Button to Expansion Button in our Minimap Button Option. --- ElvUI_Options/Core/Maps.lua | 2 +- ElvUI_Options/Locales/deDE.lua | 2 +- ElvUI_Options/Locales/enUS.lua | 2 +- ElvUI_Options/Locales/esMX.lua | 2 +- ElvUI_Options/Locales/frFR.lua | 2 +- ElvUI_Options/Locales/itIT.lua | 2 +- ElvUI_Options/Locales/koKR.lua | 2 +- ElvUI_Options/Locales/ptBR.lua | 2 +- ElvUI_Options/Locales/ruRU.lua | 2 +- ElvUI_Options/Locales/trTR.lua | 2 +- ElvUI_Options/Locales/zhCN.lua | 2 +- ElvUI_Options/Locales/zhTW.lua | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ElvUI_Options/Core/Maps.lua b/ElvUI_Options/Core/Maps.lua index ca8f518423..16c7558b29 100644 --- a/ElvUI_Options/Core/Maps.lua +++ b/ElvUI_Options/Core/Maps.lua @@ -74,7 +74,7 @@ Maps.args.minimap.args.timeTextGroup.args.timeFontOutline = ACH:FontFlags(L["Fon Maps.args.minimap.args.timeTextGroup.inline = true Maps.args.minimap.args.icons = ACH:Group(L["Minimap Buttons"], nil, 50, nil, function(info) return E.db.general.minimap.icons[info[#info - 1]][info[#info]] end, function(info, value) E.db.general.minimap.icons[info[#info - 1]][info[#info]] = value; MM:UpdateSettings() end) -Maps.args.minimap.args.icons.args.classHall = ACH:Group(L["GARRISON_LANDING_PAGE_TITLE"], nil, 1, nil, nil, nil, nil, not E.Retail) +Maps.args.minimap.args.icons.args.classHall = ACH:Group(L["Expansion Button"], nil, 1, nil, nil, nil, nil, not E.Retail) Maps.args.minimap.args.icons.args.classHall.args.hideClassHallReport = ACH:Toggle(L["Hide"], nil, 1, nil, nil, nil, function() return E.private.general.minimap.hideClassHallReport end, function(_, value) E.private.general.minimap.hideClassHallReport = value; MM:UpdateSettings() end) Maps.args.minimap.args.icons.args.classHall.args.spacer = ACH:Spacer(2, 'full') Maps.args.minimap.args.icons.args.classHall.args.position = ACH:Select(L["Position"], nil, 3, buttonPositions, nil, nil, nil, nil, function() return E.private.general.minimap.hideClassHallReport end) diff --git a/ElvUI_Options/Locales/deDE.lua b/ElvUI_Options/Locales/deDE.lua index 6c805ee4d6..ce2a1ddc62 100644 --- a/ElvUI_Options/Locales/deDE.lua +++ b/ElvUI_Options/Locales/deDE.lua @@ -596,6 +596,7 @@ L["Event Log"] = "Eventlog" L["Exclude Name"] = "Ausgeschlossener Name" L["Excluded names will not be class colored."] = "Ausgeschlossene Namen werden nicht in Klassenfarbe erscheinen." L["Excluded Names"] = "Ausgeschlossene Namen" +L["Expansion Button"] = "Erweiterungs Taste" L["Expansion Landing Page"] = "Erweiterungs Startseite" L["Expiring"] = "Auslaufend" L["Export Now"] = "Jetzt exportieren" @@ -674,7 +675,6 @@ L["Full Time"] = "Vollzeit" L["Full"] = "Voll" L["FURY"] = "Jähzorn" L["Gaining Threat"] = "Bedrohung gewinnen" -L["GARRISON_LANDING_PAGE_TITLE"] = "Garnisonsbericht" L["GARRISON_LOCATION_TOOLTIP"] = "Garnison" L["Gems"] = "Edelsteine" L["Gender"] = "Geschlecht" diff --git a/ElvUI_Options/Locales/enUS.lua b/ElvUI_Options/Locales/enUS.lua index c5946ba837..3ca8e561a8 100644 --- a/ElvUI_Options/Locales/enUS.lua +++ b/ElvUI_Options/Locales/enUS.lua @@ -597,6 +597,7 @@ L["Event Log"] = true L["Exclude Name"] = true L["Excluded names will not be class colored."] = true L["Excluded Names"] = true +L["Expansion Button"] = true L["Expansion Landing Page"] = true L["Expiring"] = true L["Export Now"] = true @@ -675,7 +676,6 @@ L["Full Time"] = true L["Full"] = true L["FURY"] = "Fury" L["Gaining Threat"] = true -L["GARRISON_LANDING_PAGE_TITLE"] = "Garrison Report" L["GARRISON_LOCATION_TOOLTIP"] = "Garrison" L["Gems"] = true L["Gender"] = true diff --git a/ElvUI_Options/Locales/esMX.lua b/ElvUI_Options/Locales/esMX.lua index 27cae4f54b..d2d9f82d8c 100644 --- a/ElvUI_Options/Locales/esMX.lua +++ b/ElvUI_Options/Locales/esMX.lua @@ -598,6 +598,7 @@ L["Exclude Name"] = true L["Excluded names will not be class colored."] = true L["Excluded Names"] = true L["Expansion Landing Page"] = true +L["Expansion Landing Page Button"] = "Expansion Button" L["Expiring"] = "Expiración" L["Export Now"] = true L["Export Profile"] = true @@ -675,7 +676,6 @@ L["Full Time"] = true L["Full"] = true L["FURY"] = "Furia" L["Gaining Threat"] = true -L["GARRISON_LANDING_PAGE_TITLE"] = "Parte de la ciudadela" L["GARRISON_LOCATION_TOOLTIP"] = "Ciudadela" L["Gems"] = true L["Gender"] = true diff --git a/ElvUI_Options/Locales/frFR.lua b/ElvUI_Options/Locales/frFR.lua index d580e358e4..803df5f032 100644 --- a/ElvUI_Options/Locales/frFR.lua +++ b/ElvUI_Options/Locales/frFR.lua @@ -597,6 +597,7 @@ L["Event Log"] = "Journal d'evennements" L["Exclude Name"] = "Exclure le nom" L["Excluded names will not be class colored."] = "Exclure les noms sans couleur de classe" L["Excluded Names"] = "Exclure les noms" +L["Expansion Button"] = true L["Expansion Landing Page"] = "Page d'accueil de l'extension" L["Expiring"] = "Expiration" L["Export Now"] = "Exporter maintenant" @@ -675,7 +676,6 @@ L["Full Time"] = "Temps complet" L["Full"] = "Plein" L["FURY"] = "Fureur" L["Gaining Threat"] = "Prise de menace" -L["GARRISON_LANDING_PAGE_TITLE"] = "Rapport du fief" L["GARRISON_LOCATION_TOOLTIP"] = "Fief" L["Gems"] = "Gemmes" L["Gender"] = "Genre" diff --git a/ElvUI_Options/Locales/itIT.lua b/ElvUI_Options/Locales/itIT.lua index 50e19edc0d..b787f6bed7 100644 --- a/ElvUI_Options/Locales/itIT.lua +++ b/ElvUI_Options/Locales/itIT.lua @@ -596,6 +596,7 @@ L["Event Log"] = true L["Exclude Name"] = true L["Excluded names will not be class colored."] = true L["Excluded Names"] = true +L["Expansion Button"] = true L["Expansion Landing Page"] = true L["Expiring"] = true L["Export Now"] = true @@ -674,7 +675,6 @@ L["Full Time"] = true L["Full"] = true L["FURY"] = "Fury" L["Gaining Threat"] = true -L["GARRISON_LANDING_PAGE_TITLE"] = "Garrison Report" L["GARRISON_LOCATION_TOOLTIP"] = "Garrison" L["Gems"] = true L["Gender"] = true diff --git a/ElvUI_Options/Locales/koKR.lua b/ElvUI_Options/Locales/koKR.lua index 5ba4cc54ea..186866a0bc 100644 --- a/ElvUI_Options/Locales/koKR.lua +++ b/ElvUI_Options/Locales/koKR.lua @@ -606,6 +606,7 @@ L["Event Log"] = "이벤트 로그" L["Exclude Name"] = "제외할 이름" L["Excluded names will not be class colored."] = "제외할 이름은 직업 색상으로 표시하지 않습니다." L["Excluded Names"] = "제외된 이름 목록" +L["Expansion Button"] = true L["Expansion Landing Page"] = "확장된 렌딩 페이지" L["Expiring"] = "초읽기 색상" L["Export Now"] = "지금 내보내기" @@ -689,7 +690,6 @@ L["Full Time"] = "총 시간" L["Full"] = "전체" L["FURY"] = "격노" L["Gaining Threat"] = "어그로 획득" -L["GARRISON_LANDING_PAGE_TITLE"] = "주둔지 보고서" L["GARRISON_LOCATION_TOOLTIP"] = "주둔지" L["Gems"] = "보석" L["Gender"] = "성별" diff --git a/ElvUI_Options/Locales/ptBR.lua b/ElvUI_Options/Locales/ptBR.lua index f9d12f7340..babbe76492 100644 --- a/ElvUI_Options/Locales/ptBR.lua +++ b/ElvUI_Options/Locales/ptBR.lua @@ -597,6 +597,7 @@ L["Event Log"] = true L["Exclude Name"] = "Excluir Nome" L["Excluded names will not be class colored."] = "Nomes excluídos não serão coloridos por classe" L["Excluded Names"] = "Nomes Exclúidos" +L["Expansion Button"] = true L["Expansion Landing Page"] = true L["Expiring"] = "Expirando" L["Export Now"] = "Exportar Agora" @@ -675,7 +676,6 @@ L["Full Time"] = true L["Full"] = "Cheio" L["FURY"] = "Fúria" L["Gaining Threat"] = true -L["GARRISON_LANDING_PAGE_TITLE"] = "Relatório da Guarnição" L["GARRISON_LOCATION_TOOLTIP"] = "Guarnição" L["Gems"] = "Gemas" L["Gender"] = true diff --git a/ElvUI_Options/Locales/ruRU.lua b/ElvUI_Options/Locales/ruRU.lua index 4dc5b283c6..5525e8bd23 100644 --- a/ElvUI_Options/Locales/ruRU.lua +++ b/ElvUI_Options/Locales/ruRU.lua @@ -604,6 +604,7 @@ L["Event Log"] = "Журнал событий" L["Exclude Name"] = "Исключить имя" L["Excluded names will not be class colored."] = "Исключенные имена не окрашиваются в цвет класса" L["Excluded Names"] = "Исключенные имена" +L["Expansion Button"] = true L["Expansion Landing Page"] = "Страница дополнения" L["Expiring"] = "Завершение" L["Export Now"] = "Экспортировать" @@ -682,7 +683,6 @@ L["Full Time"] = "Время полностью" L["Full"] = "Полный" L["FURY"] = "Гнев" L["Gaining Threat"] = "Получение угрозы" -L["GARRISON_LANDING_PAGE_TITLE"] = "Отчет из гарнизона" L["GARRISON_LOCATION_TOOLTIP"] = "Гарнизон" L["Gems"] = "Самоцветы" L["Gender"] = "Пол" diff --git a/ElvUI_Options/Locales/trTR.lua b/ElvUI_Options/Locales/trTR.lua index 0f15c21597..803c852991 100644 --- a/ElvUI_Options/Locales/trTR.lua +++ b/ElvUI_Options/Locales/trTR.lua @@ -597,6 +597,7 @@ L["Event Log"] = "Olay gunlugu" L["Exclude Name"] = "Isimleri Haric Tut" L["Excluded names will not be class colored."] = "Haric tutulan isimler sinif renginde olmayacak." L["Excluded Names"] = "Haric Tutulan Isimler" +L["Expansion Button"] = true L["Expansion Landing Page"] = true L["Expiring"] = "Suresi doluyor" L["Export Now"] = "simdi Disa Aktar" @@ -675,7 +676,6 @@ L["Full Time"] = "Tam zamanli" L["Full"] = "Dolu" L["FURY"] = "Fury" L["Gaining Threat"] = "Hiddet Kazanimi" -L["GARRISON_LANDING_PAGE_TITLE"] = "Garnizon Raporu" L["GARRISON_LOCATION_TOOLTIP"] = "Garnizon" L["Gems"] = "Mucevherler" L["Gender"] = "Cinsiyet" diff --git a/ElvUI_Options/Locales/zhCN.lua b/ElvUI_Options/Locales/zhCN.lua index 90c8f27ec7..65201b65fd 100644 --- a/ElvUI_Options/Locales/zhCN.lua +++ b/ElvUI_Options/Locales/zhCN.lua @@ -597,6 +597,7 @@ L["Event Log"] = "事件日志" L["Exclude Name"] = "排除名字" L["Excluded names will not be class colored."] = "排除的名字将不会使用职业颜色" L["Excluded Names"] = "排除的名字" +L["Expansion Button"] = true L["Expansion Landing Page"] = true L["Expiring"] = "即将冷却完毕" L["Export Now"] = "现在导出" @@ -675,7 +676,6 @@ L["Full Time"] = "总共时间" L["Full"] = "满" L["FURY"] = "恶魔之怒" L["Gaining Threat"] = "获得仇恨" -L["GARRISON_LANDING_PAGE_TITLE"] = "要塞报告" L["GARRISON_LOCATION_TOOLTIP"] = "要塞" L["Gems"] = "珠宝" L["Gender"] = "性别" diff --git a/ElvUI_Options/Locales/zhTW.lua b/ElvUI_Options/Locales/zhTW.lua index b0dc17d8c6..1134407cac 100644 --- a/ElvUI_Options/Locales/zhTW.lua +++ b/ElvUI_Options/Locales/zhTW.lua @@ -597,6 +597,7 @@ L["Event Log"] = "事件記錄" L["Exclude Name"] = "排除名字" L["Excluded names will not be class colored."] = "排除的名字將不會使用職業顏色" L["Excluded Names"] = "排除的名字" +L["Expansion Button"] = true L["Expansion Landing Page"] = true L["Expiring"] = "即將冷卻完畢" L["Export Now"] = "現在導出" @@ -675,7 +676,6 @@ L["Full Time"] = "總共時間" L["Full"] = "滿" L["FURY"] = "魔怒" L["Gaining Threat"] = "獲得仇恨" -L["GARRISON_LANDING_PAGE_TITLE"] = "要塞報告" L["GARRISON_LOCATION_TOOLTIP"] = "要塞" L["Gems"] = "寶石" L["Gender"] = "性別" From 706321d9da2d6617427fb06106c462dbe7782e34 Mon Sep 17 00:00:00 2001 From: Simpy Date: Wed, 27 Dec 2023 12:41:42 -0500 Subject: [PATCH 02/55] locale --- ElvUI_Options/Locales/esMX.lua | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ElvUI_Options/Locales/esMX.lua b/ElvUI_Options/Locales/esMX.lua index d2d9f82d8c..ae0d76c4a8 100644 --- a/ElvUI_Options/Locales/esMX.lua +++ b/ElvUI_Options/Locales/esMX.lua @@ -589,16 +589,16 @@ L["ENERGY"] = "Energía" L["Energy/Mana Regen Tick"] = true L["Engineering"] = true L["Enhanced PVP Messages"] = true -L["Equipped Item"] = true -L["Equipped"] = true +L["Equipped Item"] = "Objeto Equipado" +L["Equipped"] = "Equipado" L["Error decoding data. Import string may be corrupted!"] = true L["Error exporting profile!"] = true L["Event Log"] = "Registro de Eventos" -L["Exclude Name"] = true -L["Excluded names will not be class colored."] = true -L["Excluded Names"] = true -L["Expansion Landing Page"] = true -L["Expansion Landing Page Button"] = "Expansion Button" +L["Exclude Name"] = "Excluir Nombre" +L["Excluded names will not be class colored."] = "Los nombres excluidos no se colorearán por clase." +L["Excluded Names"] = "Nombres Excluidos" +L["Expansion Landing Page"] = "Página de Destino de Expansión" +L["Expansion Button"] = "Botón de Expansión" L["Expiring"] = "Expiración" L["Export Now"] = true L["Export Profile"] = true From beae1d8397e69c53b9e1c2a47fac83f986999df0 Mon Sep 17 00:00:00 2001 From: Luckyone Date: Sun, 31 Dec 2023 12:23:21 +0100 Subject: [PATCH 03/55] Handle pvp queue popup --- ElvUI/Classic/Modules/Skins/Misc.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ElvUI/Classic/Modules/Skins/Misc.lua b/ElvUI/Classic/Modules/Skins/Misc.lua index 3600f9e0de..ecc564ac1e 100644 --- a/ElvUI/Classic/Modules/Skins/Misc.lua +++ b/ElvUI/Classic/Modules/Skins/Misc.lua @@ -45,6 +45,11 @@ function S:BlizzardMiscFrames() _G.ReadyCheckFrameText:ClearAllPoints() _G.ReadyCheckFrameText:Point('TOP', 0, -15) + _G.PVPReadyDialog:StripTextures() + _G.PVPReadyDialog:SetTemplate('Transparent') + S:HandleButton(_G.PVPReadyDialogEnterBattleButton) + S:HandleButton(_G.PVPReadyDialogHideButton) + _G.ReadyCheckListenerFrame:SetAlpha(0) ReadyCheckFrame:HookScript('OnShow', FixReadyCheckFrame) From a2c6ae57bfba19790e9418a2f59bb75fe671c57a Mon Sep 17 00:00:00 2001 From: Luckyone Date: Mon, 1 Jan 2024 10:41:13 +0100 Subject: [PATCH 04/55] 2024 --- ElvUI/LICENSE.txt | 2 +- LICENSE.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ElvUI/LICENSE.txt b/ElvUI/LICENSE.txt index bac6a4e942..56c6153c31 100644 --- a/ElvUI/LICENSE.txt +++ b/ElvUI/LICENSE.txt @@ -1,5 +1,5 @@ Custom License for: ElvUI - Copyright ©2009-2023 The contents of this addon, excluding third-party resources, are + Copyright ©2009-2024 The contents of this addon, excluding third-party resources, are copyrighted to their authors with all rights reserved. This addon is free to use and the authors hereby grant you the following rights: diff --git a/LICENSE.md b/LICENSE.md index 59a395107d..4ee3490203 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -3,7 +3,7 @@ **Source**: [https://github.com/tukui-org/ElvUI/tree/development/ElvUI](https://github.com/tukui-org/ElvUI/tree/development/ElvUI) ``` -Copyright © 2009-2023 The contents of this addon, excluding third-party resources, are +Copyright © 2009-2024 The contents of this addon, excluding third-party resources, are copyrighted to their authors with all rights reserved. Reference: github.com/tukui-org/ElvUI/blob/development/ElvUI/LICENSE.txt ``` @@ -13,7 +13,7 @@ Reference: github.com/tukui-org/ElvUI/blob/development/ElvUI/LICENSE.txt **Source**: [https://github.com/tukui-org/ElvUI/tree/development/ElvUI_Options](https://github.com/tukui-org/ElvUI/tree/development/ElvUI_Options) ``` -Copyright © 2009-2023 The contents of this addon, excluding third-party resources, are +Copyright © 2009-2024 The contents of this addon, excluding third-party resources, are copyrighted to their authors with all rights reserved. Reference: github.com/tukui-org/ElvUI/blob/development/ElvUI_Options/LICENSE.txt ``` From 7679ef641bc21ebf9e0f365738e61c0d4a868211 Mon Sep 17 00:00:00 2001 From: Hurstilol <85832226+Hurstilol@users.noreply.github.com> Date: Tue, 2 Jan 2024 11:29:25 +0100 Subject: [PATCH 05/55] FoF added to channelticks (#1145) Adding Fists of Fury to the list of channelticks --- ElvUI/Mainline/Filters/Filters.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ElvUI/Mainline/Filters/Filters.lua b/ElvUI/Mainline/Filters/Filters.lua index 97f2735803..fdc430ed02 100644 --- a/ElvUI/Mainline/Filters/Filters.lua +++ b/ElvUI/Mainline/Filters/Filters.lua @@ -1749,6 +1749,8 @@ G.unitframe.ChannelTicks = { -- Hunter [120360] = 15, -- Barrage [257044] = 7, -- Rapid Fire + -- Monk + [113656] = 5, -- Fists of Fury } -- Spells that chain, second step From aa32f71468d70377a8d96d15ed56f9fec2a5c133 Mon Sep 17 00:00:00 2001 From: levanah0403 <38367898+levanah0403@users.noreply.github.com> Date: Wed, 3 Jan 2024 12:08:45 +0800 Subject: [PATCH 06/55] Update DataTexts.lua (#1144) UpdateHexColors need 4 parameters for E.valueColorUpdateFuncs --- ElvUI/Core/Modules/DataTexts/DataTexts.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI/Core/Modules/DataTexts/DataTexts.lua b/ElvUI/Core/Modules/DataTexts/DataTexts.lua index eb95eefeb7..c77bbb026a 100644 --- a/ElvUI/Core/Modules/DataTexts/DataTexts.lua +++ b/ElvUI/Core/Modules/DataTexts/DataTexts.lua @@ -464,7 +464,7 @@ function DT:ForceUpdate_DataText(name) -- This is suppose to fire separately. end end -function DT:UpdateHexColors(hex, r, g, b) -- This will fire both together. +function DT:UpdateHexColors(_, hex, r, g, b) -- This will fire both together. for dtSlot, dtInfo in pairs(DT.AssignedDatatexts) do if dtInfo.applySettings then dtInfo.applySettings(dtSlot, hex, r, g, b) From 73cacc19fb11c16086ac0da87b837055fd6d8a93 Mon Sep 17 00:00:00 2001 From: Darth Predator Date: Wed, 3 Jan 2024 12:25:17 +0300 Subject: [PATCH 07/55] Prevent raid warnings from having plugin icons on them --- ElvUI/Core/Modules/Chat/Chat.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ElvUI/Core/Modules/Chat/Chat.lua b/ElvUI/Core/Modules/Chat/Chat.lua index 649b72cc07..943a67f52f 100644 --- a/ElvUI/Core/Modules/Chat/Chat.lua +++ b/ElvUI/Core/Modules/Chat/Chat.lua @@ -1832,7 +1832,8 @@ function CH:MessageFormatter(frame, info, chatType, chatGroup, chatTarget, chann end local showLink = 1 - local isMonster = strsub(chatType, 1, 7) == 'MONSTER' + local isRaidBoss = chatType == 'RAID_BOSS_EMOTE' or chatType == 'RAID_BOSS_WHISPER' + local isMonster = strsub(chatType, 1, 7) == 'MONSTER' or isRaidBoss if isMonster or strsub(chatType, 1, 9) == 'RAID_BOSS' then showLink = nil From 65d33cce6b66aa748ee73772bbe364b2590291ca Mon Sep 17 00:00:00 2001 From: Merathilis Date: Wed, 3 Jan 2024 16:25:15 +0100 Subject: [PATCH 08/55] Fix Tank Icons Options on NamePlates --- ElvUI_Options/Core/Nameplates.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI_Options/Core/Nameplates.lua b/ElvUI_Options/Core/Nameplates.lua index c39a6fd6f4..fc56ed7ad0 100644 --- a/ElvUI_Options/Core/Nameplates.lua +++ b/ElvUI_Options/Core/Nameplates.lua @@ -348,7 +348,7 @@ local function GetUnitSettings(unit, name) group.args.general.args.useStaticPosition = ACH:Toggle(L["Use Static Position"], L["When enabled the nameplate will stay visible in a locked position."], 105, nil, nil, nil, nil, nil, function() return not E.db.nameplates.units[unit].enable end) elseif unit == 'FRIENDLY_PLAYER' or unit == 'ENEMY_PLAYER' then group.args.general.args.markHealers = ACH:Toggle(L["Healer Icon"], L["Display a healer icon over known healers inside battlegrounds or arenas."], 105) - group.args.general.args.markHealers = ACH:Toggle(L["Tank Icon"], L["Display a tank icon over known tanks inside battlegrounds or arenas."], 106) + group.args.general.args.markTanks = ACH:Toggle(L["Tank Icon"], L["Display a tank icon over known tanks inside battlegrounds or arenas."], 106) elseif unit == 'ENEMY_NPC' or unit == 'FRIENDLY_NPC' then group.args.eliteIcon = ACH:Group(L["Elite Icon"], nil, 75, nil, function(info) return E.db.nameplates.units[unit].eliteIcon[info[#info]] end, function(info, value) E.db.nameplates.units[unit].eliteIcon[info[#info]] = value NP:ConfigureAll() end) group.args.eliteIcon.args.enable = ACH:Toggle(L["Enable"], nil, 1) From 7e3dfbf100c6c466104d9062281ee52f1d4fbe02 Mon Sep 17 00:00:00 2001 From: Simpy Date: Wed, 3 Jan 2024 15:44:52 -0500 Subject: [PATCH 09/55] Revert "Update DataTexts.lua (#1144)" This reverts commit aa32f71468d70377a8d96d15ed56f9fec2a5c133. --- ElvUI/Core/Modules/DataTexts/DataTexts.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI/Core/Modules/DataTexts/DataTexts.lua b/ElvUI/Core/Modules/DataTexts/DataTexts.lua index c77bbb026a..eb95eefeb7 100644 --- a/ElvUI/Core/Modules/DataTexts/DataTexts.lua +++ b/ElvUI/Core/Modules/DataTexts/DataTexts.lua @@ -464,7 +464,7 @@ function DT:ForceUpdate_DataText(name) -- This is suppose to fire separately. end end -function DT:UpdateHexColors(_, hex, r, g, b) -- This will fire both together. +function DT:UpdateHexColors(hex, r, g, b) -- This will fire both together. for dtSlot, dtInfo in pairs(DT.AssignedDatatexts) do if dtInfo.applySettings then dtInfo.applySettings(dtSlot, hex, r, g, b) From 5579a42e342547e0f20e303e62511add994e71f6 Mon Sep 17 00:00:00 2001 From: Simpy Date: Wed, 3 Jan 2024 15:56:23 -0500 Subject: [PATCH 10/55] do 73cacc19fb like this --- ElvUI/Core/Modules/Chat/Chat.lua | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ElvUI/Core/Modules/Chat/Chat.lua b/ElvUI/Core/Modules/Chat/Chat.lua index 943a67f52f..3bccc6d7a5 100644 --- a/ElvUI/Core/Modules/Chat/Chat.lua +++ b/ElvUI/Core/Modules/Chat/Chat.lua @@ -1832,9 +1832,8 @@ function CH:MessageFormatter(frame, info, chatType, chatGroup, chatTarget, chann end local showLink = 1 - local isRaidBoss = chatType == 'RAID_BOSS_EMOTE' or chatType == 'RAID_BOSS_WHISPER' - local isMonster = strsub(chatType, 1, 7) == 'MONSTER' or isRaidBoss - if isMonster or strsub(chatType, 1, 9) == 'RAID_BOSS' then + local bossMonster = strsub(chatType, 1, 7) == 'MONSTER' or strsub(chatType, 1, 9) == 'RAID_BOSS' + if bossMonster then showLink = nil -- fix blizzard formatting errors from localization strings @@ -1905,7 +1904,7 @@ function CH:MessageFormatter(frame, info, chatType, chatGroup, chatTarget, chann -- Player Flags local pflag = GetPFlag(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16, arg17) - if not isMonster then + if not bossMonster then local chatIcon, pluginChatIcon = specialChatIcons[arg12] or specialChatIcons[playerName], CH:GetPluginIcon(arg12, playerName) if type(chatIcon) == 'function' then local icon, prettify, var1, var2, var3 = chatIcon() From c4b722319e3e54596153c8426242a8f3bb1065b3 Mon Sep 17 00:00:00 2001 From: Simpy Date: Wed, 3 Jan 2024 15:57:22 -0500 Subject: [PATCH 11/55] boss first --- ElvUI/Core/Modules/Chat/Chat.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI/Core/Modules/Chat/Chat.lua b/ElvUI/Core/Modules/Chat/Chat.lua index 3bccc6d7a5..adceafa12d 100644 --- a/ElvUI/Core/Modules/Chat/Chat.lua +++ b/ElvUI/Core/Modules/Chat/Chat.lua @@ -1832,7 +1832,7 @@ function CH:MessageFormatter(frame, info, chatType, chatGroup, chatTarget, chann end local showLink = 1 - local bossMonster = strsub(chatType, 1, 7) == 'MONSTER' or strsub(chatType, 1, 9) == 'RAID_BOSS' + local bossMonster = strsub(chatType, 1, 9) == 'RAID_BOSS' or strsub(chatType, 1, 7) == 'MONSTER' if bossMonster then showLink = nil From 45df2da89908670803a0297be999ca09b1912566 Mon Sep 17 00:00:00 2001 From: Simpy Date: Wed, 3 Jan 2024 16:14:59 -0500 Subject: [PATCH 12/55] closes #1140 --- ElvUI/Mainline/Modules/DataTexts/Crests.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI/Mainline/Modules/DataTexts/Crests.lua b/ElvUI/Mainline/Modules/DataTexts/Crests.lua index dff0b6ff76..d28ae949e4 100644 --- a/ElvUI/Mainline/Modules/DataTexts/Crests.lua +++ b/ElvUI/Mainline/Modules/DataTexts/Crests.lua @@ -40,7 +40,7 @@ local function GetCrestIcon(info) end local function GetCrestText(crest, info) - return format(crestText, crest.color, info.totalEarned, info.maxQuantity) + return format(crestText, crest.color, (crest.id == 2245 and info.quantity) or info.totalEarned, info.maxQuantity) end local function OnEvent(self) From 926bbac0f5c10b6e49efe53c42b6c5806d85ee8f Mon Sep 17 00:00:00 2001 From: Simpy Date: Wed, 3 Jan 2024 16:44:10 -0500 Subject: [PATCH 13/55] closes #1129 --- ElvUI/Core/Modules/Misc/RaidUtility.lua | 35 ++++++++++++++++++------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/ElvUI/Core/Modules/Misc/RaidUtility.lua b/ElvUI/Core/Modules/Misc/RaidUtility.lua index 31aa1b149b..12141b992c 100644 --- a/ElvUI/Core/Modules/Misc/RaidUtility.lua +++ b/ElvUI/Core/Modules/Misc/RaidUtility.lua @@ -14,7 +14,7 @@ local GameTooltip_Hide = GameTooltip_Hide local GetInstanceInfo = GetInstanceInfo local GetNumGroupMembers = GetNumGroupMembers local GetRaidRosterInfo = GetRaidRosterInfo -local GetTexCoordsForRole = GetTexCoordsForRole +local GetTexCoordsByGrid = GetTexCoordsByGrid local InCombatLockdown = InCombatLockdown local InitiateRolePoll = InitiateRolePoll local SecureHandlerSetFrameRef = SecureHandlerSetFrameRef @@ -39,7 +39,20 @@ local BUTTON_HEIGHT = 20 -- GLOBALS: C_PartyInfo -local roles = { 'TANK', 'HEALER', 'DAMAGER' } +local roles = { + { role = 'TANK' }, + { role = 'HEALER' }, + { role = 'DAMAGER' } +} + +local function SetGrabCoords(data, xOffset, yOffset) + data.texA, data.texB, data.texC, data.texD = GetTexCoordsByGrid(xOffset, yOffset, 256, 256, 67, 67) +end + +SetGrabCoords(roles[1], 1, 2) +SetGrabCoords(roles[2], 2, 1) +SetGrabCoords(roles[3], 2, 2) + local ShowButton = CreateFrame('Button', 'RaidUtility_ShowButton', E.UIParent, 'UIMenuButtonStretchTemplate, SecureHandlerClickTemplate') ShowButton:SetMovable(true) ShowButton:SetClampedToScreen(true) @@ -419,19 +432,21 @@ function RU:Initialize() RoleIcons:SetScript('OnEvent', RU.OnEvent_RoleIcons) RoleIcons.icons = {} - for i, role in next, roles do - local frame = CreateFrame('Frame', '$parent_'..role, RoleIcons) + for i, data in next, roles do + local frame = CreateFrame('Frame', '$parent_'..data.role, RoleIcons) + if i == 1 then frame:Point('TOP', 0, -5) else - frame:Point('TOP', _G['RaidUtilityRoleIcons_'..roles[i-1]], 'BOTTOM', 0, -8) + local previous = roles[i-1] + if previous and previous.role then + frame:Point('TOP', _G['RaidUtilityRoleIcons_'..previous.role], 'BOTTOM', 0, -8) + end end local texture = frame:CreateTexture(nil, 'OVERLAY') texture:SetTexture(E.Media.Textures.RoleIcons) -- 337499 - - local texA, texB, texC, texD = GetTexCoordsForRole(role) - texture:SetTexCoord(texA, texB, texC, texD) + texture:SetTexCoord(data.texA, data.texB, data.texC, data.texD) texture:Point('TOPLEFT', frame, 'TOPLEFT', -2, 2) texture:Point('BOTTOMRIGHT', frame, 'BOTTOMRIGHT', 2, -2) frame.texture = texture @@ -441,12 +456,12 @@ function RU:Initialize() Count:SetText(0) frame.count = Count - frame.role = role + frame.role = data.role frame:SetScript('OnEnter', RU.OnEnter_Role) frame:SetScript('OnLeave', GameTooltip_Hide) frame:Size(28) - RoleIcons.icons[role] = frame + RoleIcons.icons[data.role] = frame end end From 2a6833f06ad6ab1019ae53f3e46f3c53e0112122 Mon Sep 17 00:00:00 2001 From: fxpw <84588274+fxpw@users.noreply.github.com> Date: Thu, 4 Jan 2024 01:01:15 +0300 Subject: [PATCH 14/55] Update Minimap.lua, icons on frame (#1125) --- ElvUI/Core/Modules/Maps/Minimap.lua | 128 ++++++++++++++++++++++------ 1 file changed, 102 insertions(+), 26 deletions(-) diff --git a/ElvUI/Core/Modules/Maps/Minimap.lua b/ElvUI/Core/Modules/Maps/Minimap.lua index 031c6c1430..b57036c160 100644 --- a/ElvUI/Core/Modules/Maps/Minimap.lua +++ b/ElvUI/Core/Modules/Maps/Minimap.lua @@ -39,40 +39,97 @@ local IndicatorLayout -- GLOBALS: GetMinimapShape --Create the minimap micro menu -local menuFrame = CreateFrame('Frame', 'MinimapRightClickMenu', E.UIParent) +local menuFrame = CreateFrame('Frame', 'MinimapRightClickMenu', E.UIParent, "UIDropDownMenuTemplate") local menuList = { - { text = _G.CHARACTER_BUTTON, func = function() _G.ToggleCharacter('PaperDollFrame') end }, - { text = _G.SPELLBOOK_ABILITIES_BUTTON, func = function() ToggleFrame(_G.SpellBookFrame) end }, - { text = _G.TIMEMANAGER_TITLE, func = function() ToggleFrame(_G.TimeManagerFrame) end }, - { text = _G.CHAT_CHANNELS, func = _G.ToggleChannelFrame }, - { text = _G.SOCIAL_BUTTON, func = _G.ToggleFriendsFrame }, - { text = _G.TALENTS_BUTTON, func = _G.ToggleTalentFrame }, - { text = _G.GUILD, func = function() if E.Retail then _G.ToggleGuildFrame() else _G.ToggleFriendsFrame(3) end end }, + { + notCheckable = 1, + text = _G.CHARACTER_BUTTON, + icon = [[Interface\AddOns\ElvUI\Core\Media\Textures\Backpack]], + func = function() + _G.ToggleCharacter( + 'PaperDollFrame') + end + }, + { + notCheckable = 1, + icon = [[Interface\AddOns\ElvUI\Core\Media\Textures\Planks]], + text = _G.SPELLBOOK_ABILITIES_BUTTON, + func = function() + ToggleFrame(_G.SpellBookFrame) + end + }, + { + notCheckable = 1, + text = _G.TIMEMANAGER_TITLE, + func = function() + ToggleFrame(_G + .TimeManagerFrame) + end + }, + { notCheckable = 1, text = _G.CHAT_CHANNELS, func = _G.ToggleChannelFrame }, + { notCheckable = 1, text = _G.SOCIAL_BUTTON, func = _G.ToggleFriendsFrame }, + { notCheckable = 1, text = _G.TALENTS_BUTTON, func = _G.ToggleTalentFrame, icon = [[Interface\AddOns\ElvUI\Core\Media\Textures\Scroll]], }, + { + notCheckable = 1, + text = _G.GUILD, + func = function() + if E.Retail then + _G.ToggleGuildFrame() + else + _G.ToggleFriendsFrame(3) + end + end + }, } if E.Wrath and E.mylevel >= _G.SHOW_PVP_LEVEL then - tinsert(menuList, { text = _G.PLAYER_V_PLAYER, func = _G.TogglePVPFrame }) + tinsert(menuList, { notCheckable = 1, text = _G.PLAYER_V_PLAYER, func = _G.TogglePVPFrame }) end if E.Retail or E.Wrath then - tinsert(menuList, { text = _G.COLLECTIONS, func = _G.ToggleCollectionsJournal }) - tinsert(menuList, { text = _G.ACHIEVEMENT_BUTTON, func = _G.ToggleAchievementFrame }) - tinsert(menuList, { text = _G.LFG_TITLE, func = E.Retail and _G.ToggleLFDParentFrame or _G.PVEFrame_ToggleFrame }) - tinsert(menuList, { text = L["Calendar"], func = function() _G.GameTimeFrame:Click() end }) + tinsert(menuList, + { + notCheckable = 1, + text = _G.COLLECTIONS, + func = _G.ToggleCollectionsJournal, + icon = + [[Interface\AddOns\ElvUI\Core\Media\Textures\GoldCoins]] + }) + tinsert(menuList, { notCheckable = 1, text = _G.ACHIEVEMENT_BUTTON, func = _G.ToggleAchievementFrame }) + tinsert(menuList, + { notCheckable = 1, text = _G.LFG_TITLE, func = E.Retail and _G.ToggleLFDParentFrame or _G.PVEFrame_ToggleFrame }) + tinsert(menuList, { notCheckable = 1, text = L["Calendar"], func = function() _G.GameTimeFrame:Click() end }) end if E.Retail then - tinsert(menuList, { text = _G.BLIZZARD_STORE, func = function() _G.StoreMicroButton:Click() end }) - tinsert(menuList, { text = _G.GARRISON_TYPE_8_0_LANDING_PAGE_TITLE, func = function() _G.ExpansionLandingPageMinimapButton:ToggleLandingPage() end}) - tinsert(menuList, { text = _G.ENCOUNTER_JOURNAL, func = function() if not IsAddOnLoaded('Blizzard_EncounterJournal') then UIParentLoadAddOn('Blizzard_EncounterJournal') end ToggleFrame(_G.EncounterJournal) end }) + tinsert(menuList, { notCheckable = 1, text = _G.BLIZZARD_STORE, func = function() _G.StoreMicroButton:Click() end }) + tinsert(menuList, + { + notCheckable = 1, + text = _G.GARRISON_TYPE_8_0_LANDING_PAGE_TITLE, + func = function() + _G + .ExpansionLandingPageMinimapButton:ToggleLandingPage() + end + }) + tinsert(menuList, + { + notCheckable = 1, + text = _G.ENCOUNTER_JOURNAL, + func = function() + if not IsAddOnLoaded('Blizzard_EncounterJournal') then UIParentLoadAddOn('Blizzard_EncounterJournal') end + ToggleFrame(_G.EncounterJournal) + end + }) else - tinsert(menuList, { text = _G.QUEST_LOG, func = function() ToggleFrame(_G.QuestLogFrame) end}) + tinsert(menuList, { notCheckable = 1, text = _G.QUEST_LOG, func = function() ToggleFrame(_G.QuestLogFrame) end }) end sort(menuList, function(a, b) if a and b and a.text and b.text then return a.text < b.text end end) -- want these two on the bottom -tinsert(menuList, { text = _G.MAINMENU_BUTTON, +tinsert(menuList, { + text = _G.MAINMENU_BUTTON, func = function() if not _G.GameMenuFrame:IsShown() then if not E.Retail then @@ -133,7 +190,8 @@ function M:HandleExpansionButton() end function M:HandleTrackingButton() - local tracking = MinimapCluster.Tracking and MinimapCluster.Tracking.Button or _G.MiniMapTrackingFrame or _G.MiniMapTracking + local tracking = MinimapCluster.Tracking and MinimapCluster.Tracking.Button or _G.MiniMapTrackingFrame or + _G.MiniMapTracking if not tracking then return end if E.private.general.minimap.hideTracking then @@ -224,7 +282,12 @@ function M:Minimap_OnMouseDown(btn) local position = M.MapHolder.mover:GetPoint() if btn == 'MiddleButton' or (btn == 'RightButton' and IsShiftKeyDown()) then if not E:AlertCombat() then - E:DropDown(menuList, menuFrame, 155, nil, nil, position:match('LEFT') and 0 or -160, 0) + if position:match("LEFT") then + EasyMenu(menuList, menuFrame, "cursor", 0, 0, "MENU", 2) + else + EasyMenu(menuList, menuFrame, "cursor", -160, 0, "MENU", 2) + end + -- E:DropDown(menuList, menuFrame, 155, nil, nil, position:match('LEFT') and 0 or -160, 0) end elseif btn == 'RightButton' and M.TrackingDropdown then _G.ToggleDropDownMenu(1, nil, M.TrackingDropdown, 'cursor') @@ -324,7 +387,8 @@ function M:GetIconSettings(button) local defaults = P.general.minimap.icons[button] local profile = E.db.general.minimap.icons[button] - return profile.scale or defaults.scale, profile.position or defaults.position, profile.xOffset or defaults.xOffset, profile.yOffset or defaults.yOffset + return profile.scale or defaults.scale, profile.position or defaults.position, profile.xOffset or defaults.xOffset, + profile.yOffset or defaults.yOffset end function M:UpdateSettings() @@ -367,7 +431,7 @@ function M:UpdateSettings() local mmOffset = E.PixelMode and 1 or 3 local mmScale = E.db.general.minimap.scale Minimap:ClearAllPoints() - Minimap:Point('TOPRIGHT', holder, -mmOffset/mmScale, -mmOffset/mmScale) + Minimap:Point('TOPRIGHT', holder, -mmOffset / mmScale, -mmOffset / mmScale) Minimap:Size(E.MinimapSize) local mWidth, mHeight = Minimap:GetSize() @@ -376,7 +440,8 @@ function M:UpdateSettings() local HEIGHT, WIDTH = (mHeight * mmScale) + (panelSize - joinPanel), mWidth * mmScale holder:SetSize(WIDTH + bWidth, HEIGHT + bHeight) - local locationFont, locaitonSize, locationOutline = LSM:Fetch('font', E.db.general.minimap.locationFont), E.db.general.minimap.locationFontSize, E.db.general.minimap.locationFontOutline + local locationFont, locaitonSize, locationOutline = LSM:Fetch('font', E.db.general.minimap.locationFont), + E.db.general.minimap.locationFontSize, E.db.general.minimap.locationFontOutline if Minimap.location then Minimap.location:Width(E.MinimapSize) Minimap.location:FontTemplate(locationFont, locaitonSize, locationOutline) @@ -398,7 +463,8 @@ function M:UpdateSettings() M.ClusterBackdrop:SetShown(E.db.general.minimap.clusterBackdrop and not noCluster) _G.MinimapZoneText:FontTemplate(locationFont, locaitonSize, locationOutline) - _G.TimeManagerClockTicker:FontTemplate(LSM:Fetch('font', E.db.general.minimap.timeFont), E.db.general.minimap.timeFontSize, E.db.general.minimap.timeFontOutline) + _G.TimeManagerClockTicker:FontTemplate(LSM:Fetch('font', E.db.general.minimap.timeFont), + E.db.general.minimap.timeFontSize, E.db.general.minimap.timeFontOutline) if noCluster then MinimapCluster.ZoneTextButton:Kill() @@ -603,8 +669,18 @@ function M:Initialize() Minimap:SetScript('OnMouseDown', M.Minimap_OnMouseDown) Minimap:SetScript('OnMouseUp', E.noop) - Minimap:HookScript('OnEnter', function(mm) if E.db.general.minimap.locationText == 'MOUSEOVER' and (not E.Retail or E.db.general.minimap.clusterDisable) then mm.location:Show() end end) - Minimap:HookScript('OnLeave', function(mm) if E.db.general.minimap.locationText == 'MOUSEOVER' and (not E.Retail or E.db.general.minimap.clusterDisable) then mm.location:Hide() end end) + Minimap:HookScript('OnEnter', + function(mm) + if E.db.general.minimap.locationText == 'MOUSEOVER' and (not E.Retail or E.db.general.minimap.clusterDisable) then + mm.location:Show() + end + end) + Minimap:HookScript('OnLeave', + function(mm) + if E.db.general.minimap.locationText == 'MOUSEOVER' and (not E.Retail or E.db.general.minimap.clusterDisable) then + mm.location:Hide() + end + end) Minimap.location = Minimap:CreateFontString(nil, 'OVERLAY') Minimap.location:Point('TOP', Minimap, 0, -2) From f6c84d6e762edff489dab2f59e0184370116b6b5 Mon Sep 17 00:00:00 2001 From: Simpy Date: Wed, 3 Jan 2024 17:01:52 -0500 Subject: [PATCH 15/55] fix formatting and dont send info to the functions --- ElvUI/Core/Modules/Maps/Minimap.lua | 127 ++++++---------------------- 1 file changed, 26 insertions(+), 101 deletions(-) diff --git a/ElvUI/Core/Modules/Maps/Minimap.lua b/ElvUI/Core/Modules/Maps/Minimap.lua index b57036c160..cdbba588ef 100644 --- a/ElvUI/Core/Modules/Maps/Minimap.lua +++ b/ElvUI/Core/Modules/Maps/Minimap.lua @@ -23,6 +23,7 @@ local ShowUIPanel = ShowUIPanel local ToggleFrame = ToggleFrame local UIParent = UIParent local UIParentLoadAddOn = UIParentLoadAddOn +local EasyMenu = EasyMenu local MainMenuMicroButton = MainMenuMicroButton local MainMenuMicroButton_SetNormal = MainMenuMicroButton_SetNormal @@ -39,88 +40,32 @@ local IndicatorLayout -- GLOBALS: GetMinimapShape --Create the minimap micro menu -local menuFrame = CreateFrame('Frame', 'MinimapRightClickMenu', E.UIParent, "UIDropDownMenuTemplate") +local menuFrame = CreateFrame('Frame', 'MinimapRightClickMenu', E.UIParent, 'UIDropDownMenuTemplate') local menuList = { - { - notCheckable = 1, - text = _G.CHARACTER_BUTTON, - icon = [[Interface\AddOns\ElvUI\Core\Media\Textures\Backpack]], - func = function() - _G.ToggleCharacter( - 'PaperDollFrame') - end - }, - { - notCheckable = 1, - icon = [[Interface\AddOns\ElvUI\Core\Media\Textures\Planks]], - text = _G.SPELLBOOK_ABILITIES_BUTTON, - func = function() - ToggleFrame(_G.SpellBookFrame) - end - }, - { - notCheckable = 1, - text = _G.TIMEMANAGER_TITLE, - func = function() - ToggleFrame(_G - .TimeManagerFrame) - end - }, - { notCheckable = 1, text = _G.CHAT_CHANNELS, func = _G.ToggleChannelFrame }, - { notCheckable = 1, text = _G.SOCIAL_BUTTON, func = _G.ToggleFriendsFrame }, - { notCheckable = 1, text = _G.TALENTS_BUTTON, func = _G.ToggleTalentFrame, icon = [[Interface\AddOns\ElvUI\Core\Media\Textures\Scroll]], }, - { - notCheckable = 1, - text = _G.GUILD, - func = function() - if E.Retail then - _G.ToggleGuildFrame() - else - _G.ToggleFriendsFrame(3) - end - end - }, + { notCheckable = 1, text = _G.CHARACTER_BUTTON, func = function() _G.ToggleCharacter('PaperDollFrame') end, icon = [[Interface\AddOns\ElvUI\Core\Media\Textures\Backpack]] }, + { notCheckable = 1, text = _G.SPELLBOOK_ABILITIES_BUTTON, func = function() ToggleFrame(_G.SpellBookFrame) end, icon = [[Interface\AddOns\ElvUI\Core\Media\Textures\Planks]] }, + { notCheckable = 1, text = _G.TIMEMANAGER_TITLE, func = function() ToggleFrame(_G.TimeManagerFrame) end }, + { notCheckable = 1, text = _G.CHAT_CHANNELS, func = function() _G.ToggleChannelFrame() end }, + { notCheckable = 1, text = _G.SOCIAL_BUTTON, func = function() _G.ToggleFriendsFrame() end }, + { notCheckable = 1, text = _G.TALENTS_BUTTON, func = function() _G.ToggleTalentFrame() end, icon = [[Interface\AddOns\ElvUI\Core\Media\Textures\Scroll]], }, + { notCheckable = 1, text = _G.GUILD, func = function() if E.Retail then _G.ToggleGuildFrame() else _G.ToggleFriendsFrame(3) end end }, } if E.Wrath and E.mylevel >= _G.SHOW_PVP_LEVEL then - tinsert(menuList, { notCheckable = 1, text = _G.PLAYER_V_PLAYER, func = _G.TogglePVPFrame }) + tinsert(menuList, { notCheckable = 1, text = _G.PLAYER_V_PLAYER, func = function() _G.TogglePVPFrame() end }) end if E.Retail or E.Wrath then - tinsert(menuList, - { - notCheckable = 1, - text = _G.COLLECTIONS, - func = _G.ToggleCollectionsJournal, - icon = - [[Interface\AddOns\ElvUI\Core\Media\Textures\GoldCoins]] - }) - tinsert(menuList, { notCheckable = 1, text = _G.ACHIEVEMENT_BUTTON, func = _G.ToggleAchievementFrame }) - tinsert(menuList, - { notCheckable = 1, text = _G.LFG_TITLE, func = E.Retail and _G.ToggleLFDParentFrame or _G.PVEFrame_ToggleFrame }) + tinsert(menuList, { notCheckable = 1, text = _G.COLLECTIONS, func = function() _G.ToggleCollectionsJournal() end, icon = [[Interface\AddOns\ElvUI\Core\Media\Textures\GoldCoins]] }) + tinsert(menuList, { notCheckable = 1, text = _G.ACHIEVEMENT_BUTTON, func = function() _G.ToggleAchievementFrame() end }) + tinsert(menuList, { notCheckable = 1, text = _G.LFG_TITLE, func = function() if E.Retail then _G.ToggleLFDParentFrame() else _G.PVEFrame_ToggleFrame() end end }) tinsert(menuList, { notCheckable = 1, text = L["Calendar"], func = function() _G.GameTimeFrame:Click() end }) end if E.Retail then tinsert(menuList, { notCheckable = 1, text = _G.BLIZZARD_STORE, func = function() _G.StoreMicroButton:Click() end }) - tinsert(menuList, - { - notCheckable = 1, - text = _G.GARRISON_TYPE_8_0_LANDING_PAGE_TITLE, - func = function() - _G - .ExpansionLandingPageMinimapButton:ToggleLandingPage() - end - }) - tinsert(menuList, - { - notCheckable = 1, - text = _G.ENCOUNTER_JOURNAL, - func = function() - if not IsAddOnLoaded('Blizzard_EncounterJournal') then UIParentLoadAddOn('Blizzard_EncounterJournal') end - ToggleFrame(_G.EncounterJournal) - end - }) + tinsert(menuList, { notCheckable = 1, text = _G.GARRISON_TYPE_8_0_LANDING_PAGE_TITLE, func = function() _G.ExpansionLandingPageMinimapButton:ToggleLandingPage() end }) + tinsert(menuList, { notCheckable = 1, text = _G.ENCOUNTER_JOURNAL, func = function() if not IsAddOnLoaded('Blizzard_EncounterJournal') then UIParentLoadAddOn('Blizzard_EncounterJournal') end ToggleFrame(_G.EncounterJournal) end }) else tinsert(menuList, { notCheckable = 1, text = _G.QUEST_LOG, func = function() ToggleFrame(_G.QuestLogFrame) end }) end @@ -128,8 +73,7 @@ end sort(menuList, function(a, b) if a and b and a.text and b.text then return a.text < b.text end end) -- want these two on the bottom -tinsert(menuList, { - text = _G.MAINMENU_BUTTON, +tinsert(menuList, { text = _G.MAINMENU_BUTTON, func = function() if not _G.GameMenuFrame:IsShown() then if not E.Retail then @@ -159,7 +103,7 @@ tinsert(menuList, { end }) -tinsert(menuList, { text = _G.HELP_BUTTON, bottom = true, func = _G.ToggleHelpFrame }) +tinsert(menuList, { text = _G.HELP_BUTTON, bottom = true, func = function() _G.ToggleHelpFrame() end }) for _, menu in ipairs(menuList) do menu.notCheckable = true @@ -190,8 +134,7 @@ function M:HandleExpansionButton() end function M:HandleTrackingButton() - local tracking = MinimapCluster.Tracking and MinimapCluster.Tracking.Button or _G.MiniMapTrackingFrame or - _G.MiniMapTracking + local tracking = MinimapCluster.Tracking and MinimapCluster.Tracking.Button or _G.MiniMapTrackingFrame or _G.MiniMapTracking if not tracking then return end if E.private.general.minimap.hideTracking then @@ -282,12 +225,7 @@ function M:Minimap_OnMouseDown(btn) local position = M.MapHolder.mover:GetPoint() if btn == 'MiddleButton' or (btn == 'RightButton' and IsShiftKeyDown()) then if not E:AlertCombat() then - if position:match("LEFT") then - EasyMenu(menuList, menuFrame, "cursor", 0, 0, "MENU", 2) - else - EasyMenu(menuList, menuFrame, "cursor", -160, 0, "MENU", 2) - end - -- E:DropDown(menuList, menuFrame, 155, nil, nil, position:match('LEFT') and 0 or -160, 0) + EasyMenu(menuList, menuFrame, 'cursor', position:match('LEFT') and 0 or -160, 0, 'MENU') end elseif btn == 'RightButton' and M.TrackingDropdown then _G.ToggleDropDownMenu(1, nil, M.TrackingDropdown, 'cursor') @@ -308,7 +246,7 @@ function M:MapCanvas_OnMouseDown(btn) local position = M.MapHolder.mover:GetPoint() if btn == 'MiddleButton' or (btn == 'RightButton' and IsShiftKeyDown()) then if not E:AlertCombat() then - E:DropDown(menuList, menuFrame, 155, nil, nil, position:match('LEFT') and 0 or -160, 0) + EasyMenu(menuList, menuFrame, 155, nil, nil, position:match('LEFT') and 0 or -160, 0) end elseif btn == 'RightButton' and M.TrackingDropdown then _G.ToggleDropDownMenu(1, nil, M.TrackingDropdown, 'cursor') @@ -387,8 +325,7 @@ function M:GetIconSettings(button) local defaults = P.general.minimap.icons[button] local profile = E.db.general.minimap.icons[button] - return profile.scale or defaults.scale, profile.position or defaults.position, profile.xOffset or defaults.xOffset, - profile.yOffset or defaults.yOffset + return profile.scale or defaults.scale, profile.position or defaults.position, profile.xOffset or defaults.xOffset, profile.yOffset or defaults.yOffset end function M:UpdateSettings() @@ -431,7 +368,7 @@ function M:UpdateSettings() local mmOffset = E.PixelMode and 1 or 3 local mmScale = E.db.general.minimap.scale Minimap:ClearAllPoints() - Minimap:Point('TOPRIGHT', holder, -mmOffset / mmScale, -mmOffset / mmScale) + Minimap:Point('TOPRIGHT', holder, -mmOffset/mmScale, -mmOffset/mmScale) Minimap:Size(E.MinimapSize) local mWidth, mHeight = Minimap:GetSize() @@ -440,8 +377,7 @@ function M:UpdateSettings() local HEIGHT, WIDTH = (mHeight * mmScale) + (panelSize - joinPanel), mWidth * mmScale holder:SetSize(WIDTH + bWidth, HEIGHT + bHeight) - local locationFont, locaitonSize, locationOutline = LSM:Fetch('font', E.db.general.minimap.locationFont), - E.db.general.minimap.locationFontSize, E.db.general.minimap.locationFontOutline + local locationFont, locaitonSize, locationOutline = LSM:Fetch('font', E.db.general.minimap.locationFont), E.db.general.minimap.locationFontSize, E.db.general.minimap.locationFontOutline if Minimap.location then Minimap.location:Width(E.MinimapSize) Minimap.location:FontTemplate(locationFont, locaitonSize, locationOutline) @@ -463,8 +399,7 @@ function M:UpdateSettings() M.ClusterBackdrop:SetShown(E.db.general.minimap.clusterBackdrop and not noCluster) _G.MinimapZoneText:FontTemplate(locationFont, locaitonSize, locationOutline) - _G.TimeManagerClockTicker:FontTemplate(LSM:Fetch('font', E.db.general.minimap.timeFont), - E.db.general.minimap.timeFontSize, E.db.general.minimap.timeFontOutline) + _G.TimeManagerClockTicker:FontTemplate(LSM:Fetch('font', E.db.general.minimap.timeFont), E.db.general.minimap.timeFontSize, E.db.general.minimap.timeFontOutline) if noCluster then MinimapCluster.ZoneTextButton:Kill() @@ -669,18 +604,8 @@ function M:Initialize() Minimap:SetScript('OnMouseDown', M.Minimap_OnMouseDown) Minimap:SetScript('OnMouseUp', E.noop) - Minimap:HookScript('OnEnter', - function(mm) - if E.db.general.minimap.locationText == 'MOUSEOVER' and (not E.Retail or E.db.general.minimap.clusterDisable) then - mm.location:Show() - end - end) - Minimap:HookScript('OnLeave', - function(mm) - if E.db.general.minimap.locationText == 'MOUSEOVER' and (not E.Retail or E.db.general.minimap.clusterDisable) then - mm.location:Hide() - end - end) + Minimap:HookScript('OnEnter', function(mm) if E.db.general.minimap.locationText == 'MOUSEOVER' and (not E.Retail or E.db.general.minimap.clusterDisable) then mm.location:Show() end end) + Minimap:HookScript('OnLeave', function(mm) if E.db.general.minimap.locationText == 'MOUSEOVER' and (not E.Retail or E.db.general.minimap.clusterDisable) then mm.location:Hide() end end) Minimap.location = Minimap:CreateFontString(nil, 'OVERLAY') Minimap.location:Point('TOP', Minimap, 0, -2) From 069b411620e26bf3816c6e7c007647b482bd428f Mon Sep 17 00:00:00 2001 From: Simpy Date: Wed, 3 Jan 2024 17:04:41 -0500 Subject: [PATCH 16/55] use keyed reference for the icons --- ElvUI/Core/Modules/Maps/Minimap.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ElvUI/Core/Modules/Maps/Minimap.lua b/ElvUI/Core/Modules/Maps/Minimap.lua index cdbba588ef..09824d667c 100644 --- a/ElvUI/Core/Modules/Maps/Minimap.lua +++ b/ElvUI/Core/Modules/Maps/Minimap.lua @@ -42,12 +42,12 @@ local IndicatorLayout --Create the minimap micro menu local menuFrame = CreateFrame('Frame', 'MinimapRightClickMenu', E.UIParent, 'UIDropDownMenuTemplate') local menuList = { - { notCheckable = 1, text = _G.CHARACTER_BUTTON, func = function() _G.ToggleCharacter('PaperDollFrame') end, icon = [[Interface\AddOns\ElvUI\Core\Media\Textures\Backpack]] }, - { notCheckable = 1, text = _G.SPELLBOOK_ABILITIES_BUTTON, func = function() ToggleFrame(_G.SpellBookFrame) end, icon = [[Interface\AddOns\ElvUI\Core\Media\Textures\Planks]] }, + { notCheckable = 1, text = _G.CHARACTER_BUTTON, func = function() _G.ToggleCharacter('PaperDollFrame') end, icon = E.Media.Textures.Backpack }, + { notCheckable = 1, text = _G.SPELLBOOK_ABILITIES_BUTTON, func = function() ToggleFrame(_G.SpellBookFrame) end, icon = E.Media.Textures.Planks }, { notCheckable = 1, text = _G.TIMEMANAGER_TITLE, func = function() ToggleFrame(_G.TimeManagerFrame) end }, { notCheckable = 1, text = _G.CHAT_CHANNELS, func = function() _G.ToggleChannelFrame() end }, { notCheckable = 1, text = _G.SOCIAL_BUTTON, func = function() _G.ToggleFriendsFrame() end }, - { notCheckable = 1, text = _G.TALENTS_BUTTON, func = function() _G.ToggleTalentFrame() end, icon = [[Interface\AddOns\ElvUI\Core\Media\Textures\Scroll]], }, + { notCheckable = 1, text = _G.TALENTS_BUTTON, func = function() _G.ToggleTalentFrame() end, icon = E.Media.Textures.Scroll }, { notCheckable = 1, text = _G.GUILD, func = function() if E.Retail then _G.ToggleGuildFrame() else _G.ToggleFriendsFrame(3) end end }, } From 36448e5c9bc7796386d6af81e197520b73955d0c Mon Sep 17 00:00:00 2001 From: Simpy Date: Wed, 3 Jan 2024 17:17:12 -0500 Subject: [PATCH 17/55] fix args for the menu on f6c84d6e76 --- ElvUI/Core/Modules/Maps/Minimap.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI/Core/Modules/Maps/Minimap.lua b/ElvUI/Core/Modules/Maps/Minimap.lua index 09824d667c..767f6dff47 100644 --- a/ElvUI/Core/Modules/Maps/Minimap.lua +++ b/ElvUI/Core/Modules/Maps/Minimap.lua @@ -246,7 +246,7 @@ function M:MapCanvas_OnMouseDown(btn) local position = M.MapHolder.mover:GetPoint() if btn == 'MiddleButton' or (btn == 'RightButton' and IsShiftKeyDown()) then if not E:AlertCombat() then - EasyMenu(menuList, menuFrame, 155, nil, nil, position:match('LEFT') and 0 or -160, 0) + EasyMenu(menuList, menuFrame, 'cursor', position:match('LEFT') and 0 or -160, 0, 'MENU') end elseif btn == 'RightButton' and M.TrackingDropdown then _G.ToggleDropDownMenu(1, nil, M.TrackingDropdown, 'cursor') From 1fda9872ad14ecd810c909f6bb4673e04531ab91 Mon Sep 17 00:00:00 2001 From: Luckyone Date: Thu, 4 Jan 2024 15:22:16 +0100 Subject: [PATCH 18/55] Cleanup Toons --- ElvUI/Core/Modules/Chat/Chat.lua | 62 +++++++++++++++++--------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/ElvUI/Core/Modules/Chat/Chat.lua b/ElvUI/Core/Modules/Chat/Chat.lua index adceafa12d..f3b23d0052 100644 --- a/ElvUI/Core/Modules/Chat/Chat.lua +++ b/ElvUI/Core/Modules/Chat/Chat.lua @@ -325,15 +325,19 @@ do --this can save some main file locals -- Simpy (5099: Myzrael) z['Player-5099-01947A77'] = itsSimpy -- Warlock: Simpy -- Luckyone Seasonal (5826: Lone Wolf EU) - z['Player-5826-0202765F'] = ElvBlue -- [Alliance] Hunter: Luckyone - z['Player-5826-020F7F10'] = ElvBlue -- [Alliance] Paladin: Unluckyone - z['Player-5826-02172E79'] = ElvBlue -- [Alliance] Warlock: Luckywl + z['Player-5826-0202765F'] = ElvBlue -- [Alliance] Hunter + z['Player-5826-020F7F10'] = ElvBlue -- [Alliance] Paladin + z['Player-5826-02172E79'] = ElvBlue -- [Alliance] Warlock + z['Player-5826-0234253E'] = ElvBlue -- [Alliance] Mage + z['Player-5826-02342508'] = ElvBlue -- [Alliance] Priest + z['Player-5826-023424EF'] = ElvBlue -- [Alliance] Druid + z['Player-5826-02342520'] = ElvBlue -- [Alliance] Rogue + z['Player-5826-02342556'] = ElvBlue -- [Alliance] Warrior -- Luckyone Hardcore z["Lucky-Nek'Rosh"] = ElvBlue -- [Horde] Rogue z["Luckyone-Nek'Rosh"] = ElvBlue -- [Horde] Hunter z["Unluckyone-Nek'Rosh"] = ElvBlue -- [Horde] Mage z["Gigachad-Nek'Rosh"] = ElvBlue -- [Horde] Druid - z['Luckyone-Stitches'] = ElvBlue -- [Horde] Hunter -- Luckyone Classic Era (5233: Firemaw) z['Player-5233-01D22A72'] = ElvBlue -- [Horde] Hunter: Unluckyone z['Player-5233-01D27011'] = ElvBlue -- [Horde] Druid: Luckydruid @@ -342,17 +346,17 @@ do --this can save some main file locals z['Player-4373-011657A7'] = itsSimpy -- Paladin: Cutepally z['Player-4373-032FFEE2'] = itsSimpy -- Shaman: Kalline z['Player-4373-03351BC7'] = itsSimpy -- [Horde] DK: Imsojelly - -- Luckyone (4476: Gehennas, 4440: Everlook) - z['Luckydruid-Firemaw'] = ElvBlue -- [Alliance] Druid - z['Unluckyone-Firemaw'] = ElvBlue -- [Alliance] Priest - z['Luckygrip-Firemaw'] = ElvBlue -- [Alliance] DK - z['Luckywl-Firemaw'] = ElvBlue -- [Alliance] Warlock - z['Luckym-Firemaw'] = ElvBlue -- [Alliance] Mage - z['Luckyw-Firemaw'] = ElvBlue -- [Alliance] Warrior - z['Luckyp-Firemaw'] = ElvBlue -- [Alliance] Paladin - z['Player-4476-03BF41C9'] = ElvBlue -- [Horde] Hunter: Luckyone - z['Player-4440-03AD654A'] = ElvBlue -- [Alliance] Rogue: Luckyrogue - z['Player-4440-03ADE2DF'] = ElvBlue -- [Alliance] Shaman: Luckykek + -- Luckyone (4467: Firemaw, 4440: Everlook, 4476: Gehennas) + z['Player-4467-04540395'] = ElvBlue -- [Alliance] Druid + z['Player-4467-04542B4A'] = ElvBlue -- [Alliance] Priest + z['Player-4467-04571AA2'] = ElvBlue -- [Alliance] Warlock + z['Player-4467-04571A8D'] = ElvBlue -- [Alliance] DK + z['Player-4467-04571A9F'] = ElvBlue -- [Alliance] Mage + z['Player-4467-04571A98'] = ElvBlue -- [Alliance] Warrior + z['Player-4467-04571911'] = ElvBlue -- [Alliance] Paladin + z['Player-4440-03AD654A'] = ElvBlue -- [Alliance] Rogue + z['Player-4440-03ADE2DF'] = ElvBlue -- [Alliance] Shaman + z['Player-4476-03BF41C9'] = ElvBlue -- [Horde] Hunter -- Repooc z['Poocsdk-Mankrik'] = ElvBlue -- [Horde] DK z['Repooc-Mankrik'] = ElvBlue @@ -387,20 +391,20 @@ do --this can save some main file locals z['Player-1401-041C0AE2'] = ElvGreen -- [Alliance] Hunter: Róhal z['Player-1401-05CEABFA'] = ElvRed -- [Alliance] DK: Jahzzy -- Luckyone (1598: LaughingSkull) - z['Player-1598-0F5E4639'] = ElvBlue -- [Alliance] Druid: Luckyone - z['Player-1598-0F3E51B0'] = ElvBlue -- [Alliance] Druid: Luckydruid - z['Player-1598-0F46FF5A'] = ElvBlue -- [Horde] Evoker: Luckyevoker - z['Player-1598-0BFF3341'] = ElvBlue -- [Horde] DH: Luckydh - z['Player-1598-0BD22704'] = ElvBlue -- [Horde] Priest: Luckypriest - z['Player-1598-0BEFA545'] = ElvBlue -- [Horde] Monk: Luckymonkas - z['Player-1598-0E1A06DE'] = ElvBlue -- [Horde] Rogue: Luckyrogue - z['Player-1598-0BF2E377'] = ElvBlue -- [Horde] Hunter: Luckyhunter - z['Player-1598-0BF18248'] = ElvBlue -- [Horde] DK: Luckydk - z['Player-1598-0BFABB95'] = ElvBlue -- [Horde] Mage: Luckymage - z['Player-1598-0E67511D'] = ElvBlue -- [Horde] Paladin: Luckypala - z['Player-1598-0C0DD01B'] = ElvBlue -- [Horde] Warlock: Luckywl - z['Player-1598-0BF8013A'] = ElvBlue -- [Horde] Warrior: Notlucky - z['Player-1598-0BF56103'] = ElvBlue -- [Horde] Shaman: Unluckyone + z['Player-1598-0F5E4639'] = ElvBlue -- [Alliance] Druid: Luckyone + z['Player-1598-0F3E51B0'] = ElvBlue -- [Alliance] Druid: Luckydruid + z['Player-1598-0F46FF5A'] = ElvBlue -- [Horde] Evoker + z['Player-1598-0BFF3341'] = ElvBlue -- [Horde] DH + z['Player-1598-0BD22704'] = ElvBlue -- [Horde] Priest + z['Player-1598-0BEFA545'] = ElvBlue -- [Horde] Monk + z['Player-1598-0E1A06DE'] = ElvBlue -- [Horde] Rogue + z['Player-1598-0BF2E377'] = ElvBlue -- [Horde] Hunter + z['Player-1598-0BF18248'] = ElvBlue -- [Horde] DK + z['Player-1598-0BFABB95'] = ElvBlue -- [Horde] Mage + z['Player-1598-0E67511D'] = ElvBlue -- [Horde] Paladin + z['Player-1598-0C0DD01B'] = ElvBlue -- [Horde] Warlock + z['Player-1598-0BF8013A'] = ElvBlue -- [Horde] Warrior + z['Player-1598-0BF56103'] = ElvBlue -- [Horde] Shaman -- Repooc z['Sifpooc-Stormrage'] = itsPooc -- [Alliance] DH z['Fragmented-Stormrage'] = itsPooc -- [Alliance] Warlock From c9d64a4bab67bf1c9b1fd7878efcd32a92583ac0 Mon Sep 17 00:00:00 2001 From: Luckyone Date: Thu, 4 Jan 2024 15:23:08 +0100 Subject: [PATCH 19/55] np --- ElvUI/Core/Modules/Chat/Chat.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ElvUI/Core/Modules/Chat/Chat.lua b/ElvUI/Core/Modules/Chat/Chat.lua index f3b23d0052..a1ba7ac875 100644 --- a/ElvUI/Core/Modules/Chat/Chat.lua +++ b/ElvUI/Core/Modules/Chat/Chat.lua @@ -343,9 +343,9 @@ do --this can save some main file locals z['Player-5233-01D27011'] = ElvBlue -- [Horde] Druid: Luckydruid elseif E.Wrath then -- Simpy (4373: Myzrael) - z['Player-4373-011657A7'] = itsSimpy -- Paladin: Cutepally - z['Player-4373-032FFEE2'] = itsSimpy -- Shaman: Kalline - z['Player-4373-03351BC7'] = itsSimpy -- [Horde] DK: Imsojelly + z['Player-4373-011657A7'] = itsSimpy -- Paladin: Cutepally + z['Player-4373-032FFEE2'] = itsSimpy -- Shaman: Kalline + z['Player-4373-03351BC7'] = itsSimpy -- [Horde] DK: Imsojelly -- Luckyone (4467: Firemaw, 4440: Everlook, 4476: Gehennas) z['Player-4467-04540395'] = ElvBlue -- [Alliance] Druid z['Player-4467-04542B4A'] = ElvBlue -- [Alliance] Priest From 88e09e20096545b34b14b252dc0f4a7023eac4af Mon Sep 17 00:00:00 2001 From: Merathilis Date: Thu, 4 Jan 2024 15:51:25 +0100 Subject: [PATCH 20/55] @kodewdle :madge: --- ElvUI/Core/Modules/Maps/Minimap.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ElvUI/Core/Modules/Maps/Minimap.lua b/ElvUI/Core/Modules/Maps/Minimap.lua index 767f6dff47..79c94040ef 100644 --- a/ElvUI/Core/Modules/Maps/Minimap.lua +++ b/ElvUI/Core/Modules/Maps/Minimap.lua @@ -42,10 +42,10 @@ local IndicatorLayout --Create the minimap micro menu local menuFrame = CreateFrame('Frame', 'MinimapRightClickMenu', E.UIParent, 'UIDropDownMenuTemplate') local menuList = { - { notCheckable = 1, text = _G.CHARACTER_BUTTON, func = function() _G.ToggleCharacter('PaperDollFrame') end, icon = E.Media.Textures.Backpack }, - { notCheckable = 1, text = _G.SPELLBOOK_ABILITIES_BUTTON, func = function() ToggleFrame(_G.SpellBookFrame) end, icon = E.Media.Textures.Planks }, + { notCheckable = 1, text = _G.CHARACTER_BUTTON, func = function() _G.ToggleCharacter('PaperDollFrame') end, icon = [[Interface\ICONS\Achievement_Character_Human_Male]] }, + { notCheckable = 1, text = _G.SPELLBOOK_ABILITIES_BUTTON, func = function() ToggleFrame(_G.SpellBookFrame) end, icon = [[Interface\SPELLBOOK\Spellbook-Icon]] }, { notCheckable = 1, text = _G.TIMEMANAGER_TITLE, func = function() ToggleFrame(_G.TimeManagerFrame) end }, - { notCheckable = 1, text = _G.CHAT_CHANNELS, func = function() _G.ToggleChannelFrame() end }, + { notCheckable = 1, text = _G.CHAT_CHANNELS, func = function() _G.ToggleChannelFrame() end, icon = [[Interface\ICONS\UI_Chat]] }, { notCheckable = 1, text = _G.SOCIAL_BUTTON, func = function() _G.ToggleFriendsFrame() end }, { notCheckable = 1, text = _G.TALENTS_BUTTON, func = function() _G.ToggleTalentFrame() end, icon = E.Media.Textures.Scroll }, { notCheckable = 1, text = _G.GUILD, func = function() if E.Retail then _G.ToggleGuildFrame() else _G.ToggleFriendsFrame(3) end end }, From 69b78ed44d0d5f2fdcc3baf56f428c18adbc3c96 Mon Sep 17 00:00:00 2001 From: Simpy Date: Thu, 4 Jan 2024 16:30:45 -0500 Subject: [PATCH 21/55] use microbar icons on the menu on minimap now --- ElvUI/Core/Modules/ActionBars/MicroBar.lua | 9 +++- ElvUI/Core/Modules/Maps/Minimap.lua | 52 +++++++++++++--------- 2 files changed, 38 insertions(+), 23 deletions(-) diff --git a/ElvUI/Core/Modules/ActionBars/MicroBar.lua b/ElvUI/Core/Modules/ActionBars/MicroBar.lua index 0d21101d24..4af9a30c80 100644 --- a/ElvUI/Core/Modules/ActionBars/MicroBar.lua +++ b/ElvUI/Core/Modules/ActionBars/MicroBar.lua @@ -100,9 +100,8 @@ local function onLeave(button) end end -function AB:HandleMicroCoords(button, name) +function AB:GetMicroCoords(name, icons) local l, r, t, b = 0.17, 0.87, 0.5, 0.908 - local icons = AB.db.microbar.useIcons if name == 'PVPMicroButton' or (not E.Retail and name == 'CharacterMicroButton') then l, r, t, b = 0, 1, 0, 1 @@ -114,6 +113,12 @@ function AB:HandleMicroCoords(button, name) end end + return l, r, t, b +end + +function AB:HandleMicroCoords(button, name) + local l, r, t, b = AB:GetMicroCoords(name, AB.db.microbar.useIcons) + local normal = button.GetNormalTexture and button:GetNormalTexture() if normal then normal:SetTexCoord(l, r, t, b) diff --git a/ElvUI/Core/Modules/Maps/Minimap.lua b/ElvUI/Core/Modules/Maps/Minimap.lua index 79c94040ef..fbac987c31 100644 --- a/ElvUI/Core/Modules/Maps/Minimap.lua +++ b/ElvUI/Core/Modules/Maps/Minimap.lua @@ -1,5 +1,6 @@ local E, L, V, P, G = unpack(ElvUI) local M = E:GetModule('Minimap') +local AB = E:GetModule('ActionBars') local LSM = E.Libs.LSM local _G = _G @@ -42,38 +43,40 @@ local IndicatorLayout --Create the minimap micro menu local menuFrame = CreateFrame('Frame', 'MinimapRightClickMenu', E.UIParent, 'UIDropDownMenuTemplate') local menuList = { - { notCheckable = 1, text = _G.CHARACTER_BUTTON, func = function() _G.ToggleCharacter('PaperDollFrame') end, icon = [[Interface\ICONS\Achievement_Character_Human_Male]] }, - { notCheckable = 1, text = _G.SPELLBOOK_ABILITIES_BUTTON, func = function() ToggleFrame(_G.SpellBookFrame) end, icon = [[Interface\SPELLBOOK\Spellbook-Icon]] }, - { notCheckable = 1, text = _G.TIMEMANAGER_TITLE, func = function() ToggleFrame(_G.TimeManagerFrame) end }, - { notCheckable = 1, text = _G.CHAT_CHANNELS, func = function() _G.ToggleChannelFrame() end, icon = [[Interface\ICONS\UI_Chat]] }, - { notCheckable = 1, text = _G.SOCIAL_BUTTON, func = function() _G.ToggleFriendsFrame() end }, - { notCheckable = 1, text = _G.TALENTS_BUTTON, func = function() _G.ToggleTalentFrame() end, icon = E.Media.Textures.Scroll }, - { notCheckable = 1, text = _G.GUILD, func = function() if E.Retail then _G.ToggleGuildFrame() else _G.ToggleFriendsFrame(3) end end }, + { text = _G.CHARACTER_BUTTON, microOffset = 'CharacterMicroButton', func = function() _G.ToggleCharacter('PaperDollFrame') end }, + { text = _G.SPELLBOOK_ABILITIES_BUTTON, microOffset = 'SpellbookMicroButton', func = function() ToggleFrame(_G.SpellBookFrame) end }, + { text = _G.TIMEMANAGER_TITLE, func = function() ToggleFrame(_G.TimeManagerFrame) end }, + { text = _G.CHAT_CHANNELS, func = function() _G.ToggleChannelFrame() end, icon = 2056011 }, -- Interface\ICONS\UI_Chat + { text = _G.SOCIAL_BUTTON, microOffset = 'SocialsMicroButton', func = function() _G.ToggleFriendsFrame() end }, + { text = _G.TALENTS_BUTTON, microOffset = 'TalentMicroButton', func = function() _G.ToggleTalentFrame() end }, + { text = _G.GUILD, microOffset = 'GuildMicroButton', func = function() if E.Retail then _G.ToggleGuildFrame() else _G.ToggleFriendsFrame(3) end end }, } if E.Wrath and E.mylevel >= _G.SHOW_PVP_LEVEL then - tinsert(menuList, { notCheckable = 1, text = _G.PLAYER_V_PLAYER, func = function() _G.TogglePVPFrame() end }) + tinsert(menuList, { text = _G.PLAYER_V_PLAYER, func = function() _G.TogglePVPFrame() end }) end if E.Retail or E.Wrath then - tinsert(menuList, { notCheckable = 1, text = _G.COLLECTIONS, func = function() _G.ToggleCollectionsJournal() end, icon = [[Interface\AddOns\ElvUI\Core\Media\Textures\GoldCoins]] }) - tinsert(menuList, { notCheckable = 1, text = _G.ACHIEVEMENT_BUTTON, func = function() _G.ToggleAchievementFrame() end }) - tinsert(menuList, { notCheckable = 1, text = _G.LFG_TITLE, func = function() if E.Retail then _G.ToggleLFDParentFrame() else _G.PVEFrame_ToggleFrame() end end }) - tinsert(menuList, { notCheckable = 1, text = L["Calendar"], func = function() _G.GameTimeFrame:Click() end }) + tinsert(menuList, { text = _G.COLLECTIONS, microOffset = 'CollectionsMicroButton', func = function() _G.ToggleCollectionsJournal() end, icon = [[Interface\AddOns\ElvUI\Core\Media\Textures\GoldCoins]] }) + tinsert(menuList, { text = _G.ACHIEVEMENT_BUTTON, microOffset = 'AchievementMicroButton', func = function() _G.ToggleAchievementFrame() end }) + tinsert(menuList, { text = _G.LFG_TITLE, microOffset = E.Retail and 'LFDMicroButton' or 'LFGMicroButton', func = function() if E.Retail then _G.ToggleLFDParentFrame() else _G.PVEFrame_ToggleFrame() end end }) + tinsert(menuList, { text = L["Calendar"], func = function() _G.GameTimeFrame:Click() end }) end if E.Retail then - tinsert(menuList, { notCheckable = 1, text = _G.BLIZZARD_STORE, func = function() _G.StoreMicroButton:Click() end }) - tinsert(menuList, { notCheckable = 1, text = _G.GARRISON_TYPE_8_0_LANDING_PAGE_TITLE, func = function() _G.ExpansionLandingPageMinimapButton:ToggleLandingPage() end }) - tinsert(menuList, { notCheckable = 1, text = _G.ENCOUNTER_JOURNAL, func = function() if not IsAddOnLoaded('Blizzard_EncounterJournal') then UIParentLoadAddOn('Blizzard_EncounterJournal') end ToggleFrame(_G.EncounterJournal) end }) + tinsert(menuList, { text = _G.BLIZZARD_STORE, microOffset = 'StoreMicroButton', func = function() _G.StoreMicroButton:Click() end }) + tinsert(menuList, { text = _G.GARRISON_TYPE_8_0_LANDING_PAGE_TITLE, func = function() _G.ExpansionLandingPageMinimapButton:ToggleLandingPage() end }) + tinsert(menuList, { text = _G.ENCOUNTER_JOURNAL, microOffset = 'EJMicroButton', func = function() if not IsAddOnLoaded('Blizzard_EncounterJournal') then UIParentLoadAddOn('Blizzard_EncounterJournal') end ToggleFrame(_G.EncounterJournal) end }) else - tinsert(menuList, { notCheckable = 1, text = _G.QUEST_LOG, func = function() ToggleFrame(_G.QuestLogFrame) end }) + tinsert(menuList, { text = _G.QUEST_LOG, microOffset = 'QuestLogMicroButton', func = function() ToggleFrame(_G.QuestLogFrame) end }) end sort(menuList, function(a, b) if a and b and a.text and b.text then return a.text < b.text end end) -- want these two on the bottom -tinsert(menuList, { text = _G.MAINMENU_BUTTON, +tinsert(menuList, { + text = _G.MAINMENU_BUTTON, + microOffset = 'MainMenuMicroButton', func = function() if not _G.GameMenuFrame:IsShown() then if not E.Retail then @@ -105,10 +108,6 @@ tinsert(menuList, { text = _G.MAINMENU_BUTTON, tinsert(menuList, { text = _G.HELP_BUTTON, bottom = true, func = function() _G.ToggleHelpFrame() end }) -for _, menu in ipairs(menuList) do - menu.notCheckable = true -end - M.RightClickMenu = menuFrame M.RightClickMenuList = menuList @@ -548,6 +547,17 @@ function M:Initialize() return end + for _, menu in ipairs(menuList) do + menu.notCheckable = true + + if menu.microOffset then + local left, right, top, bottom = AB:GetMicroCoords(menu.microOffset, true) + menu.tCoordLeft, menu.tCoordRight, menu.tCoordTop, menu.tCoordBottom = left, right, top, bottom + menu.icon = E.Media.Textures.MicroBar + menu.microOffset = nil + end + end + M.Initialized = true menuFrame:SetTemplate('Transparent') From acdc2cb69b660e85eb7c5e16569b3caba4e8c287 Mon Sep 17 00:00:00 2001 From: Simpy Date: Thu, 4 Jan 2024 16:42:52 -0500 Subject: [PATCH 22/55] pvp icon for wrath --- ElvUI/Core/Modules/ActionBars/MicroBar.lua | 8 ++++---- ElvUI/Core/Modules/Maps/Minimap.lua | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ElvUI/Core/Modules/ActionBars/MicroBar.lua b/ElvUI/Core/Modules/ActionBars/MicroBar.lua index 4af9a30c80..9ff74c6889 100644 --- a/ElvUI/Core/Modules/ActionBars/MicroBar.lua +++ b/ElvUI/Core/Modules/ActionBars/MicroBar.lua @@ -100,10 +100,10 @@ local function onLeave(button) end end -function AB:GetMicroCoords(name, icons) +function AB:GetMicroCoords(name, icons, character) local l, r, t, b = 0.17, 0.87, 0.5, 0.908 - if name == 'PVPMicroButton' or (not E.Retail and name == 'CharacterMicroButton') then + if name == 'PVPMicroButton' or (character and name == 'CharacterMicroButton') then l, r, t, b = 0, 1, 0, 1 elseif E.Retail or icons then local offset = AB.MICRO_OFFSETS[name] @@ -117,7 +117,7 @@ function AB:GetMicroCoords(name, icons) end function AB:HandleMicroCoords(button, name) - local l, r, t, b = AB:GetMicroCoords(name, AB.db.microbar.useIcons) + local l, r, t, b = AB:GetMicroCoords(name, AB.db.microbar.useIcons, not E.Retail) local normal = button.GetNormalTexture and button:GetNormalTexture() if normal then @@ -162,7 +162,7 @@ function AB:HandleMicroTextures(button, name) else local icons = AB.db.microbar.useIcons local character = not E.Retail and name == 'CharacterMicroButton' and E.Media.Textures.Black8x8 - local faction = name == 'PVPMicroButton' and E.Media.Textures[E.myfaction == 'Horde' and 'PVPHorde' or 'PVPAlliance'] + local faction = name == 'PVPMicroButton' and ((E.myfaction == 'Horde' and E.Media.Textures.PVPHorde) or E.Media.Textures.PVPAlliance) local texture = faction or (not character and AB.MICRO_OFFSETS[name] and E.Media.Textures.MicroBar) local stock = not E.Retail and not icons and AB.MICRO_CLASSIC[name] -- classic default icons from the game local pushed = button.GetPushedTexture and button:GetPushedTexture() diff --git a/ElvUI/Core/Modules/Maps/Minimap.lua b/ElvUI/Core/Modules/Maps/Minimap.lua index fbac987c31..f95cd37d86 100644 --- a/ElvUI/Core/Modules/Maps/Minimap.lua +++ b/ElvUI/Core/Modules/Maps/Minimap.lua @@ -53,7 +53,7 @@ local menuList = { } if E.Wrath and E.mylevel >= _G.SHOW_PVP_LEVEL then - tinsert(menuList, { text = _G.PLAYER_V_PLAYER, func = function() _G.TogglePVPFrame() end }) + tinsert(menuList, { text = _G.PLAYER_V_PLAYER, microOffset = 'PVPMicroButton', func = function() _G.TogglePVPFrame() end }) end if E.Retail or E.Wrath then @@ -553,7 +553,7 @@ function M:Initialize() if menu.microOffset then local left, right, top, bottom = AB:GetMicroCoords(menu.microOffset, true) menu.tCoordLeft, menu.tCoordRight, menu.tCoordTop, menu.tCoordBottom = left, right, top, bottom - menu.icon = E.Media.Textures.MicroBar + menu.icon = menu.microOffset == 'PVPMicroButton' and ((E.myfaction == 'Horde' and E.Media.Textures.PVPHorde) or E.Media.Textures.PVPAlliance) or E.Media.Textures.MicroBar menu.microOffset = nil end end From eccc08f05574753f99f4e47288630068b99aeeaf Mon Sep 17 00:00:00 2001 From: Simpy Date: Thu, 4 Jan 2024 16:53:55 -0500 Subject: [PATCH 23/55] buttons not for retail --- ElvUI/Core/Modules/Maps/Minimap.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ElvUI/Core/Modules/Maps/Minimap.lua b/ElvUI/Core/Modules/Maps/Minimap.lua index f95cd37d86..5665221c47 100644 --- a/ElvUI/Core/Modules/Maps/Minimap.lua +++ b/ElvUI/Core/Modules/Maps/Minimap.lua @@ -47,7 +47,7 @@ local menuList = { { text = _G.SPELLBOOK_ABILITIES_BUTTON, microOffset = 'SpellbookMicroButton', func = function() ToggleFrame(_G.SpellBookFrame) end }, { text = _G.TIMEMANAGER_TITLE, func = function() ToggleFrame(_G.TimeManagerFrame) end }, { text = _G.CHAT_CHANNELS, func = function() _G.ToggleChannelFrame() end, icon = 2056011 }, -- Interface\ICONS\UI_Chat - { text = _G.SOCIAL_BUTTON, microOffset = 'SocialsMicroButton', func = function() _G.ToggleFriendsFrame() end }, + { text = _G.SOCIAL_BUTTON, microOffset = not E.Retail and 'SocialsMicroButton' or nil, func = function() _G.ToggleFriendsFrame() end }, { text = _G.TALENTS_BUTTON, microOffset = 'TalentMicroButton', func = function() _G.ToggleTalentFrame() end }, { text = _G.GUILD, microOffset = 'GuildMicroButton', func = function() if E.Retail then _G.ToggleGuildFrame() else _G.ToggleFriendsFrame(3) end end }, } @@ -106,7 +106,7 @@ tinsert(menuList, { end }) -tinsert(menuList, { text = _G.HELP_BUTTON, bottom = true, func = function() _G.ToggleHelpFrame() end }) +tinsert(menuList, { text = _G.HELP_BUTTON, microOffset = not E.Retail and 'HelpMicroButton' or nil, bottom = true, func = function() _G.ToggleHelpFrame() end }) M.RightClickMenu = menuFrame M.RightClickMenuList = menuList From 7f592b11306e482de57088c31460e4932701dedc Mon Sep 17 00:00:00 2001 From: Simpy Date: Thu, 4 Jan 2024 16:54:28 -0500 Subject: [PATCH 24/55] duplicated with guild --- ElvUI/Core/Modules/Maps/Minimap.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI/Core/Modules/Maps/Minimap.lua b/ElvUI/Core/Modules/Maps/Minimap.lua index 5665221c47..fc49bd7f7f 100644 --- a/ElvUI/Core/Modules/Maps/Minimap.lua +++ b/ElvUI/Core/Modules/Maps/Minimap.lua @@ -47,7 +47,7 @@ local menuList = { { text = _G.SPELLBOOK_ABILITIES_BUTTON, microOffset = 'SpellbookMicroButton', func = function() ToggleFrame(_G.SpellBookFrame) end }, { text = _G.TIMEMANAGER_TITLE, func = function() ToggleFrame(_G.TimeManagerFrame) end }, { text = _G.CHAT_CHANNELS, func = function() _G.ToggleChannelFrame() end, icon = 2056011 }, -- Interface\ICONS\UI_Chat - { text = _G.SOCIAL_BUTTON, microOffset = not E.Retail and 'SocialsMicroButton' or nil, func = function() _G.ToggleFriendsFrame() end }, + { text = _G.SOCIAL_BUTTON, func = function() _G.ToggleFriendsFrame() end }, { text = _G.TALENTS_BUTTON, microOffset = 'TalentMicroButton', func = function() _G.ToggleTalentFrame() end }, { text = _G.GUILD, microOffset = 'GuildMicroButton', func = function() if E.Retail then _G.ToggleGuildFrame() else _G.ToggleFriendsFrame(3) end end }, } From 21493eed2f057c012c0ec68a1b552ca9701cb7a8 Mon Sep 17 00:00:00 2001 From: Merathilis Date: Fri, 5 Jan 2024 09:57:26 +0100 Subject: [PATCH 25/55] oUF is now also in 2024 --- ElvUI_Libraries/Core/oUF/LICENSE.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ElvUI_Libraries/Core/oUF/LICENSE.txt b/ElvUI_Libraries/Core/oUF/LICENSE.txt index 476398b125..32a8562b75 100644 --- a/ElvUI_Libraries/Core/oUF/LICENSE.txt +++ b/ElvUI_Libraries/Core/oUF/LICENSE.txt @@ -1,7 +1,7 @@ -Copyright (c) 2006-2022 Trond A Ekseth -Copyright (c) 2016-2022 Val Voronov -Copyright (c) 2016-2022 Adrian L Lange -Copyright (c) 2016-2022 Rainrider +Copyright (c) 2006-2024 Trond A Ekseth +Copyright (c) 2016-2024 Val Voronov +Copyright (c) 2016-2024 Adrian L Lange +Copyright (c) 2016-2024 Rainrider Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation From 607ce06013be69651db2298f143897dae90d083a Mon Sep 17 00:00:00 2001 From: Merathilis Date: Fri, 5 Jan 2024 12:42:45 +0100 Subject: [PATCH 26/55] I don't know man. sssss --- ElvUI/Core/Modules/Maps/Minimap.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ElvUI/Core/Modules/Maps/Minimap.lua b/ElvUI/Core/Modules/Maps/Minimap.lua index fc49bd7f7f..881cd07a2d 100644 --- a/ElvUI/Core/Modules/Maps/Minimap.lua +++ b/ElvUI/Core/Modules/Maps/Minimap.lua @@ -45,7 +45,7 @@ local menuFrame = CreateFrame('Frame', 'MinimapRightClickMenu', E.UIParent, 'UID local menuList = { { text = _G.CHARACTER_BUTTON, microOffset = 'CharacterMicroButton', func = function() _G.ToggleCharacter('PaperDollFrame') end }, { text = _G.SPELLBOOK_ABILITIES_BUTTON, microOffset = 'SpellbookMicroButton', func = function() ToggleFrame(_G.SpellBookFrame) end }, - { text = _G.TIMEMANAGER_TITLE, func = function() ToggleFrame(_G.TimeManagerFrame) end }, + { text = _G.TIMEMANAGER_TITLE, func = function() ToggleFrame(_G.TimeManagerFrame) end, icon = [[Interface\ICONS\INV_Misc_PocketWatch_01]] }, { text = _G.CHAT_CHANNELS, func = function() _G.ToggleChannelFrame() end, icon = 2056011 }, -- Interface\ICONS\UI_Chat { text = _G.SOCIAL_BUTTON, func = function() _G.ToggleFriendsFrame() end }, { text = _G.TALENTS_BUTTON, microOffset = 'TalentMicroButton', func = function() _G.ToggleTalentFrame() end }, @@ -60,7 +60,7 @@ if E.Retail or E.Wrath then tinsert(menuList, { text = _G.COLLECTIONS, microOffset = 'CollectionsMicroButton', func = function() _G.ToggleCollectionsJournal() end, icon = [[Interface\AddOns\ElvUI\Core\Media\Textures\GoldCoins]] }) tinsert(menuList, { text = _G.ACHIEVEMENT_BUTTON, microOffset = 'AchievementMicroButton', func = function() _G.ToggleAchievementFrame() end }) tinsert(menuList, { text = _G.LFG_TITLE, microOffset = E.Retail and 'LFDMicroButton' or 'LFGMicroButton', func = function() if E.Retail then _G.ToggleLFDParentFrame() else _G.PVEFrame_ToggleFrame() end end }) - tinsert(menuList, { text = L["Calendar"], func = function() _G.GameTimeFrame:Click() end }) + tinsert(menuList, { text = L["Calendar"], func = function() _G.GameTimeFrame:Click() end, icon = [[Interface\Calendar\MeetingIcon]]}) end if E.Retail then From 2cce55999b702846f1bbc2e3f11c8e11a6cd3189 Mon Sep 17 00:00:00 2001 From: Merathilis Date: Fri, 5 Jan 2024 17:22:49 +0100 Subject: [PATCH 27/55] another Icon --- ElvUI/Core/Modules/Maps/Minimap.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI/Core/Modules/Maps/Minimap.lua b/ElvUI/Core/Modules/Maps/Minimap.lua index 881cd07a2d..25871ef550 100644 --- a/ElvUI/Core/Modules/Maps/Minimap.lua +++ b/ElvUI/Core/Modules/Maps/Minimap.lua @@ -47,7 +47,7 @@ local menuList = { { text = _G.SPELLBOOK_ABILITIES_BUTTON, microOffset = 'SpellbookMicroButton', func = function() ToggleFrame(_G.SpellBookFrame) end }, { text = _G.TIMEMANAGER_TITLE, func = function() ToggleFrame(_G.TimeManagerFrame) end, icon = [[Interface\ICONS\INV_Misc_PocketWatch_01]] }, { text = _G.CHAT_CHANNELS, func = function() _G.ToggleChannelFrame() end, icon = 2056011 }, -- Interface\ICONS\UI_Chat - { text = _G.SOCIAL_BUTTON, func = function() _G.ToggleFriendsFrame() end }, + { text = _G.SOCIAL_BUTTON, func = function() _G.ToggleFriendsFrame() end, icon = [[Interface\FriendsFrame\PlusManz-BattleNet]] }, { text = _G.TALENTS_BUTTON, microOffset = 'TalentMicroButton', func = function() _G.ToggleTalentFrame() end }, { text = _G.GUILD, microOffset = 'GuildMicroButton', func = function() if E.Retail then _G.ToggleGuildFrame() else _G.ToggleFriendsFrame(3) end end }, } From 88048733e4a8145466cfb54894f4f686a12b4882 Mon Sep 17 00:00:00 2001 From: Merathilis Date: Sat, 6 Jan 2024 14:03:51 +0100 Subject: [PATCH 28/55] Lets handle also the Font for Spend-Text on the Talent Frame & Profession Frame --- ElvUI/Core/General/Fonts.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/ElvUI/Core/General/Fonts.lua b/ElvUI/Core/General/Fonts.lua index 85081f2d75..bc017c4928 100644 --- a/ElvUI/Core/General/Fonts.lua +++ b/ElvUI/Core/General/Fonts.lua @@ -271,6 +271,7 @@ function E:UpdateBlizzardFonts() E:SetFont(_G.DestinyFontHuge, NORMAL, (blizz and 32) or unscale or enormous) -- Garrison Mission Report E:SetFont(_G.GameFont_Gigantic, NORMAL, (blizz and 32) or unscale or enormous, 'SHADOW') -- Used at the install steps E:SetFont(_G.SystemFont_OutlineThick_WTF, NORMAL, (blizz and 32) or unscale or enormous, outline) -- WorldMap + E:SetFont(_G.SystemFont16_Shadow_ThickOutline, NORMAL, (blizz and 10) or unscale or enormous, outline) -- Talent/Profession SpendText -- big fonts E:SetFont(_G.QuestFont_39, NORMAL, (blizz and 39) or unscale or gigantic) -- Wrath From 16a8cd7e013e014c8271953aaf873bb9432c9c56 Mon Sep 17 00:00:00 2001 From: Simpy Date: Sun, 7 Jan 2024 14:21:02 -0500 Subject: [PATCH 29/55] use texture ids --- ElvUI/Core/Modules/Maps/Minimap.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ElvUI/Core/Modules/Maps/Minimap.lua b/ElvUI/Core/Modules/Maps/Minimap.lua index 25871ef550..29b862ccdf 100644 --- a/ElvUI/Core/Modules/Maps/Minimap.lua +++ b/ElvUI/Core/Modules/Maps/Minimap.lua @@ -45,9 +45,9 @@ local menuFrame = CreateFrame('Frame', 'MinimapRightClickMenu', E.UIParent, 'UID local menuList = { { text = _G.CHARACTER_BUTTON, microOffset = 'CharacterMicroButton', func = function() _G.ToggleCharacter('PaperDollFrame') end }, { text = _G.SPELLBOOK_ABILITIES_BUTTON, microOffset = 'SpellbookMicroButton', func = function() ToggleFrame(_G.SpellBookFrame) end }, - { text = _G.TIMEMANAGER_TITLE, func = function() ToggleFrame(_G.TimeManagerFrame) end, icon = [[Interface\ICONS\INV_Misc_PocketWatch_01]] }, + { text = _G.TIMEMANAGER_TITLE, func = function() ToggleFrame(_G.TimeManagerFrame) end, icon = 134376 }, -- Interface\ICONS\INV_Misc_PocketWatch_01 { text = _G.CHAT_CHANNELS, func = function() _G.ToggleChannelFrame() end, icon = 2056011 }, -- Interface\ICONS\UI_Chat - { text = _G.SOCIAL_BUTTON, func = function() _G.ToggleFriendsFrame() end, icon = [[Interface\FriendsFrame\PlusManz-BattleNet]] }, + { text = _G.SOCIAL_BUTTON, func = function() _G.ToggleFriendsFrame() end, icon = 374218 }, -- Interface\FriendsFrame\PlusManz-BattleNet { text = _G.TALENTS_BUTTON, microOffset = 'TalentMicroButton', func = function() _G.ToggleTalentFrame() end }, { text = _G.GUILD, microOffset = 'GuildMicroButton', func = function() if E.Retail then _G.ToggleGuildFrame() else _G.ToggleFriendsFrame(3) end end }, } @@ -57,10 +57,10 @@ if E.Wrath and E.mylevel >= _G.SHOW_PVP_LEVEL then end if E.Retail or E.Wrath then - tinsert(menuList, { text = _G.COLLECTIONS, microOffset = 'CollectionsMicroButton', func = function() _G.ToggleCollectionsJournal() end, icon = [[Interface\AddOns\ElvUI\Core\Media\Textures\GoldCoins]] }) + tinsert(menuList, { text = _G.COLLECTIONS, microOffset = 'CollectionsMicroButton', func = function() _G.ToggleCollectionsJournal() end, icon = E.Media.Textures.GoldCoins }) -- Interface/ICONS/INV_Misc_Coin_01 tinsert(menuList, { text = _G.ACHIEVEMENT_BUTTON, microOffset = 'AchievementMicroButton', func = function() _G.ToggleAchievementFrame() end }) tinsert(menuList, { text = _G.LFG_TITLE, microOffset = E.Retail and 'LFDMicroButton' or 'LFGMicroButton', func = function() if E.Retail then _G.ToggleLFDParentFrame() else _G.PVEFrame_ToggleFrame() end end }) - tinsert(menuList, { text = L["Calendar"], func = function() _G.GameTimeFrame:Click() end, icon = [[Interface\Calendar\MeetingIcon]]}) + tinsert(menuList, { text = L["Calendar"], func = function() _G.GameTimeFrame:Click() end, icon = 235486}) -- Interface\Calendar\MeetingIcon end if E.Retail then From f8227c27a5bfceed5f4f2e9624f9763169996233 Mon Sep 17 00:00:00 2001 From: Simpy Date: Sun, 7 Jan 2024 14:43:20 -0500 Subject: [PATCH 30/55] font thingy --- ElvUI/Core/General/Fonts.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI/Core/General/Fonts.lua b/ElvUI/Core/General/Fonts.lua index bc017c4928..63b77236f9 100644 --- a/ElvUI/Core/General/Fonts.lua +++ b/ElvUI/Core/General/Fonts.lua @@ -246,6 +246,7 @@ function E:UpdateBlizzardFonts() E:SetFont(_G.QuestFont_Larger, NORMAL, (blizz and 16) or unscale or big) -- Wrath E:SetFont(_G.SystemFont_Large, NORMAL, (blizz and 16) or unscale or big) E:SetFont(_G.SystemFont_Shadow_Large, NORMAL, (blizz and 16) or unscale or big, 'SHADOW') + E:SetFont(_G.SystemFont16_Shadow_ThickOutline, NORMAL, (blizz and 16) or unscale or big, outline) -- Talent & Profession SpendText E:SetFont(_G.Game18Font, NORMAL, (blizz and 18) or unscale or big) -- MissionUI Bonus Chance E:SetFont(_G.GameFontNormalLarge2, NORMAL, (blizz and 18) or unscale or big, 'SHADOW') -- Garrison Follower Names E:SetFont(_G.QuestFont_Huge, NORMAL, (blizz and 18) or unscale or big) -- Quest rewards title, Rewards @@ -271,7 +272,6 @@ function E:UpdateBlizzardFonts() E:SetFont(_G.DestinyFontHuge, NORMAL, (blizz and 32) or unscale or enormous) -- Garrison Mission Report E:SetFont(_G.GameFont_Gigantic, NORMAL, (blizz and 32) or unscale or enormous, 'SHADOW') -- Used at the install steps E:SetFont(_G.SystemFont_OutlineThick_WTF, NORMAL, (blizz and 32) or unscale or enormous, outline) -- WorldMap - E:SetFont(_G.SystemFont16_Shadow_ThickOutline, NORMAL, (blizz and 10) or unscale or enormous, outline) -- Talent/Profession SpendText -- big fonts E:SetFont(_G.QuestFont_39, NORMAL, (blizz and 39) or unscale or gigantic) -- Wrath From f1fe1e1914b350270f4c54bb5608ff17932c435c Mon Sep 17 00:00:00 2001 From: Simpy Date: Sun, 7 Jan 2024 14:54:00 -0500 Subject: [PATCH 31/55] =?UTF-8?q?=F0=9F=A6=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ElvUI/Core/Modules/Bags/Bags.lua | 24 +++++++++---------- ElvUI/Core/Modules/Maps/Minimap.lua | 2 +- ElvUI/Core/Modules/Misc/Loot.lua | 2 +- ElvUI/Core/Modules/Skins/Ace3.lua | 2 +- ElvUI/Core/Modules/Skins/Skins.lua | 4 ++-- ElvUI/Mainline/Modules/Skins/Alerts.lua | 2 +- ElvUI/Mainline/Modules/Skins/LFG.lua | 6 ++--- .../Modules/Skins/ObjectiveTracker.lua | 2 +- ElvUI/Mainline/Modules/Skins/PVP.lua | 6 ++--- ElvUI/Mainline/Modules/Skins/PetBattle.lua | 2 +- ElvUI/Mainline/Modules/Skins/WorldMap.lua | 6 ++--- ElvUI/Wrath/Modules/Skins/LFG.lua | 6 ++--- ElvUI_Libraries/Core/oUF/elements/castbar.lua | 2 +- 13 files changed, 33 insertions(+), 33 deletions(-) diff --git a/ElvUI/Core/Modules/Bags/Bags.lua b/ElvUI/Core/Modules/Bags/Bags.lua index 4218485798..2ec6e109b3 100644 --- a/ElvUI/Core/Modules/Bags/Bags.lua +++ b/ElvUI/Core/Modules/Bags/Bags.lua @@ -191,11 +191,11 @@ B.numTrackedTokens = 0 B.QuestSlots = {} B.ItemLevelSlots = {} B.BAG_FILTER_ICONS = { - [FILTER_FLAG_EQUIPMENT] = E.Media.Textures.ChestPlate, -- Interface/ICONS/INV_Chest_Plate10 - [FILTER_FLAG_CONSUMABLES] = E.Media.Textures.GreenPotion, -- Interface/ICONS/INV_Potion_93 - [FILTER_FLAG_TRADE_GOODS] = E.Media.Textures.FabricSilk, -- Interface/ICONS/INV_Fabric_Silk_02 - [FILTER_FLAG_JUNK] = E.Media.Textures.GoldCoins, -- Interface/ICONS/INV_Misc_Coin_01 - [FILTER_FLAG_QUEST] = E.Media.Textures.Scroll -- Interface/ICONS/INV_Scroll_03 + [FILTER_FLAG_EQUIPMENT] = E.Media.Textures.ChestPlate, -- Interface\ICONS\INV_Chest_Plate10 + [FILTER_FLAG_CONSUMABLES] = E.Media.Textures.GreenPotion, -- Interface\ICONS\INV_Potion_93 + [FILTER_FLAG_TRADE_GOODS] = E.Media.Textures.FabricSilk, -- Interface\ICONS\INV_Fabric_Silk_02 + [FILTER_FLAG_JUNK] = E.Media.Textures.GoldCoins, -- Interface\ICONS\INV_Misc_Coin_01 + [FILTER_FLAG_QUEST] = E.Media.Textures.Scroll -- Interface\ICONS\INV_Scroll_03 } local itemSpellID = { @@ -1647,7 +1647,7 @@ function B:ConstructContainerFrame(name, isBank) end holder.icon:SetTexCoord(unpack(E.TexCoords)) - holder.icon:SetTexture(bagID == KEYRING_CONTAINER and 134237 or E.Media.Textures.Backpack) -- Interface/ICONS/INV_Misc_Key_03 + holder.icon:SetTexture(bagID == KEYRING_CONTAINER and 134237 or E.Media.Textures.Backpack) -- Interface\ICONS\INV_Misc_Key_03 holder.icon:SetInside() holder.IconBorder:SetAlpha(0) @@ -1825,7 +1825,7 @@ function B:ConstructContainerFrame(name, isBank) f.reagentToggle:Size(18) f.reagentToggle:SetTemplate() f.reagentToggle:Point('BOTTOMRIGHT', f.holderFrame, 'TOPRIGHT', 0, 3) - B:SetButtonTexture(f.reagentToggle, 132854) -- Interface/ICONS/INV_Enchant_DustArcane + B:SetButtonTexture(f.reagentToggle, 132854) -- Interface\ICONS\INV_Enchant_DustArcane f.reagentToggle:StyleButton(nil, true) f.reagentToggle.ttText = L["Show/Hide Reagents"] f.reagentToggle:SetScript('OnEnter', B.Tooltip_Show) @@ -1841,7 +1841,7 @@ function B:ConstructContainerFrame(name, isBank) f.depositButton:Size(18) f.depositButton:SetTemplate() f.depositButton:Point('RIGHT', f.reagentToggle, 'LEFT', -5, 0) - B:SetButtonTexture(f.depositButton, 450905) -- Interface/ICONS/misc_arrowdown + B:SetButtonTexture(f.depositButton, 450905) -- Interface\ICONS\misc_arrowdown f.depositButton:StyleButton(nil, true) f.depositButton.ttText = L["Deposit Reagents"] f.depositButton:SetScript('OnEnter', B.Tooltip_Show) @@ -1899,7 +1899,7 @@ function B:ConstructContainerFrame(name, isBank) f.purchaseBagButton:Size(18) f.purchaseBagButton:SetTemplate() f.purchaseBagButton:Point('RIGHT', f.bagsButton, 'LEFT', -5, 0) - B:SetButtonTexture(f.purchaseBagButton, 133784) -- Interface/ICONS/INV_Misc_Coin_01 + B:SetButtonTexture(f.purchaseBagButton, 133784) -- Interface\ICONS\INV_Misc_Coin_01 f.purchaseBagButton:StyleButton(nil, true) f.purchaseBagButton.ttText = L["Purchase Bags"] f.purchaseBagButton:SetScript('OnEnter', B.Tooltip_Show) @@ -1965,7 +1965,7 @@ function B:ConstructContainerFrame(name, isBank) f.keyButton:Size(18) f.keyButton:SetTemplate() f.keyButton:Point('RIGHT', f.bagsButton, 'LEFT', -5, 0) - B:SetButtonTexture(f.keyButton, 134237) -- Interface/ICONS/INV_Misc_Key_03 + B:SetButtonTexture(f.keyButton, 134237) -- Interface\ICONS\INV_Misc_Key_03 f.keyButton:StyleButton(nil, true) f.keyButton.ttText = BINDING_NAME_TOGGLEKEYRING f.keyButton:SetScript('OnEnter', B.Tooltip_Show) @@ -1978,7 +1978,7 @@ function B:ConstructContainerFrame(name, isBank) f.vendorGraysButton:Size(18) f.vendorGraysButton:SetTemplate() f.vendorGraysButton:Point('RIGHT', not E.Retail and f.keyButton or f.bagsButton, 'LEFT', -5, 0) - B:SetButtonTexture(f.vendorGraysButton, 133784) -- Interface/ICONS/INV_Misc_Coin_01 + B:SetButtonTexture(f.vendorGraysButton, 133784) -- Interface\ICONS\INV_Misc_Coin_01 f.vendorGraysButton:StyleButton(nil, true) f.vendorGraysButton.ttText = not E.Retail and L["Vendor / Delete Grays"] or L["Vendor Grays"] f.vendorGraysButton.ttValue = B.GetGraysValue @@ -2093,7 +2093,7 @@ function B:ConstructContainerButton(f, bagID, slotID) slot.keyringTexture = slot:CreateTexture(nil, 'BORDER') slot.keyringTexture:SetAlpha(0.5) slot.keyringTexture:SetInside(slot) - slot.keyringTexture:SetTexture(130980) -- Interface/ContainerFrame/KeyRing-Bag-Icon + slot.keyringTexture:SetTexture(130980) -- Interface\ContainerFrame\KeyRing-Bag-Icon slot.keyringTexture:SetTexCoord(unpack(E.TexCoords)) slot.keyringTexture:SetDesaturated(true) end diff --git a/ElvUI/Core/Modules/Maps/Minimap.lua b/ElvUI/Core/Modules/Maps/Minimap.lua index 29b862ccdf..ee3f4d7810 100644 --- a/ElvUI/Core/Modules/Maps/Minimap.lua +++ b/ElvUI/Core/Modules/Maps/Minimap.lua @@ -57,7 +57,7 @@ if E.Wrath and E.mylevel >= _G.SHOW_PVP_LEVEL then end if E.Retail or E.Wrath then - tinsert(menuList, { text = _G.COLLECTIONS, microOffset = 'CollectionsMicroButton', func = function() _G.ToggleCollectionsJournal() end, icon = E.Media.Textures.GoldCoins }) -- Interface/ICONS/INV_Misc_Coin_01 + tinsert(menuList, { text = _G.COLLECTIONS, microOffset = 'CollectionsMicroButton', func = function() _G.ToggleCollectionsJournal() end, icon = E.Media.Textures.GoldCoins }) -- Interface\ICONS\INV_Misc_Coin_01 tinsert(menuList, { text = _G.ACHIEVEMENT_BUTTON, microOffset = 'AchievementMicroButton', func = function() _G.ToggleAchievementFrame() end }) tinsert(menuList, { text = _G.LFG_TITLE, microOffset = E.Retail and 'LFDMicroButton' or 'LFGMicroButton', func = function() if E.Retail then _G.ToggleLFDParentFrame() else _G.PVEFrame_ToggleFrame() end end }) tinsert(menuList, { text = L["Calendar"], func = function() _G.GameTimeFrame:Click() end, icon = 235486}) -- Interface\Calendar\MeetingIcon diff --git a/ElvUI/Core/Modules/Misc/Loot.lua b/ElvUI/Core/Modules/Misc/Loot.lua index 8ec9852bdc..7be5194e84 100644 --- a/ElvUI/Core/Modules/Misc/Loot.lua +++ b/ElvUI/Core/Modules/Misc/Loot.lua @@ -302,7 +302,7 @@ function M:LOOT_OPENED(_, autoloot) slot.name:SetText(L["No Loot"]) slot.name:SetTextColor(color.r, color.g, color.b) - slot.icon:SetTexture(136511) -- Interface/PaperDoll/UI-PaperDoll-Slot-Bag + slot.icon:SetTexture(136511) -- Interface\PaperDoll\UI-PaperDoll-Slot-Bag max_width = max(max_width, slot.name:GetStringWidth()) diff --git a/ElvUI/Core/Modules/Skins/Ace3.lua b/ElvUI/Core/Modules/Skins/Ace3.lua index 4fe101d0e1..4d28072b14 100644 --- a/ElvUI/Core/Modules/Skins/Ace3.lua +++ b/ElvUI/Core/Modules/Skins/Ace3.lua @@ -442,7 +442,7 @@ function S:Ace3_RegisterAsContainer(widget) if widget.sizer_se then for _, Region in next, { widget.sizer_se:GetRegions() } do if Region:IsObjectType('Texture') then - Region:SetTexture(137057) -- Interface/Tooltips/UI-Tooltip-Border + Region:SetTexture(137057) -- Interface\Tooltips\UI-Tooltip-Border end end end diff --git a/ElvUI/Core/Modules/Skins/Skins.lua b/ElvUI/Core/Modules/Skins/Skins.lua index eeb8407c36..83d5769898 100644 --- a/ElvUI/Core/Modules/Skins/Skins.lua +++ b/ElvUI/Core/Modules/Skins/Skins.lua @@ -1875,9 +1875,9 @@ do -- Handle collapse if skip or not texture then return end if type(texture) == 'number' then - if texture == 130838 then -- Interface/Buttons/UI-PlusButton-UP + if texture == 130838 then -- Interface\Buttons\UI-PlusButton-UP button:SetNormalTexture(E.Media.Textures.PlusButton, true) - elseif texture == 130821 then -- Interface/Buttons/UI-MinusButton-UP + elseif texture == 130821 then -- Interface\Buttons\UI-MinusButton-UP button:SetNormalTexture(E.Media.Textures.MinusButton, true) end elseif strfind(texture, 'Plus') or strfind(texture, 'Closed') then diff --git a/ElvUI/Mainline/Modules/Skins/Alerts.lua b/ElvUI/Mainline/Modules/Skins/Alerts.lua index 89e3939314..08505c8f33 100644 --- a/ElvUI/Mainline/Modules/Skins/Alerts.lua +++ b/ElvUI/Mainline/Modules/Skins/Alerts.lua @@ -218,7 +218,7 @@ local function SkinInvasionAlert(frame) -- Icon border if icon and icon:IsObjectType('Texture') then - if icon:GetTexture() == 236293 then -- interface/icons/ability_warlock_demonicpower + if icon:GetTexture() == 236293 then -- interface\icons\ability_warlock_demonicpower icon.b = CreateFrame('Frame', nil, frame) icon.b:SetTemplate() icon.b:SetOutside(icon) diff --git a/ElvUI/Mainline/Modules/Skins/LFG.lua b/ElvUI/Mainline/Modules/Skins/LFG.lua index 227e68d40a..c5409b4495 100644 --- a/ElvUI/Mainline/Modules/Skins/LFG.lua +++ b/ElvUI/Mainline/Modules/Skins/LFG.lua @@ -128,9 +128,9 @@ function S:LookingForGroupFrames() S:HandleButton(_G.LFDQueueFramePartyBackfillBackfillButton) S:HandleButton(_G.LFDQueueFramePartyBackfillNoBackfillButton) - _G.GroupFinderFrame.groupButton1.icon:SetTexture(133076) -- interface/icons/inv_helmet_08.blp - _G.GroupFinderFrame.groupButton2.icon:SetTexture(133074) -- interface/icons/inv_helmet_06.blp - _G.GroupFinderFrame.groupButton3.icon:SetTexture(464820) -- interface/icons/achievement_general_stayclassy.blp + _G.GroupFinderFrame.groupButton1.icon:SetTexture(133076) -- interface\icons\inv_helmet_08.blp + _G.GroupFinderFrame.groupButton2.icon:SetTexture(133074) -- interface\icons\inv_helmet_06.blp + _G.GroupFinderFrame.groupButton3.icon:SetTexture(464820) -- interface\icons\achievement_general_stayclassy.blp _G.LFGDungeonReadyStatus:StripTextures() _G.LFGDungeonReadyStatus:SetTemplate('Transparent') diff --git a/ElvUI/Mainline/Modules/Skins/ObjectiveTracker.lua b/ElvUI/Mainline/Modules/Skins/ObjectiveTracker.lua index 5031a18926..4578b091c4 100644 --- a/ElvUI/Mainline/Modules/Skins/ObjectiveTracker.lua +++ b/ElvUI/Mainline/Modules/Skins/ObjectiveTracker.lua @@ -219,7 +219,7 @@ function S:ObjectiveTrackerFrame() local minimize = _G.ObjectiveTrackerFrame.HeaderMenu.MinimizeButton minimize:StripTextures(nil, true) minimize:Size(16) - minimize:SetHighlightTexture(130837, 'ADD') -- Interface/Buttons/UI-PlusButton-Hilight + minimize:SetHighlightTexture(130837, 'ADD') -- Interface\Buttons\UI-PlusButton-Hilight minimize.tex = minimize:CreateTexture(nil, 'OVERLAY') minimize.tex:SetTexture(E.Media.Textures.MinusButton) minimize.tex:SetInside() diff --git a/ElvUI/Mainline/Modules/Skins/PVP.lua b/ElvUI/Mainline/Modules/Skins/PVP.lua index 73378b9f53..d1d34d0bac 100644 --- a/ElvUI/Mainline/Modules/Skins/PVP.lua +++ b/ElvUI/Mainline/Modules/Skins/PVP.lua @@ -49,9 +49,9 @@ function S:Blizzard_PVPUI() local PVPQueueFrame = _G.PVPQueueFrame PVPQueueFrame.HonorInset:StripTextures() - PVPQueueFrame.CategoryButton1.Icon:SetTexture(236396) -- interface/icons/achievement_bg_winwsg.blp - PVPQueueFrame.CategoryButton2.Icon:SetTexture(236368) -- interface/icons/achievement_bg_killxenemies_generalsroom.blp - PVPQueueFrame.CategoryButton3.Icon:SetTexture(464820) -- interface/icons/achievement_general_stayclassy.blp + PVPQueueFrame.CategoryButton1.Icon:SetTexture(236396) -- interface\icons\achievement_bg_winwsg.blp + PVPQueueFrame.CategoryButton2.Icon:SetTexture(236368) -- interface\icons\achievement_bg_killxenemies_generalsroom.blp + PVPQueueFrame.CategoryButton3.Icon:SetTexture(464820) -- interface\icons\achievement_general_stayclassy.blp local SeasonReward = PVPQueueFrame.HonorInset.RatedPanel.SeasonRewardFrame SeasonReward:CreateBackdrop() diff --git a/ElvUI/Mainline/Modules/Skins/PetBattle.lua b/ElvUI/Mainline/Modules/Skins/PetBattle.lua index f315ab3458..ec48c437b9 100644 --- a/ElvUI/Mainline/Modules/Skins/PetBattle.lua +++ b/ElvUI/Mainline/Modules/Skins/PetBattle.lua @@ -289,7 +289,7 @@ function S:PetBattleFrame() infoBar:ClearAllPoints() infoBar.healthBarWidth = 40 - infoBar.BorderDead:SetTexture(629739) -- Interface/PetBattles/DeadPetIcon + infoBar.BorderDead:SetTexture(629739) -- Interface\PetBattles\DeadPetIcon infoBar.BorderDead:SetTexCoord(0, 1, 0, 1) infoBar.BorderDead:ClearAllPoints() infoBar.BorderDead:Point('TOPLEFT', -3, 4) diff --git a/ElvUI/Mainline/Modules/Skins/WorldMap.lua b/ElvUI/Mainline/Modules/Skins/WorldMap.lua index cc4e32a8a3..c10b086a92 100644 --- a/ElvUI/Mainline/Modules/Skins/WorldMap.lua +++ b/ElvUI/Mainline/Modules/Skins/WorldMap.lua @@ -40,7 +40,7 @@ local function NotifyDialogShow(_, dialog) minimize.tex:SetTexture(E.Media.Textures.MinusButton) minimize.tex:SetInside() - minimize:SetHighlightTexture(130837, 'ADD') -- Interface/Buttons/UI-PlusButton-Hilight + minimize:SetHighlightTexture(130837, 'ADD') -- Interface\Buttons\UI-PlusButton-Hilight end dialog.isSkinned = true @@ -184,7 +184,7 @@ function S:WorldMapFrame() S:HandleDropDownBox(Dropdown) -- NavBar handled in ElvUI/modules/skins/misc Tracking:StripTextures() - Tracking.Icon:SetTexture(136460) -- Interface/Minimap/Tracking/None + Tracking.Icon:SetTexture(136460) -- Interface\Minimap\Tracking/None Tracking:SetHighlightTexture(136460, 'ADD') local TrackingHighlight = Tracking:GetHighlightTexture() @@ -194,7 +194,7 @@ function S:WorldMapFrame() Pin.Icon:SetAtlas('Waypoint-MapPin-Untracked') Pin.ActiveTexture:SetAtlas('Waypoint-MapPin-Tracked') Pin.ActiveTexture:SetAllPoints(Pin.Icon) - Pin:SetHighlightTexture(3500068, 'ADD') -- Interface/Waypoint/WaypoinMapPinUI + Pin:SetHighlightTexture(3500068, 'ADD') -- Interface\Waypoint\WaypoinMapPinUI local PinHighlight = Pin:GetHighlightTexture() PinHighlight:SetAllPoints(Pin.Icon) diff --git a/ElvUI/Wrath/Modules/Skins/LFG.lua b/ElvUI/Wrath/Modules/Skins/LFG.lua index 2c0e3bea5b..e75892f994 100644 --- a/ElvUI/Wrath/Modules/Skins/LFG.lua +++ b/ElvUI/Wrath/Modules/Skins/LFG.lua @@ -87,9 +87,9 @@ function S:LookingForGroupFrames() S:HandleButton(_G.LFDQueueFramePartyBackfillBackfillButton) S:HandleButton(_G.LFDQueueFramePartyBackfillNoBackfillButton) - _G.GroupFinderFrame.groupButton1.icon:SetTexture(133076) -- interface/icons/inv_helmet_08.blp - _G.GroupFinderFrame.groupButton2.icon:SetTexture(133074) -- interface/icons/inv_helmet_06.blp - _G.GroupFinderFrame.groupButton3.icon:SetTexture(464820) -- interface/icons/achievement_general_stayclassy.blp + _G.GroupFinderFrame.groupButton1.icon:SetTexture(133076) -- interface\icons\inv_helmet_08.blp + _G.GroupFinderFrame.groupButton2.icon:SetTexture(133074) -- interface\icons\inv_helmet_06.blp + _G.GroupFinderFrame.groupButton3.icon:SetTexture(464820) -- interface\icons\achievement_general_stayclassy.blp _G.LFGDungeonReadyStatus:StripTextures() _G.LFGDungeonReadyStatus:SetTemplate('Transparent') diff --git a/ElvUI_Libraries/Core/oUF/elements/castbar.lua b/ElvUI_Libraries/Core/oUF/elements/castbar.lua index 977e963f92..d1d1b0c021 100644 --- a/ElvUI_Libraries/Core/oUF/elements/castbar.lua +++ b/ElvUI_Libraries/Core/oUF/elements/castbar.lua @@ -90,7 +90,7 @@ A default texture will be applied to the StatusBar and Texture widgets if they d local _, ns = ... local oUF = ns.oUF -local FALLBACK_ICON = 136243 -- Interface/ICONS/Trade_Engineering +local FALLBACK_ICON = 136243 -- Interface\ICONS\Trade_Engineering local FAILED = _G.FAILED or 'Failed' local INTERRUPTED = _G.INTERRUPTED or 'Interrupted' local CASTBAR_STAGE_DURATION_INVALID = -1 -- defined in FrameXML/CastingBarFrame.lua From e968dbd3919c125c9d4e9647cad5bff7dc3737ec Mon Sep 17 00:00:00 2001 From: Simpy Date: Sun, 7 Jan 2024 15:35:09 -0500 Subject: [PATCH 32/55] add dynamic font at size 15 by name ElvUIFontBig --- ElvUI/Core/Media/Load_Media.xml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/ElvUI/Core/Media/Load_Media.xml b/ElvUI/Core/Media/Load_Media.xml index 6bd1afc2da..1668f8bcaa 100644 --- a/ElvUI/Core/Media/Load_Media.xml +++ b/ElvUI/Core/Media/Load_Media.xml @@ -1,6 +1,35 @@