Merge branch 'development'

Author: Merathilis

CHANGELOG.md

@@ -1,6 +1,4 @@
 ### Changes ###
 
-  * [TradeFrame]: Blizzard made the InputMoneyFrame secure, so no AddOn can change it anymore. Looks ugly, but hey
-  * [Core]: Use xpcall to grab some more errors for the init of the Modules
-  * [TradeTabs]: Display by default Herbalism and Tailoring tab
-  * [CollectionJournal]: Fixed on of the Tabs at the bottom
+  * [Armory]: More settings and visual improvements
+  * [GameMenu]: Some more infos on the GameMenu

ElvUI_MerathilisUI/Core/Changelog/6.60.lua

@@ -0,0 +1,11 @@
+local MER = unpack(ElvUI_MerathilisUI)
+
+MER.Changelog[660] = {
+	RELEASE_DATE = "15.04.2025",
+	FIXES = {},
+	NEW = {},
+	IMPROVEMENTS = {
+		"[Armory]: More settings and visual improvements",
+		"[GameMenu]: Some more infos on the GameMenu",
+	},
+}

ElvUI_MerathilisUI/Core/Changelog/Load_Changelog.xml

@@ -48,5 +48,6 @@
 	<Script file="Previous\6.56.lua"/>
 	<Script file="Previous\6.57.lua"/>
 	<Script file="Previous\6.58.lua"/>
-	<Script file="6.59.lua"/>
+	<Script file="Previous\6.59.lua"/>
+	<Script file="6.60.lua"/>
 </Ui>

…vUI_MerathilisUI/Core/Changelog/6.59.lua …hilisUI/Core/Changelog/Previous/6.59.luaElvUI_MerathilisUI/Core/Changelog/6.59.lua renamed to ElvUI_MerathilisUI/Core/Changelog/Previous/6.59.lua ElvUI_MerathilisUI/Core/Changelog/6.59.lua renamed to ElvUI_MerathilisUI/Core/Changelog/Previous/6.59.lua

@@ -1,11 +1,10 @@
 local MER, F, E, I, V, P, G, L = unpack(ElvUI_MerathilisUI)
+F.Color = {}
 
 local _G = _G
-local pairs, select, tonumber, unpack = pairs, select, tonumber, unpack
+local pairs, select = pairs, select
 local abs = abs
 local min = min
-local format = format
-local strsub = strsub
 
 local CreateColor = CreateColor
 local GetClassColor = GetClassColor
@@ -403,6 +402,7 @@ end
 
 function F.UnitColor(unit)
 	local r, g, b = 1, 1, 1
+
 	if UnitIsPlayer(unit) then
 		local class = select(2, UnitClass(unit))
 		if class then
@@ -625,19 +625,49 @@ function F.GradientNameCustom(name, unitclass, isTarget)
 	end
 end
 
-function F.SetGradient(obj, orientation, minColor, maxColor)
+function F.Color.SetGradient(obj, orientation, minColor, maxColor)
 	if not obj then
 		return
 	end
 
-	local min = minColor or "#000000"
-	local max = maxColor or "#FFFFFF"
+	if not minColor.r or not minColor.g or not minColor.b then
+		return
+	end
+	if not maxColor.r or not maxColor.g or not maxColor.b then
+		return
+	end
+
+	obj:SetGradient(orientation, minColor, maxColor)
+end
 
-	obj:SetGradient(orientation, min, max)
+function F.Color.SetGradientRGB(obj, orientation, r1, g1, b1, a1, r2, g2, b2, a2)
+	F.Color.SetGradient(obj, orientation, CreateColor(r1, g1, b1, a1), CreateColor(r2, g2, b2, a2))
 end
 
-function F.SetGradientRGB(obj, orientation, r1, g1, b1, a1, r2, g2, b2, a2)
-	F.SetGradient(obj, orientation, CreateColor(r1, g1, b1, a1), CreateColor(r2, g2, b2, a2))
+function F.Color.UpdateGradient(obj, perc, minColor, maxColor)
+	if not minColor.r or not minColor.g or not minColor.b then
+		return
+	end
+	if not maxColor.r or not maxColor.g or not maxColor.b then
+		return
+	end
+
+	if perc >= 1 then
+		local r, g, b = maxColor:GetRGBA()
+		obj:SetRGBA(r, g, b, 1)
+		return
+	elseif perc <= 0 then
+		local r, g, b = minColor:GetRGBA()
+		obj:SetRGBA(r, g, b, 1)
+		return
+	end
+
+	obj:SetRGBA(
+		(maxColor.r * perc) + (minColor.r * (1 - perc)),
+		(maxColor.g * perc) + (minColor.g * (1 - perc)),
+		(maxColor.b * perc) + (minColor.b * (1 - perc)),
+		1
+	)
 end
 
 local progressColor = {

ElvUI_MerathilisUI/Core/Functions/Colors.lua

@@ -278,6 +278,103 @@ function F:Interval(value, minValue, maxValue)
 	return max(minValue, min(maxValue, value))
 end
 
+function F.RemoveFontTemplate(fs)
+	E.texts[fs] = nil
+end
+
+function F.GetFontColorFromDB(db, prefix)
+	-- Vars
+	if prefix == nil then
+		prefix = ""
+	end
+	local fontColor
+	local useDB = (db and prefix) and true or false
+	local colorSwitch = (useDB and db[prefix .. "color"]) or I.General.DefaultFontColor
+
+	-- Switch
+	if colorSwitch == "CUSTOM" then
+		fontColor = (useDB and db[prefix .. "color"]) or I.General.DefaultFontCustomColor
+	elseif colorSwitch == "MER" then
+		fontColor = I.Strings.Branding.ColorRGBA
+	elseif colorSwitch == "CLASS" then
+		local classColor = E:ClassColor(E.myclass, true)
+		fontColor = {
+			r = classColor.r,
+			g = classColor.g,
+			b = classColor.b,
+			a = 1,
+		}
+	elseif colorSwitch == "VALUE" then
+		fontColor = {
+			r = E.media.rgbvaluecolor[1],
+			g = E.media.rgbvaluecolor[2],
+			b = E.media.rgbvaluecolor[3],
+			a = 1,
+		}
+	else
+		fontColor = {
+			r = 1,
+			g = 1,
+			b = 1,
+			a = 1,
+		}
+	end
+
+	return fontColor
+end
+
+function F.SetFontColorFromDB(db, prefix, fs)
+	local fontColor = F.GetFontColorFromDB(db, prefix)
+	F.RemoveFontTemplate(fs)
+	fs:SetTextColor(fontColor.r, fontColor.g, fontColor.b, fontColor.a)
+end
+
+function F.SetFontScaledFromDB(db, prefix, fs, color, fontOverwrite)
+	F.SetFontFromDB(db, prefix, fs, color, fontOverwrite, true)
+end
+
+function F.GetFontPath(font)
+	font = font or I.General.DefaultFont
+
+	local lsmFont = LSM:Fetch("font", F.FontOverride(font))
+	if not lsmFont then
+		lsmFont = LSM:Fetch("font", font)
+	end -- backup to non-override font
+	if not lsmFont then
+		lsmFont = LSM:Fetch("font", I.General.DefaultFont)
+	end -- backup to normal font if not found
+	if not lsmFont then
+		lsmFont = E.media.normFont
+	end -- backup to elvui font if not found
+
+	return lsmFont
+end
+
+function F.SetFontFromDB(db, prefix, fs, color, fontOverwrite, useScaling)
+	local useDB = (db and prefix) and true or false
+	local font = (useDB and db[prefix .. "name"]) or I.General.DefaultFont
+	local size = (useDB and db[prefix .. "size"]) or I.General.DefaultFontSize
+	local outline = (useDB and db[prefix .. "style"]) or I.General.DefaultFontOutline
+
+	if fontOverwrite then
+		font = fontOverwrite
+	end
+	local lsmFont = F.GetFontPath(font)
+
+	outline = F.FontStyleOverride(font, outline)
+
+	if outline == "NONE" then
+		outline = ""
+	end
+
+	F.RemoveFontTemplate(fs)
+	fs:SetFont(lsmFont, useScaling and F.FontSizeScaled(size) or size, (not shadow and outline) or "")
+
+	if (color == nil) or (color == true) then
+		F.SetFontColorFromDB(db, prefix, fs)
+	end
+end
+
 function F.SetFontDB(text, db)
 	if not text or not text.GetFont then
 		F.Developer.LogDebug("Functions.SetFontDB: text not found")

ElvUI_MerathilisUI/Core/Functions/Core.lua

@@ -1,4 +1,5 @@
 local MER, F, E, I, V, P, G, L = unpack(ElvUI_MerathilisUI)
+F.Developer = {}
 
 local _G = _G
 local format, pairs, print, type = format, pairs, print, type
@@ -7,8 +8,6 @@ local tostring = tostring
 
 local IsAddOnLoaded = C_AddOns.IsAddOnLoaded
 
-F.Developer = {}
-
 MER.IsDev = {
 	["Asragoth"] = true,
 	["Anonia"] = true,

ElvUI_MerathilisUI/Core/Functions/Developer.lua

@@ -1,4 +1,5 @@
 local MER, F, E, I, V, P, G, L = unpack(ElvUI_MerathilisUI)
+F.Event = {}
 
 local next, pairs, select, type, unpack = next, pairs, select, type, unpack
 local rawset = rawset
@@ -10,8 +11,6 @@ local C_Timer_After = C_Timer.After
 local InCombatLockdown = InCombatLockdown
 local EventUtil = EventUtil
 
-F.Event = {}
-
 do
 	local closureGeneration = {
 		function(f)

ElvUI_MerathilisUI/Core/Functions/Event.lua

@@ -1,4 +1,5 @@
 local MER, F, E, I, V, P, G, L = unpack(ElvUI_MerathilisUI)
+F.String = {}
 
 local error = error
 local type, unpack = type, unpack
@@ -7,8 +8,6 @@ local strbyte, strfind, strlen, strsub = strbyte, strfind, strlen, strsub
 local utf8len, utf8lower, utf8sub, utf8upper = string.utf8len, string.utf8lower, string.utf8sub, string.utf8upper
 local tinsert = tinsert
 
-F.String = {}
-
 function F.String.Color(msg, color)
 	if not msg then
 		F.Developer.Print(msg)
@@ -196,6 +195,43 @@ function F.String.RGB(msg, colors)
 	end
 end
 
+function F.String.Uppercase(text)
+	if type(text) ~= "string" then
+		return text
+	end
+	return utf8upper(text)
+end
+
+function F.String.Lowercase(text)
+	if type(text) ~= "string" then
+		return text
+	end
+	return utf8lower(text)
+end
+
+function F.String.UppercaseFirstLetter(text)
+	if type(text) ~= "string" then
+		return text
+	end
+	return utf8upper(utf8sub(text, 1, 1)) .. utf8sub(text, 2)
+end
+
+function F.String.UppercaseFirstLetterOnly(text)
+	if type(text) ~= "string" then
+		return text
+	end
+	return utf8upper(utf8sub(text, 1, 1)) .. utf8lower(utf8sub(text, 2))
+end
+
+function F.String.LowercaseEnum(text)
+	if type(text) ~= "string" then
+		return text
+	end
+	return strtrim(text):gsub("_", " "):gsub("(%a)([%w_']*)", function(a, b)
+		return F.String.Uppercase(a) .. F.String.Lowercase(b)
+	end)
+end
+
 function F.String.ColorFirstLetter(text)
 	if type(text) ~= "string" then
 		return text

ElvUI_MerathilisUI/Core/Functions/Strings.lua

@@ -1,11 +1,10 @@
 local MER, F, E, I, V, P, G, L = unpack(ElvUI_MerathilisUI)
+F.Table = {}
 
 local pairs, next, type, select, unpack = pairs, next, type, select, unpack
 local tinsert, tsort = table.insert, table.sort
 local setmetatable = setmetatable
 
-F.Table = {}
-
 function F.Table.Print(tbl, indent)
 	if not indent then
 		indent = 0