Exiles/coa-elvui
3
0
Fork 0
Code Pull Requests Actions Packages Releases 1 Wiki Activity

Merge pull request #60 from Sleaker/main

Browse Source 
WorldMap Fixes and Mentor Panel Skin
This commit is contained in:
Andrew
2025-03-16 13:03:43 -07:00
committed by GitHub
parent a0aca0f1ff 2a5bfd03eb
commit cd563245b8
4 changed files with 108 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElvUI/ElvUI.toc
+1 -1
View File
@@ -1,6 +1,6 @@
## Interface: 30300 ## Interface: 30300
## Author: Elv, Bunny ## Author: Elv, Bunny
## Version: 7.19 ## Version: 7.20
## Title: |cff1784d1E|r|cffe5e3e3lvUI|r ## Title: |cff1784d1E|r|cffe5e3e3lvUI|r
## Notes: User Interface replacement AddOn for World of Warcraft. ## Notes: User Interface replacement AddOn for World of Warcraft.
## SavedVariables: ElvDB, ElvPrivateDB ## SavedVariables: ElvDB, ElvPrivateDB
ElvUI/Modules/Skins/Blizzard/LFD.lua
+65 -33
View File
@@ -12,12 +12,34 @@ local GetLFGDungeonRewardLink = GetLFGDungeonRewardLink
local GetLFGDungeonRewards = GetLFGDungeonRewards local GetLFGDungeonRewards = GetLFGDungeonRewards
local hooksecurefunc = hooksecurefunc local hooksecurefunc = hooksecurefunc
-- Manastorm is injected into Blizz frames from a separate addon
S:AddCallbackForAddon("Ascension_Manastorm", "Skin_Manastorm", function()
if not E.private.skins.blizzard.enable or not E.private.skins.blizzard.lfd then return end
ManastormQueueFrameInset:StripTextures()
ManastormQueueFrameCurrencyBar:StripTextures()
ManastormQueueFrameRightPanelLevelSelect:StripTextures()
ManastormQueueFrameRightPanelLevelSelect:CreateBackdrop("Transparent")
S:HandleButton(ManastormQueueFrameRightPanelEnterButton)
S:HandleButton(ManastormQueueFrameRightPanelLevelDropDown)
ManastormQueueFrameRightPanelLevelDropDown:SetSize(120, 24)
ManastormQueueFrameRightPanelLevelDropDown:SetPoint("BOTTOMRIGHT", ManastormQueueFrameRightPanelEnterButton, "TOPRIGHT")
S:HandleNextPrevButton(ManastormQueueFrameRightPanelLevelDropDown.Button, "down")
ManastormQueueFrameRightPanelLevelDropDown.Button:SetPoint("RIGHT", ManastormQueueFrameRightPanelLevelDropDown, "RIGHT", -2, 0)
S:HandleScrollList(ManastormQueueFrameRightPanelLevelSelectScrollList)
ManastormQueueFrameRightPanelLevelSelect:SetPoint("BOTTOMRIGHT", ManastormQueueFrameRightPanelLevelDropDown, "TOPRIGHT", -1, 0)
ManastormQueueFrameRightPanelLevelSelectScrollList:CreateBackdrop("Default")
end)
S:AddCallback("Skin_LFD", function() S:AddCallback("Skin_LFD", function()
if not E.private.skins.blizzard.enable or not E.private.skins.blizzard.lfd then return end if not E.private.skins.blizzard.enable or not E.private.skins.blizzard.lfd then return end
AscensionLFGFrame:StripTextures(true) AscensionLFGFrame:StripTextures(true)
AscensionLFGFrame.PortraitFrame:StripTextures(true) AscensionLFGFrame.PortraitFrame:StripTextures(true)
AscensionLFGFrame:CreateBackdrop("Transparent") AscensionLFGFrame:CreateBackdrop("Transparent")
-- Remove the Vertical Gold bar between menu frame and content frame
local childFrames={AscensionLFGFrame:GetChildren()}
childFrames[13]:StripTextures()
AscensionLFGFrameContent:StripTextures(true) AscensionLFGFrameContent:StripTextures(true)
AscensionLFGFrameMenu:StripTextures(true) AscensionLFGFrameMenu:StripTextures(true)
AscensionLFGFrameInset:StripTextures(true) AscensionLFGFrameInset:StripTextures(true)
@@ -131,41 +153,51 @@ S:AddCallback("Skin_LFD", function()
--Arena --Arena
S:HandleStatusBar(AscensionPVPFrameArenaBar) S:HandleStatusBar(AscensionPVPFrameArenaBar)
-- Quick Match -- Quick Match
AscensionPVPFrame:StripTextures(true) AscensionPVPFrame:StripTextures(true)
AscensionPVPFrame:CreateBackdrop("Transparent") AscensionPVPFrame:CreateBackdrop("Transparent")
AscensionPVPFrameCasualFrame:StripTextures(true) AscensionPVPFrameCasualFrame:StripTextures(true)
AscensionPVPFrameCasualFrame:CreateBackdrop("Transparent") AscensionPVPFrameCasualFrame:CreateBackdrop("Transparent")
AscensionPVPFrameCasualFrameInset:StripTextures(true) AscensionPVPFrameCasualFrameInset:StripTextures(true)
AscensionPVPFrameCasualFrameInset:CreateBackdrop("Transparent") AscensionPVPFrameCasualFrameInset:CreateBackdrop("Transparent")
AscensionPVPFrameCasualFrameInsetNineSlice:StripTextures(true) AscensionPVPFrameCasualFrameInsetNineSlice:StripTextures(true)
-- Buttons (Queues) -- Fix inset textures on the casual frame
S:HandleButton(AscensionPVPFrameCasualFrameRandomBGButton) local casualFrame = {AscensionPVPFrameCasualFrame:GetChildren()}
S:HandleButton(AscensionPVPFrameCasualFrameCallToArmsButton1) casualFrame[2]:StripTextures()
S:HandleButton(AscensionPVPFrameCasualFrameSkirmish1v1Button) AscensionPVPFrameStatsInset:StripTextures()
S:HandleButton(AscensionPVPFrameCasualFrameSkirmish2v2Button) AscensionPVPFrameStatsInsetNineSlice:StripTextures(true)
S:HandleButton(AscensionPVPFrameCasualFrameSkirmish3v3Button) -- Buttons (Queues)
-- Honor Section S:HandleButton(AscensionPVPFrameCasualFrameRandomBGButton)
AscensionPVPFrameHonorInset:StripTextures(true) S:HandleButton(AscensionPVPFrameCasualFrameCallToArmsButton1)
AscensionPVPFrameHonorInset:CreateBackdrop("Transparent") S:HandleButton(AscensionPVPFrameCasualFrameSkirmish1v1Button)
AscensionPVPFrameHonorInsetNineSlice:StripTextures(true) S:HandleButton(AscensionPVPFrameCasualFrameSkirmish2v2Button)
S:HandleButton(AscensionPVPFrameCasualFrameSkirmish3v3Button)
-- Honor Section
AscensionPVPFrameHonorInset:StripTextures(true)
AscensionPVPFrameHonorInset:CreateBackdrop("Transparent")
AscensionPVPFrameHonorInsetNineSlice:StripTextures(true)
-- Buttons -- Buttons
S:HandleButton(AscensionPVPFrameCasualFrameQueueButton) S:HandleButton(AscensionPVPFrameCasualFrameQueueButton)
S:HandleButton(AscensionPVPFrameCasualFrameSoloQueueButton) AscensionPVPFrameCasualFrameQueueButton:SetSize(150, 28)
S:HandleButton(AscensionPVPFrameCasualFrameSoloQueueButton)
AscensionPVPFrameCasualFrameSoloQueueButton:SetSize(150, 28)
S:HandleButton(AscensionPVPFrameCasualFrameLeaveQueueButton)
AscensionPVPFrameCasualFrameLeaveQueueButton:SetSize(150, 28)
--Rated Tab --Rated Tab
AscensionPVPFrameRatedFrame:StripTextures(true) AscensionPVPFrameRatedFrame:StripTextures(true)
AscensionPVPFrameRatedFrame:CreateBackdrop("Transparent") AscensionPVPFrameRatedFrame:CreateBackdrop("Transparent")
AscensionPVPFrameRatedFrameInset:StripTextures(true) AscensionPVPFrameRatedFrameInset:StripTextures(true)
AscensionPVPFrameRatedFrameInset:CreateBackdrop("Transparent") AscensionPVPFrameRatedFrameInset:CreateBackdrop("Transparent")
AscensionPVPFrameRatedFrameInsetNineSlice:StripTextures(true) AscensionPVPFrameRatedFrameInsetNineSlice:StripTextures(true)
-- Buttons (Rated)
S:HandleButton(AscensionPVPFrameRatedFrameArena1v1) -- Buttons (Rated)
S:HandleButton(AscensionPVPFrameRatedFrameArena2v2) S:HandleButton(AscensionPVPFrameRatedFrameArena1v1)
S:HandleButton(AscensionPVPFrameRatedFrameArena3v3) S:HandleButton(AscensionPVPFrameRatedFrameArena2v2)
S:HandleButton(AscensionPVPFrameRatedFrameSoloQueueButton) S:HandleButton(AscensionPVPFrameRatedFrameArena3v3)
S:HandleButton(AscensionPVPFrameRatedFrameQueueButton) S:HandleButton(AscensionPVPFrameRatedFrameSoloQueueButton)
S:HandleButton(AscensionPVPFrameRatedFrameQueueButton)
-- PvP Ruleset -- PvP Ruleset
AscensionRulesetFrame:StripTextures(true) AscensionRulesetFrame:StripTextures(true)
ElvUI/Modules/Skins/Blizzard/PathToAscension.lua
+33 -1
View File
@@ -14,21 +14,38 @@ S:AddCallbackForAddon("Ascension_PathToAscension", "Skin_PathToAscension", funct
PathToAscensionFrameObjectivesInsetFrame:StripTextures() PathToAscensionFrameObjectivesInsetFrame:StripTextures()
PathToAscensionFrameMentorPanel:StripTextures() PathToAscensionFrameMentorPanel:StripTextures()
PathToAscensionFrameMentorPanelBecomeMentor:StripTextures()
PathToAscensionFrameMentorPanelBecomeMentorBorder:StripTextures()
PathToAscensionFrameMentorPanelFindHelp:StripTextures()
PathToAscensionFrameMentorPanelFindHelpBorder:StripTextures()
-- Strip Frame Inset from AvailableMentors list
local mentorFrameChildren = {PathToAscensionFrameMentorPanelFindHelpAvailableMentors:GetChildren()}
mentorFrameChildren[2]:StripTextures()
PathToAscensionFrame:CreateBackdrop("Transparent") PathToAscensionFrame:CreateBackdrop("Transparent")
PathToAscensionFrameMentorPanelBecomeMentor:CreateBackdrop("Transparent")
PathToAscensionFrameMentorPanelFindHelp:CreateBackdrop("Transparent")
-- Strip Objective Panel Frame textures -- Strip Objective Panel Frame textures
PathToAscensionFrameDisplay:StripTextures() PathToAscensionFrameDisplay:StripTextures()
PathToAscensionFrameDisplayQuestObjectives:StripTextures() PathToAscensionFrameDisplayQuestObjectives:StripTextures()
-- Reskin the Frames in ElvUI style -- Reskin the Frames in ElvUI style
S:HandleCloseButton(PathToAscensionFrameCloseButton)
S:HandleEditBox(PathToAscensionFrameObjectivesHeaderSearch) S:HandleEditBox(PathToAscensionFrameObjectivesHeaderSearch)
S:HandleEditBox(PathToAscensionFrameMentorPanelFindHelpSearchBox)
S:HandleScrollBar(PathToAscensionFrameObjectivesScrollFrameScrollBar) S:HandleScrollBar(PathToAscensionFrameObjectivesScrollFrameScrollBar)
S:HandleButton(PathToAscensionFrameDisplayQuestObjectivesInteractButton) S:HandleButton(PathToAscensionFrameDisplayQuestObjectivesInteractButton)
S:HandleButton(PathToAscensionFrameDisplayLeftButton) S:HandleButton(PathToAscensionFrameDisplayLeftButton)
S:HandleButton(PathToAscensionFrameDisplayRightButton) S:HandleButton(PathToAscensionFrameDisplayRightButton)
S:HandleButton(PathToAscensionFrameMentorPanelBecomeMentorBecomeMentorButton)
S:HandleButton(PathToAscensionFrameMentorPanelFindHelpRefreshButton)
PathToAscensionFrameMentorPanelFindHelpRefreshButton:Size(22, 22)
S:HandleScrollList(PathToAscensionFrameMentorPanelFindHelpAvailableMentors)
S:HandleTabSystem(PathToAscensionFrame) S:HandleTabSystem(PathToAscensionFrame)
@@ -54,9 +71,24 @@ S:AddCallbackForAddon("Ascension_PathToAscension", "Skin_PathToAscension", funct
PathToAscensionFrameObjectivesScrollFrameArtOverlay:StripTextures(true) PathToAscensionFrameObjectivesScrollFrameArtOverlay:StripTextures(true)
-- Reskin the objectives list -- Reskin the objectives list
for i = 1, 12 do for i = 1, 13 do
local objectiveButton = _G["PathToAscensionFrameObjectivesScrollFrameButton"..i] local objectiveButton = _G["PathToAscensionFrameObjectivesScrollFrameButton"..i]
S:HandleButton(objectiveButton, true) S:HandleButton(objectiveButton, true)
end end
-- Reskin Mentor Checkboxes
for i = 1, 10 do
local checkBox = _G["PathToAscensionFrameMentorPanelBecomeMentorSpecialization"..i]
S:HandleCheckBox(checkBox)
end
-- Reskin Available Mentors
for i = 1, 9 do
local mentor = _G["PathToAscensionFrameMentorPanelFindHelpAvailableMentorsScrollFrameButton"..i]
S:HandleButton(mentor, true)
end
PathToAscensionFrameMentorPanelFindHelpFilter:StripTextures(true)
S:HandleButton(PathToAscensionFrameMentorPanelFindHelpFilter)
end) end)
ElvUI/Modules/Skins/Blizzard/Worldmap.lua
+9 -5
View File
@@ -36,13 +36,17 @@ S:AddCallback("Skin_WorldMap", function()
WorldMapQuestDetailScrollFrameTrack:Kill() WorldMapQuestDetailScrollFrameTrack:Kill()
WorldMapQuestRewardScrollFrame:Width(340) WorldMapQuestRewardScrollFrame:Width(320)
WorldMapQuestRewardScrollFrame:Point("LEFT", WorldMapQuestDetailScrollFrame, "RIGHT", 8, 0) WorldMapQuestRewardScrollFrame:Point("LEFT", WorldMapQuestDetailScrollFrame, "RIGHT", -2, 0)
WorldMapQuestRewardScrollFrame:CreateBackdrop("Transparent") WorldMapQuestRewardScrollFrame:CreateBackdrop("Transparent")
WorldMapQuestRewardScrollFrame.backdrop:Point("TOPLEFT", 20, 2) WorldMapQuestRewardScrollFrame.backdrop:Point("TOPLEFT", -3, 2)
WorldMapQuestRewardScrollFrame.backdrop:Point("BOTTOMRIGHT", 22, -4) WorldMapQuestRewardScrollFrame.backdrop:Point("BOTTOMRIGHT", 21, 0)
WorldMapQuestRewardScrollFrame.backdrop:SetFrameLevel(WorldMapQuestRewardScrollFrame:GetFrameLevel()) WorldMapQuestRewardScrollFrame.backdrop:SetFrameLevel(WorldMapQuestRewardScrollFrame:GetFrameLevel())
WorldMapQuestRewardScrollFrame:SetHitRectInsets(20, -22, 0, -2) S:HandleButton(WorldMapQuestRewardScrollFrameShareButton)
WorldMapQuestRewardScrollFrameShareButton:Width(120)
S:HandleButton(WorldMapQuestRewardScrollFrameAbandonButton)
WorldMapQuestRewardScrollFrameAbandonButton:Width(120)
WorldMapQuestRewardScrollChildFrame:SetScale(1) WorldMapQuestRewardScrollChildFrame:SetScale(1)