Merge branch 'development'

ElvUI_MerathilisUI/CHANGELOG.md

@@ -1,13 +1,7 @@
 ### Changes ###
 
-## Retail: ##
-  * Update for Patch 9.2 - nothing mutch changed
-  * Mainly updated some skins
+  * Added Cosmic Healing Potion to the AutoButtons -- Retail
+  * Add an option to disable my button skin
+  * Updated some skins
+  * Fixed an issue with the AddOn "Infinite Raid Tools"
 
-
-## Classic: ##
-  * Take account for the latest ElvUI changes
-
-
-## TBC: ##
-  * Take account for the latest ElvUI changes

ElvUI_MerathilisUI/CHANGELOG.txt

@@ -1,11 +1,5 @@
-[b][color=orange]Retail: v4.89[/color], 22.02.2022[/b][list]
-[*][b][color=orange]Retail:[/color][/b]
-[*]Update for Patch 9.2 - nothing mutch changed
-[*]Fix an error on the Encounter Journal Skin
-
-[*][b][color=orange]Classic:[/color][/b]
-[*]Take account for the latest ElvUI changes
-
-[*][b][color=orange]TBC:[/color][/b]
-[*]Take account for the latest ElvUI changes[/list]
-
+[b][color=orange]Retail: v4.90[/color], 07.03.2022[/b][list]
+[*]Added Cosmic Healing Potion to the AutoButtons -- Retail
+[*]Add an option to disable my button skin
+[*]Updated some skins
+[*]Fixed an issue with the AddOn "Infinite Raid Tools"[/list]

ElvUI_MerathilisUI/Core/General/Changelog.lua

@@ -15,17 +15,11 @@ local DISABLED_FONT_COLOR = DISABLED_FONT_COLOR
 -- GLOBALS: MERData, UISpecialFrames, MerathilisUIChangeLog, DISABLED_FONT_COLOR
 
 local ChangeLogData = {
-	"Retail:",
-		"• Update for Patch 9.2 - nothing mutch changed",
-		"• Mainly updated some skins",
-
-	" ",
-	"Classic:",
-		"• Take account for the latest ElvUI changes",
-
-	" ",
-	"TBC:",
-		"• Take account for the latest ElvUI changes",
+	"Changes:",
+		"• Added Cosmic Healing Potion to the AutoButtons -- Retail",
+		"• Add an option to disable my button skin",
+		"• Updated some skins",
+		"• Fixed an issue with the AddOn Infinite Raid Tools",
 
 	" ",
 	"Notes:",

ElvUI_MerathilisUI/Core/Modules/Actionbars/Actionbars.lua

@@ -181,11 +181,6 @@ function module:Initialize()
 				MER:CreateShadow(button)
 			end
 		end
-
-		for i = 1, _G.ExtraActionBarFrame:GetNumChildren() do
-			local button = _G["ExtraActionButton" .. i]
-			MER:CreateBackdropShadow(button.backdrop, true)
-		end
 	end
 
 	self:SecureHook(AB, "SetupFlyoutButton", function(_, button)

ElvUI_MerathilisUI/Core/Modules/AutoButtons/AutoButtons.lua

@@ -126,6 +126,7 @@ local potionsShadowlands = {
 	176811,
 	183823,
 	184090,
+	187802,
 }
 
 -- Flasks (require level >= 40)
@@ -366,6 +367,8 @@ local torghastItems = {
 }
 
 local openableItems = {
+	54537,
+	92794,
 	171209,
 	171210,
 	171211,
@@ -489,6 +492,7 @@ local openableItems = {
 	187576,
 	187577,
 	187817,
+	190610,
 }
 
 local questItemList = {}

ElvUI_MerathilisUI/Core/Modules/Skins/Api.lua

@@ -227,6 +227,9 @@ end
 
 -- Buttons
 function MERS:Reskin(button, strip, isDecline, noStyle, createBackdrop, template, noGlossTex, overrideTex, frameLevel, defaultTemplate, noGradient)
+	if not E.private.muiSkins then E.private.muiSkins = {} end
+	if not E.private.muiSkins.buttonStyle then return end
+
 	assert(button, "doesn't exist!")
 
 	if not button or button.IsSkinned then return end

ElvUI_MerathilisUI/Core/Modules/Skins/Options.lua

@@ -69,6 +69,13 @@ local function SkinsTable()
 						get = function(info) return E.db.mui.general[ info[#info] ] end,
 						set = function(info, value) E.db.mui.general[ info[#info] ] = value; E:StaticPopup_Show("PRIVATE_RL") end,
 					},
+					buttonStyle = {
+						order = 3,
+						type = "toggle",
+						name = E.NewSign..L["MerathilisUI Button Style"],
+						get = function(info) return E.private.muiSkins[ info[#info] ] end,
+						set = function(info, value) E.private.muiSkins[ info[#info] ] = value; E:StaticPopup_Show("PRIVATE_RL") end,
+					},
 				},
 			},
 			merchant = {

ElvUI_MerathilisUI/Core/Settings/Private.lua

@@ -17,6 +17,7 @@ V.muiMisc = {
 -- Skins options
 ----------------------------------------------------------------------------------------
 V.muiSkins = {
+	buttonStyle = true,
 	blizzard = {
 		character = true,
 		encounterjournal = true,

ElvUI_MerathilisUI/ElvUI_MerathilisUI.toc

@@ -2,7 +2,7 @@
 ## Interface-Classic: 11307
 ## Interface-BCC: 20502
 ## Author: Merathilis
-## Version: 4.89
+## Version: 4.90
 ## Title: |cFF1784d1ElvUI|r |cffffffffMerathilis|r|cffff7d0aUI|r
 ## Notes: A decorative edit for ElvUI + additional features.
 ## Notes-deDE: Eine dekorative Erweiterung für ElvUI + einige zusätzliche Funktionen.
@@ -12,7 +12,7 @@
 ## SavedVariablesPerCharacter: MERDataPerChar
 ## OptionalDeps: SharedMedia, BigWigs, ls_Toasts
 ## X-Credits: Benik, Blazeflack, Azilroka, Simpy, Nihilistzsche, Darth Predator, fgprodigal, siweia, Solor, Elv, fang2hou & all AddOn Authors who inspired me.
-## X-ElvVersion: 12.64
+## X-ElvVersion: 12.66
 ## X-Curse-Project-Name: MerathilisUI
 ## X-Curse-Project-ID: 97589
 ## X-WoWI-ID: 24117

ElvUI_MerathilisUI/ElvUI_MerathilisUI_Classic.toc

@@ -1,6 +1,6 @@
 ## Interface: 11307
 ## Author: Merathilis
-## Version: 4.89
+## Version: 4.90
 ## Title: |cFF1784d1ElvUI|r |cffffffffMerathilis|r|cffff7d0aUI|r
 ## Notes: A decorative edit for ElvUI + additional features.
 ## Notes-deDE: Eine dekorative Erweiterung für ElvUI + einige zusätzliche Funktionen.
@@ -10,7 +10,7 @@
 ## SavedVariablesPerCharacter: MERDataPerChar
 ## OptionalDeps: SharedMedia, BigWigs, ls_Toasts
 ## X-Credits: Benik, Blazeflack, Azilroka, Simpy, Nihilistzsche, Darth Predator, fgprodigal, siweia, Solor, Elv, fang2hou & all AddOn Authors who inspired me.
-## X-ElvVersion: 1.59
+## X-ElvVersion: 1.62
 ## X-Curse-Project-Name: MerathilisUI
 ## X-Curse-Project-ID: 97589
 ## X-WoWI-ID: 24117

ElvUI_MerathilisUI/ElvUI_MerathilisUI_TBC.toc

@@ -1,6 +1,6 @@
 ## Interface: 20502
 ## Author: Merathilis
-## Version: 4.89
+## Version: 4.90
 ## Title: |cFF1784d1ElvUI|r |cffffffffMerathilis|r|cffff7d0aUI|r
 ## Notes: A decorative edit for ElvUI + additional features.
 ## Notes-deDE: Eine dekorative Erweiterung für ElvUI + einige zusätzliche Funktionen.
@@ -10,7 +10,7 @@
 ## SavedVariablesPerCharacter: MERDataPerChar
 ## OptionalDeps: SharedMedia, BigWigs, ls_Toasts
 ## X-Credits: Benik, Blazeflack, Azilroka, Simpy, Nihilistzsche, Darth Predator, fgprodigal, siweia, Solor, Elv, fang2hou & all AddOn Authors who inspired me.
-## X-ElvVersion: 2.33
+## X-ElvVersion: 2.36
 ## X-Curse-Project-Name: MerathilisUI
 ## X-Curse-Project-ID: 97589
 ## X-WoWI-ID: 24117

ElvUI_MerathilisUI/Mainline/Modules/Skins/AddOns/Blizzard_ClickBindingUI.lua

@@ -0,0 +1,31 @@
+local MER, E, L, V, P, G = unpack(select(2, ...))
+local MERS = MER:GetModule('MER_Skins')
+local S = E:GetModule('Skins')
+
+local _G = _G
+local hooksecurefunc = hooksecurefunc
+
+local function HandleScrollChild(self)
+	for i = 1, self.ScrollTarget:GetNumChildren() do
+		local child = select(i, self.ScrollTarget:GetChildren())
+		local icon = child and child.Icon
+		if icon and not icon.IsChanged then
+			if child and child.backdrop then
+				child.backdrop:SetTemplate('Transparent')
+				MERS:CreateGradient(child.backdrop)
+			end
+			icon.IsChanged = true
+		end
+	end
+end
+
+local function LoadSkin()
+	if not E.private.skins.blizzard.enable and E.private.skins.blizzard.binding or not E.private.muiSkins.blizzard.binding then return end
+
+	local frame = _G.ClickBindingFrame
+	frame:Styling()
+
+	hooksecurefunc(frame.ScrollBox, 'Update', HandleScrollChild)
+end
+
+S:AddCallbackForAddon("Blizzard_ClickBindingUI", "mUIClickBinding", LoadSkin)

ElvUI_MerathilisUI/Mainline/Modules/Skins/AddOns/Blizzard_OrderHallUI.lua

@@ -1,8 +1,8 @@
 local MER, E, L, V, P, G = unpack(select(2, ...))
 local S = E:GetModule('Skins')
 
--- Cache global variables
 local _G = _G
+local hooksecurefunc = hooksecurefunc
 
 local function LoadSkin()
 	if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.orderhall ~= true or E.private.muiSkins.blizzard.orderhall ~= true then return end
@@ -14,6 +14,17 @@ local function LoadSkin()
 	OrderHallTalentFrame.backdrop:Styling()
 
 	MER:CreateBackdropShadow(OrderHallTalentFrame)
+
+	hooksecurefunc(OrderHallTalentFrame, "RefreshAllData", function(self)
+		if self.talentRankPool then
+			for rank in self.talentRankPool:EnumerateActive() do
+				if not rank.styled then
+					rank.Background:SetAlpha(0)
+					rank.styled = true
+				end
+			end
+		end
+	end)
 end
 
 S:AddCallbackForAddon("Blizzard_OrderHallUI", "mUIOrderHall", LoadSkin)

ElvUI_MerathilisUI/Mainline/Modules/Skins/AddOns/Load_Addons.xml

@@ -15,6 +15,7 @@
 	<Script file="Blizzard_ChallengesUI.lua"/>
 	<Script file="Blizzard_Channels.lua"/>
 	<Script file="Blizzard_ChromieTimeUI.lua"/>
+	<Script file="Blizzard_ClickBindingUI.lua"/>
 	<Script file="Blizzard_Collections.lua"/>
 	<Script file="Blizzard_Communities.lua"/>
 	<Script file="Blizzard_Contribution.lua"/>

ElvUI_MerathilisUI/Mainline/Modules/Skins/FrameXML/MailFrame.lua

@@ -65,7 +65,7 @@ local function LoadSkin()
 	-- SendMailFrame
 	local SendMailFrame = _G.SendMailFrame
 	local SendMailScrollFrame = _G.SendMailScrollFrame
-	SendMailScrollFrame:CreateBackdrop("Transparent")
+	SendMailScrollFrame:SetTemplate("Transparent")
 
 	for i = 4, 7 do
 		select(i, SendMailFrame:GetRegions()):Hide()
@@ -78,6 +78,7 @@ local function LoadSkin()
 	-- OpenMailFrame
 	local OpenMailFrame = _G.OpenMailFrame
 	OpenMailFrame:Styling()
+	_G.OpenMailScrollFrame:SetTemplate('Transparent')
 	MER:CreateShadow(OpenMailFrame)
 
 	OpenMailFrame:SetPoint("TOPLEFT", _G.InboxFrame, "TOPRIGHT", 5, 0)