Skip to content

Commit 28a5b23

Browse files
committed
WIP - Updated Character Skin
1 parent 34e54e0 commit 28a5b23

File tree

1 file changed

+20
-13
lines changed

1 file changed

+20
-13
lines changed

ElvUI/Mainline/Modules/Skins/Character.lua

+20-13
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ local showInsetBackdrop = {
1818
TokenFrame = true
1919
}
2020

21+
-- FIX ME 11.0 Mostly now in: TokenEntryMixin
2122
local function TokenFrame_ScrollUpdate(frame)
2223
for _, child in next, { frame.ScrollTarget:GetChildren() } do
2324
if child.Highlight and not child.IsSkinned then
@@ -219,6 +220,7 @@ local function FixSidebarTabCoords()
219220
end
220221
end
221222

223+
-- FIX ME 11.0 Mostly now in: ReputationEntryMixin
222224
local function UpdateFactionSkins(frame)
223225
for _, child in next, { frame.ScrollTarget:GetChildren() } do
224226
local container = child.Container
@@ -228,7 +230,7 @@ local function UpdateFactionSkins(frame)
228230
container:StripTextures()
229231

230232
if container.ExpandOrCollapseButton then
231-
S:HandleCollapseTexture(container.ExpandOrCollapseButton)
233+
S:HandleCollapseTexture(container.ToggleCollapseButton)
232234
end
233235

234236
if container.ReputationBar then
@@ -265,7 +267,7 @@ local function BackdropDesaturated(background, value)
265267
end
266268
end
267269

268-
function S:CharacterFrame()
270+
function S:Blizzard_UIPanels_Game()
269271
if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.character) then return end
270272

271273
-- General
@@ -397,13 +399,17 @@ function S:CharacterFrame()
397399
end
398400

399401
-- Reputation Frame
400-
_G.ReputationDetailFrame:StripTextures()
401-
_G.ReputationDetailFrame:SetTemplate('Transparent')
402-
S:HandleCloseButton(_G.ReputationDetailCloseButton)
403-
S:HandleCheckBox(_G.ReputationDetailAtWarCheckBox)
404-
S:HandleCheckBox(_G.ReputationDetailMainScreenCheckBox)
405-
S:HandleCheckBox(_G.ReputationDetailInactiveCheckBox)
406-
S:HandleButton(_G.ReputationDetailViewRenownButton)
402+
local ReputationFrame = _G.ReputationFrame
403+
ReputationFrame:StripTextures()
404+
S:HandleDropDownBox(ReputationFrame.filterDropDown)
405+
406+
--_G.ReputationDetailFrame:StripTextures()
407+
--_G.ReputationDetailFrame:SetTemplate('Transparent')
408+
--S:HandleCloseButton(_G.ReputationDetailCloseButton)
409+
--S:HandleCheckBox(_G.ReputationDetailAtWarCheckBox)
410+
--S:HandleCheckBox(_G.ReputationDetailMainScreenCheckBox)
411+
--S:HandleCheckBox(_G.ReputationDetailInactiveCheckBox)
412+
--S:HandleButton(_G.ReputationDetailViewRenownButton)
407413

408414
-- Currency Frame
409415
_G.TokenFramePopup:StripTextures()
@@ -413,15 +419,16 @@ function S:CharacterFrame()
413419
S:HandleCheckBox(_G.TokenFramePopup.InactiveCheckBox)
414420
S:HandleCheckBox(_G.TokenFramePopup.BackpackCheckBox)
415421

422+
-- FIX ME 11.0
416423
if _G.TokenFramePopup.CloseButton then
417424
S:HandleCloseButton(_G.TokenFramePopup.CloseButton)
418425
end
419426

420-
hooksecurefunc(_G.ReputationFrame.ScrollBox, 'Update', UpdateFactionSkins)
421-
hooksecurefunc(_G.TokenFrame.ScrollBox, 'Update', TokenFrame_ScrollUpdate)
427+
--hooksecurefunc(_G.ReputationFrame.ScrollBox, 'Update', UpdateFactionSkins)
428+
--hooksecurefunc(_G.TokenFrame.ScrollBox, 'Update', TokenFrame_ScrollUpdate)
422429
hooksecurefunc('PaperDollFrame_UpdateSidebarTabs', FixSidebarTabCoords)
423430
hooksecurefunc('PaperDollItemSlotButton_Update', PaperDollItemSlotButtonUpdate)
424-
hooksecurefunc('CharacterFrame_ShowSubFrame', UpdateCharacterInset)
431+
hooksecurefunc(CharacterFrameMixin, 'ShowSubFrame', UpdateCharacterInset)
425432
end
426433

427-
S:AddCallback('CharacterFrame')
434+
S:AddCallbackForAddon('Blizzard_UIPanels_Game')

0 commit comments

Comments
 (0)