Merge branch 'main' into ptr

Author: kodewdle

CHANGELOG.md

@@ -1,3 +1,17 @@
+### Version 13.85 [ February 25th 2025 ]
+*   **Cataclysm fixes:**
+    *   Boss Button
+    *   Currency Datatext
+*   Range options can now accept a dragged spell from the spellbook as the input.
+*   Boss unitframe castbar has positioning options similar to party now.
+*   Datatext Spell Hit now has a label option.
+*   Testing Unitframes with the Show Frames button can now show the dead backdrop and some status tags.
+*   Custom Class Colors not working properly when no other addons are enabled.
+*   Nameplate Style Filter trigger for Player Role now works again.
+*   PVP Capture widget should be skinned correctly again.
+*   Nameplate friendly environment condition settings can be changed without exploding.
+*   Chat editbox outline will now match the Chat font outline setting.
+
 ### Version 13.84 [ February 18th 2025 ]
 *   Fallback checking for Range of Unitframes slightly adjusted (should help Hunters and Rogues).
 *   Datatexts Mana Regen and Heal Power have a label option now.

ElvUI/Core/init.lua

@@ -127,7 +127,7 @@ end
 function E:ParseVersionString(addon)
 	local version = GetAddOnMetadata(addon, 'Version')
 	if strfind(version, 'project%-version') then
-		return 13.84, '13.84-git', nil, true
+		return 13.85, '13.85-git', nil, true
 	else
 		local release, extra = strmatch(version, '^v?([%d.]+)(.*)')
 		return tonumber(release), release..extra, extra ~= ''

ElvUI/Mainline/Modules/Skins/AddonManager.lua

@@ -8,9 +8,6 @@ local hooksecurefunc = hooksecurefunc
 local GetAddOnInfo = C_AddOns.GetAddOnInfo
 
 local function HandleButton(entry, treeNode)
-	local data = treeNode:GetData()
-	local _, _, _, _, reason = GetAddOnInfo(data.addonIndex)
-
 	if not entry.IsSkinned then
 		S:HandleCheckBox(entry.Enabled)
 		S:HandleButton(entry.LoadAddonButton)
@@ -24,23 +21,27 @@ local function HandleButton(entry, treeNode)
 		entry.IsSkinned = true
 	end
 
-	local checkstate = E:GetAddOnEnableState(data.addonIndex)
-	if checkstate == 2 then
-		entry.Status:SetTextColor(0.7, 0.7, 0.7)
-	else
-		entry.Status:SetTextColor(0.4, 0.4, 0.4)
-	end
+	local data = treeNode:GetData()
+	if data then
+		local checkstate = E:GetAddOnEnableState(data.addonIndex)
+		if checkstate == 2 then
+			entry.Status:SetTextColor(0.7, 0.7, 0.7)
+		else
+			entry.Status:SetTextColor(0.4, 0.4, 0.4)
+		end
 
-	local checktex = entry.Enabled:GetCheckedTexture()
-	if reason == 'DEP_DISABLED' then
-		checktex:SetVertexColor(0.6, 0.6, 0.6)
-		checktex:SetDesaturated(true)
-	elseif checkstate == 1 then
-		checktex:SetVertexColor(1, 0.8, 0.1)
-		checktex:SetDesaturated(false)
-	elseif checkstate == 2 then
-		checktex:SetVertexColor(unpack(E.media.rgbvaluecolor))
-		checktex:SetDesaturated(false)
+		local _, _, _, _, reason = GetAddOnInfo(data.addonIndex)
+		local checktex = entry.Enabled:GetCheckedTexture()
+		if reason == 'DEP_DISABLED' then
+			checktex:SetVertexColor(0.6, 0.6, 0.6)
+			checktex:SetDesaturated(true)
+		elseif checkstate == 1 then
+			checktex:SetVertexColor(1, 0.8, 0.1)
+			checktex:SetDesaturated(false)
+		elseif checkstate == 2 then
+			checktex:SetVertexColor(unpack(E.media.rgbvaluecolor))
+			checktex:SetDesaturated(false)
+		end
 	end
 end
 

ElvUI/Mainline/Modules/Skins/WorldMap.lua

@@ -3,6 +3,7 @@ local S = E:GetModule('Skins')
 local TT = E:GetModule('Tooltip')
 
 local _G = _G
+local next = next
 local unpack = unpack
 local hooksecurefunc = hooksecurefunc
 
@@ -179,6 +180,7 @@ function S:WorldMapFrame()
 	QuestScrollFrame.BorderFrame:SetAlpha(0)
 	QuestScrollFrame.Background:SetAlpha(0)
 	QuestScrollFrame.Contents.Separator:SetAlpha(0)
+
 	QuestScrollFrame:SetTemplate()
 	SkinHeaders(QuestScrollFrame.Contents.StoryHeader)
 	S:HandleEditBox(QuestScrollFrame.SearchBox)
@@ -258,54 +260,56 @@ function S:WorldMapFrame()
 	MapLegendScroll:SetTemplate()
 	S:HandleTrimScrollBar(MapLegendScroll.ScrollBar)
 
-	-- 11.1 Stuff
-	local EventsFrame = QuestMapFrame.EventsFrame
-	EventsFrame.TitleText:FontTemplate(nil, 16)
-	EventsFrame.BorderFrame:SetAlpha(0)
-
-	--[[
-		TO DO: Fill the inlay with some love
-	]]
-
-	local EventsFrameScroll = EventsFrame.ScrollBox
-	EventsFrameScroll:StripTextures()
-	EventsFrameScroll:SetTemplate()
-	S:HandleTrimScrollBar(EventsFrame.ScrollBar)
-
-	-- New Side Tabs
+	-- 11.1 New Side Tabs
 	local tabs = {
 		QuestMapFrame.QuestsTab,
 		QuestMapFrame.EventsTab,
 		QuestMapFrame.MapLegendTab
 	}
 
-	for _, tab in pairs(tabs) do
-		tab.Background:SetAlpha(0)
+	for _, tab in next, tabs do
 		tab:Size(34, 44)
-
 		tab:CreateBackdrop()
 		tab.backdrop:Point('TOPLEFT', 2, -2)
 		tab.backdrop:Point('BOTTOMRIGHT', -2, 2)
 
-		tab.SelectedTexture:SetDrawLayer('ARTWORK')
-		tab.SelectedTexture:ClearAllPoints()
-		tab.SelectedTexture:SetPoint('TOPLEFT', 4, -4)
-		tab.SelectedTexture:SetPoint('BOTTOMRIGHT', -4, 4)
-		tab.SelectedTexture:SetColorTexture(1, 0.82, 0, 0.3)
-
-		for _, region in next, {tab:GetRegions()} do
-			if region:IsObjectType('Texture') then
-				if region:GetAtlas() == 'QuestLog-Tab-side-Glow-hover' then
-					region:Point('TOPLEFT', 4, -4)
-					region:Point('BOTTOMRIGHT', -4, 4)
-					region:SetColorTexture(1, 1, 1, 0.3)
-				end
+		if tab.Background then
+			tab.Background:SetAlpha(0)
+		end
+
+		if tab.SelectedTexture then
+			tab.SelectedTexture:SetDrawLayer('ARTWORK')
+			tab.SelectedTexture:ClearAllPoints()
+			tab.SelectedTexture:SetPoint('TOPLEFT', 4, -4)
+			tab.SelectedTexture:SetPoint('BOTTOMRIGHT', -4, 4)
+			tab.SelectedTexture:SetColorTexture(1, 0.82, 0, 0.3)
+		end
+
+		for _, region in next, { tab:GetRegions() } do
+			if region:IsObjectType('Texture') and region:GetAtlas() == 'QuestLog-Tab-side-Glow-hover' then
+				region:SetColorTexture(1, 1, 1, 0.3)
+				region:Point('TOPLEFT', 4, -4)
+				region:Point('BOTTOMRIGHT', -4, 4)
 			end
 		end
 	end
 
-	QuestMapFrame.QuestsTab:ClearAllPoints()
-	QuestMapFrame.QuestsTab:Point('TOPLEFT', QuestMapFrame, 'TOPRIGHT', 1, 2)
+	if QuestMapFrame.QuestsTab then
+		QuestMapFrame.QuestsTab:ClearAllPoints()
+		QuestMapFrame.QuestsTab:Point('TOPLEFT', QuestMapFrame, 'TOPRIGHT', 1, 2)
+	end
+
+	local EventsFrame = QuestMapFrame.EventsFrame
+	if EventsFrame then
+		EventsFrame.TitleText:FontTemplate(nil, 16)
+		EventsFrame.BorderFrame:SetAlpha(0)
+
+		local EventsFrameScrollBox = EventsFrame.ScrollBox
+		EventsFrameScrollBox:StripTextures()
+		EventsFrameScrollBox:SetTemplate()
+
+		S:HandleTrimScrollBar(EventsFrame.ScrollBar)
+	end
 end
 
 S:AddCallback('WorldMapFrame')

ElvUI_Libraries/Core/Ace3-ElvUI/AceGUIWidget-MultiLineEditBox-ElvUI.lua

@@ -5,7 +5,8 @@ local Type, Version = "MultiLineEditBox-ElvUI", 35
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
-local _G, pairs = _G, pairs
+local _G = _G
+local tostring, pairs = tostring, pairs
 local GetCursorInfo, ClearCursor = GetCursorInfo, ClearCursor
 local CreateFrame, UIParent = CreateFrame, UIParent
 local ACCEPT = ACCEPT

ElvUI_Libraries/Core/LibActionButton-1.0/LibActionButton-1.0.lua

@@ -1,7 +1,7 @@
 -- License: LICENSE.txt
 
 local MAJOR_VERSION = "LibActionButton-1.0-ElvUI"
-local MINOR_VERSION = 59 -- the real minor version is 119
+local MINOR_VERSION = 60 -- the real minor version is 119
 
 local LibStub = LibStub
 if not LibStub then error(MAJOR_VERSION .. " requires LibStub.") end