From 4639679a24dc18aee56ac892064376bff19fcc2d Mon Sep 17 00:00:00 2001 From: andrew6180 <16847730+andrew6180@users.noreply.github.com> Date: Fri, 24 Jan 2025 17:49:35 -0700 Subject: [PATCH] Skins/HelpFrame: style help frame, remove old help frame references --- ElvUI/Modules/Skins/Blizzard/Help.lua | 158 ++++++-------------------- ElvUI/Modules/Skins/Blizzard/Misc.lua | 1 - ElvUI/Modules/Skins/Skins.lua | 3 + 3 files changed, 37 insertions(+), 125 deletions(-) diff --git a/ElvUI/Modules/Skins/Blizzard/Help.lua b/ElvUI/Modules/Skins/Blizzard/Help.lua index c970d8c..836cb61 100644 --- a/ElvUI/Modules/Skins/Blizzard/Help.lua +++ b/ElvUI/Modules/Skins/Blizzard/Help.lua @@ -5,140 +5,50 @@ local S = E:GetModule("Skins") local _G = _G local select = select --WoW API / Variables - -S:AddCallback("Skin_Help", function() +S:AddCallbackForAddon("Ascension_HelpUI", "Skin_Help", function() if not E.private.skins.blizzard.enable or not E.private.skins.blizzard.help then return end - HelpFrame:StripTextures() - HelpFrame:CreateBackdrop("Transparent") - HelpFrame.backdrop:Point("TOPLEFT", 6, 0) - HelpFrame.backdrop:Point("BOTTOMRIGHT", -45, 14) + HelpMenuFrame.PortraitFrame:StripTextures(true) + HelpMenuFrameNineSlice:StripTextures() + HelpMenuFrame:StripTextures() + HelpMenuFrame:CreateBackdrop("Transparent") + HelpMenuFrame.backdrop:Point("TOPLEFT", 0, 0) + HelpMenuFrame.backdrop:Point("BOTTOMRIGHT", 0, 0) - S:SetBackdropHitRect(HelpFrame) + HelpMenuFrameLeftInset:StripTextures() + HelpMenuFrameRightInset:StripTextures() + HelpMenuFrameRightInsetInsetNineSlice:StripTextures() - S:HandleCloseButton(HelpFrameCloseButton, HelpFrame.backdrop) + S:SetBackdropHitRect(HelpMenuFrame) - local helpFrameButtons = { - "GMTalkOpenTicket", - "GMTalkCancel", - "ReportIssueOpenTicket", - "ReportIssueCancel", - "LagLoot", - "LagAuctionHouse", - "LagMail", - "LagChat", - "LagMovement", - "LagSpell", - "LagCancel", - "StuckStuck", - "StuckOpenTicket", - "StuckCancel", - "OpenTicketCancel", - "OpenTicketSubmit", - "ViewResponseCancel", - "ViewResponseMoreHelp", - "ViewResponseIssueResolved", - "WelcomeGMTalk", - "WelcomeReportIssue", - "WelcomeStuck", - "WelcomeCancel" - } + S:HandleCloseButton(HelpMenuFrameCloseButton, HelpMenuFrame.backdrop) - for i = 1, #helpFrameButtons do - S:HandleButton(_G["HelpFrame"..helpFrameButtons[i]]) - end + S:HandleTabSystem(HelpMenuFrame.LeftInset) - KnowledgeBaseFrameDivider:StripTextures() - KnowledgeBaseFrameDivider2:StripTextures() - HelpFrameOpenTicketDivider:StripTextures() - HelpFrameViewResponseDivider:StripTextures() + S:HandleScrollBar(HelpMenuFrameRightInsetScrollFrameScrollBar) - local scrollBars = { - "HelpFrameOpenTicketScrollFrameScrollBar", - "HelpFrameViewResponseIssueScrollFrameScrollBar", - "HelpFrameViewResponseMessageScrollFrameScrollBar", - } + HelpMenuFrameRightInsetItemRestorePanel:StripTextures() + HelpMenuFrameRightInsetItemRestorePanelCategories:StripTextures() + HelpMenuFrameRightInsetItemRestorePanelRecoveryScroll:StripTextures() - for _, scrollBar in ipairs(scrollBars) do - S:HandleScrollBar(_G[scrollBar]) - _G[scrollBar.."Top"]:Hide() - _G[scrollBar.."Middle"]:Hide() - _G[scrollBar.."Bottom"]:Hide() - end + S:HandleTabSystem(HelpMenuFrameRightInsetItemRestorePanelCategories) + S:HandleEditBox(HelpMenuFrameRightInsetItemRestorePanelRecoveryScrollSearch) - HelpFrameViewResponseIssueScrollFrame:CreateBackdrop("Transparent") - HelpFrameViewResponseIssueScrollFrame.backdrop:Point("TOPLEFT", -2, 2) - HelpFrameViewResponseIssueScrollFrame.backdrop:Point("BOTTOMRIGHT", 2, -2) + S:HandleScrollList(HelpMenuFrameRightInsetItemRestorePanelRecoveryScroll, function(button) + button:StripTextures() + S:HandleBorderIcon(button.Icon) + S:HandleButton(button.RecoverItemButton) - HelpFrameViewResponseMessageScrollFrame:CreateBackdrop("Transparent") - HelpFrameViewResponseMessageScrollFrame.backdrop:Point("TOPLEFT", -2, 2) - HelpFrameViewResponseMessageScrollFrame.backdrop:Point("BOTTOMRIGHT", 2, -2) - - KnowledgeBaseFrame:StripTextures() - - KnowledgeBaseFrame:HookScript("OnShow", function() - select(11, HelpFrame:GetRegions()):Hide() + hooksecurefunc(button, "Update", function(self) + self:SetNormalTexture(E.media.blankTex) + button.Icon:SetRounded(false) + if button.category == "RECOVERY_SERVICE_CATEGORY_DELETED_CHARACTER" then + self.Icon.Icon:SetTexture("Interface\\Glues\\CharacterCreate\\UI-CHARACTERCREATE-RACES") + else + self.Icon.Icon:SetTexCoord(unpack(E.TexCoords)) + end + local color = self.index % 2 == 0 and E.media.backdropcolor or E.media.backdropfadecolor + self:GetNormalTexture():SetVertexColor(unpack(color)) + end) end) - - KnowledgeBaseFrame:SetScript("OnHide", function() - select(11, HelpFrame:GetRegions()):Show() - end) - - S:HandleButton(GMChatOpenLog) - S:HandleButton(KnowledgeBaseFrameTopIssuesButton) - - S:HandleEditBox(KnowledgeBaseFrameEditBox) - S:HandleDropDownBox(KnowledgeBaseFrameCategoryDropDown) - S:HandleDropDownBox(KnowledgeBaseFrameSubCategoryDropDown) - S:HandleButton(KnowledgeBaseFrameSearchButton) - - S:HandleNextPrevButton(KnowledgeBaseArticleListFrameNextButton) - S:HandleNextPrevButton(KnowledgeBaseArticleListFramePreviousButton) - - S:HandleScrollBar(KnowledgeBaseArticleScrollFrameScrollBar) - S:HandleButton(KnowledgeBaseArticleScrollChildFrameBackButton) - - S:HandleButton(KnowledgeBaseFrameReportIssue) - S:HandleButton(KnowledgeBaseFrameGMTalk) - S:HandleButton(KnowledgeBaseFrameStuck) - S:HandleButton(KnowledgeBaseFrameLag) - S:HandleButton(KnowledgeBaseFrameCancel) - S:HandleButton(KnowledgeBaseFrameAbandonTicket) - S:HandleButton(KnowledgeBaseFrameEditTicket) - - GMChatOpenLog:Point("TOPLEFT", 23, -22) - KnowledgeBaseFrameTopIssuesButton:Point("TOPRIGHT", -62, -118) - KnowledgeBaseFrameTopIssuesButton.Enable = E.noop - KnowledgeBaseFrameTopIssuesButton:Disable() - - KnowledgeBaseFrameEditBox:Height(18) - KnowledgeBaseFrameEditBox:Point("TOPLEFT", KnowledgeBaseFrameDivider, "BOTTOMLEFT", 12, 10) - KnowledgeBaseFrameCategoryDropDown:Point("LEFT", KnowledgeBaseFrameEditBox, "RIGHT", -14, -3) - KnowledgeBaseFrameSubCategoryDropDown:Point("LEFT", KnowledgeBaseFrameCategoryDropDown, "RIGHT", -23, 0) - - KnowledgeBaseFrameSearchButton:Height(20) - KnowledgeBaseFrameSearchButton:Point("LEFT", KnowledgeBaseFrameSubCategoryDropDown, "RIGHT", -2, 3) - - KnowledgeBaseFrameReportIssue:Point("BOTTOMLEFT", 14, 22) - KnowledgeBaseFrameGMTalk:Point("BOTTOM", KnowledgeBaseFrameReportIssue, "TOP", 0, 3) - KnowledgeBaseFrameStuck:Point("LEFT", KnowledgeBaseFrameReportIssue, "RIGHT", 3, 0) - KnowledgeBaseFrameLag:Point("LEFT", KnowledgeBaseFrameGMTalk, "RIGHT", 3, 0) - - KnowledgeBaseFrameAbandonTicket:Point("BOTTOMLEFT", 14, 22) - KnowledgeBaseFrameEditTicket:Point("BOTTOM", KnowledgeBaseFrameAbandonTicket, "TOP", 0, 3) - - KnowledgeBaseFrameCancel:Point("BOTTOMRIGHT", -53, 22) - HelpFrameGMTalkCancel:Point("BOTTOMRIGHT", -53, 22) - HelpFrameLagCancel:Point("BOTTOMRIGHT", -53, 22) - HelpFrameReportIssueCancel:Point("BOTTOMRIGHT", -53, 22) - HelpFrameStuckCancel:Point("BOTTOMRIGHT", -53, 22) - - HelpFrameOpenTicketCancel:Height(21) - HelpFrameOpenTicketCancel:Point("BOTTOMRIGHT", -53, 22) - HelpFrameOpenTicketSubmit:Point("RIGHT", HelpFrameOpenTicketCancel, "LEFT", -3, 0) - - HelpFrameViewResponseMoreHelp:Point("BOTTOMLEFT", 14, 22) - HelpFrameViewResponseIssueResolved:Point("LEFT", HelpFrameViewResponseMoreHelp, "RIGHT", 3, 0) - HelpFrameViewResponseCancel:Height(21) - HelpFrameViewResponseCancel:Point("BOTTOMRIGHT", -53, 22) end) \ No newline at end of file diff --git a/ElvUI/Modules/Skins/Blizzard/Misc.lua b/ElvUI/Modules/Skins/Blizzard/Misc.lua index 63a23df..2707eca 100644 --- a/ElvUI/Modules/Skins/Blizzard/Misc.lua +++ b/ElvUI/Modules/Skins/Blizzard/Misc.lua @@ -90,7 +90,6 @@ S:AddCallback("Skin_Misc", function() end -- Other Frames - TicketStatusFrameButton:SetTemplate("Transparent") AutoCompleteBox:SetTemplate("Transparent") ConsolidatedBuffsTooltip:SetTemplate("Transparent") --ResInSafeZoneButton diff --git a/ElvUI/Modules/Skins/Skins.lua b/ElvUI/Modules/Skins/Skins.lua index 3ce7118..43acaf6 100644 --- a/ElvUI/Modules/Skins/Skins.lua +++ b/ElvUI/Modules/Skins/Skins.lua @@ -563,10 +563,13 @@ function S:HandleBorderIcon(icon, parent) if not icon.Icon then return end parent = parent or icon:GetParent() + icon:SetRounded(false) icon:SetBorderTexture(nil) icon.SetBorderTexture = E.noop + icon.SetBorderAtlas = E.noop icon:SetOverlayTexture(nil) icon.SetOverlayTexture = E.noop + icon.SetOverlayAtlas = E.noop icon.Icon:SetTexCoord(unpack(E.TexCoords)) parent:CreateBackdrop("Default")