Merge branch 'main' into ptr

Author: kodewdle

ElvUI/Core/Modules/Maps/Minimap.lua

@@ -681,6 +681,10 @@ end
 
 function M:SetGetMinimapShape()
 	GetMinimapShape = M.GetMinimapShape
+
+	if M.db.size then
+		Minimap:Size(M.db.size)
+	end
 end
 
 function M:Initialize()
@@ -689,8 +693,6 @@ function M:Initialize()
 
 		return
 	else
-		M:SetGetMinimapShape() -- this is just to support for other mods
-
 		local container = MinimapCluster.MinimapContainer
 		if container then
 			container:SetScale(1) -- Setting that could get set in Blizzard Edit Mode

ElvUI/Core/init.lua

@@ -385,6 +385,10 @@ function E:OnInitialize()
 	E:UpdateMedia()
 	E:InitializeInitialModules()
 
+	if E.private.general.minimap.enable then
+		E.Minimap:SetGetMinimapShape() -- this is just to support for other mods, keep below UIMult
+	end
+
 	if E:IsAddOnEnabled('Tukui') then
 		E:StaticPopup_Show('TUKUI_ELVUI_INCOMPATIBLE')
 	end

ElvUI/Mainline/Modules/DataTexts/Crests.lua

@@ -11,14 +11,6 @@ local CRESTS_EARNED = strsplit('%', _G.CURRENCY_SEASON_TOTAL_MAXIMUM)
 
 local crests = {
 	{ id = 3008, color = _G.HEIRLOOM_BLUE_COLOR:GenerateHexColor() },		-- Valorstones
-
-	-- TWW Season 1: Harbinger
-	{ id = 2914, color = _G.UNCOMMON_GREEN_COLOR:GenerateHexColor() },		-- Weathered
-	{ id = 2915, color = _G.RARE_BLUE_COLOR:GenerateHexColor() },			-- Carved
-	{ id = 2916, color = _G.EPIC_PURPLE_COLOR:GenerateHexColor() },			-- Runed
-	{ id = 2917, color = _G.LEGENDARY_ORANGE_COLOR:GenerateHexColor() },	-- Gilded
-
-	-- TWW Season 2: Undermine
 	{ id = 3107, color = _G.UNCOMMON_GREEN_COLOR:GenerateHexColor() },		-- Weathered
 	{ id = 3108, color = _G.RARE_BLUE_COLOR:GenerateHexColor() },			-- Carved
 	{ id = 3109, color = _G.EPIC_PURPLE_COLOR:GenerateHexColor() },			-- Runed

ElvUI/Mainline/Modules/Skins/PlayerChoice.lua

@@ -7,10 +7,12 @@ local pairs = pairs
 local hooksecurefunc = hooksecurefunc
 
 function S:PlayerChoice_SetupButtons(buttons)
-	if buttons and buttons.buttonPool then
-		for button in buttons.buttonPool:EnumerateActive() do
-			if not button.IsSkinned then
-				S:HandleButton(button)
+	if buttons and buttons.buttonFramePool then
+		for buttonFrame in buttons.buttonFramePool:EnumerateActive() do
+			if not buttonFrame.IsSkinned then
+				S:HandleButton(buttonFrame.Button, true)
+
+				buttonFrame.IsSkinned = true
 			end
 		end
 	end
@@ -62,6 +64,7 @@ function S:PlayerChoice_SetupOptions()
 		self.BlackBackground:SetAlpha(0)
 		self.Background:SetAlpha(0)
 		self.NineSlice:SetAlpha(0)
+		self.BorderOverlay:SetAlpha(0)
 
 		self.Title:DisableDrawLayer('BACKGROUND')
 		self.Title.Text:SetTextColor(1, 0.8, 0)