diff --git a/ElvUI/Modules/Skins/Blizzard/BGScore.lua b/ElvUI/Modules/Skins/Blizzard/BGScore.lua index 9860b76..74746df 100644 --- a/ElvUI/Modules/Skins/Blizzard/BGScore.lua +++ b/ElvUI/Modules/Skins/Blizzard/BGScore.lua @@ -42,7 +42,7 @@ local function LoadSkin() E:StyleButton(_G["WorldStateScoreColumn"..i]) end - hooksecurefunc("WorldStateScoreFrame_Update", function() + --[[hooksecurefunc("WorldStateScoreFrame_Update", function() local offset = FauxScrollFrame_GetOffset(WorldStateScoreScrollFrame) for i = 1, MAX_WORLDSTATE_SCORE_BUTTONS do @@ -74,7 +74,7 @@ local function LoadSkin() _G["WorldStateScoreButton"..i.."NameText"]:SetTextColor(classTextColor.r, classTextColor.g, classTextColor.b) end end - end) + end)]] end S:AddCallback("WorldStateScore", LoadSkin) \ No newline at end of file diff --git a/ElvUI/Modules/Skins/Blizzard/Character.lua b/ElvUI/Modules/Skins/Blizzard/Character.lua index 45cd863..0c693aa 100644 --- a/ElvUI/Modules/Skins/Blizzard/Character.lua +++ b/ElvUI/Modules/Skins/Blizzard/Character.lua @@ -300,12 +300,11 @@ local function LoadSkin() SkillDetailStatusBarUnlearnButton:SetHitRectInsets(0, 0, 0, 0) -- Honor Frame - hooksecurefunc("HonorFrame_Update", function() - E:StripTextures(HonorFrame) + E:StripTextures(HonorFrame) - HonorFrameProgressBar:SetStatusBarTexture(E.media.normTex) - E:RegisterStatusBar(HonorFrameProgressBar) - end) + E:CreateBackdrop(HonorFrameProgressButton) + HonorFrameProgressBar:SetStatusBarTexture(E.media.normTex) + E:RegisterStatusBar(HonorFrameProgressBar) end S:AddCallback("Character", LoadSkin) \ No newline at end of file diff --git a/ElvUI/Modules/Skins/Blizzard/Craft.lua b/ElvUI/Modules/Skins/Blizzard/Craft.lua index df8c754..ac4eb4e 100644 --- a/ElvUI/Modules/Skins/Blizzard/Craft.lua +++ b/ElvUI/Modules/Skins/Blizzard/Craft.lua @@ -1,5 +1,5 @@ -local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB -local S = E:GetModule("Skins"); +local E, L, V, P, G = unpack(ElvUI) --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB +local S = E:GetModule("Skins") --Cache global variables --Lua functions @@ -16,71 +16,179 @@ local hooksecurefunc = hooksecurefunc local function LoadSkin() if E.private.skins.blizzard.enable ~= true or not E.private.skins.blizzard.craft ~= true then return end + CRAFTS_DISPLAYED = 25 + + UIPanelWindows["CraftFrame"] = {area = "doublewide", pushable = 0, whileDead = 1} + E:StripTextures(CraftFrame, true) E:CreateBackdrop(CraftFrame, "Transparent") - E:Point(CraftFrame.backdrop, "TOPLEFT", 10, -11) - E:Point(CraftFrame.backdrop, "BOTTOMRIGHT", -32, 74) + CraftFrame.backdrop:SetPoint("TOPLEFT", 10, -12) + CraftFrame.backdrop:SetPoint("BOTTOMRIGHT", -34, 0) + E:Size(CraftFrame, 720, 508) + + CraftFrame.bg1 = CreateFrame("Frame", nil, CraftFrame) + E:SetTemplate(CraftFrame.bg1, "Transparent") + CraftFrame.bg1:SetPoint("TOPLEFT", 14, -92) + CraftFrame.bg1:SetPoint("BOTTOMRIGHT", -367, 4) + CraftFrame.bg1:SetFrameLevel(CraftFrame.bg1:GetFrameLevel() - 1) + + CraftFrame.bg2 = CreateFrame("Frame", nil, CraftFrame) + E:SetTemplate(CraftFrame.bg2, "Transparent") + CraftFrame.bg2:SetPoint("TOPLEFT", CraftFrame.bg1, "TOPRIGHT", 3, 0) + CraftFrame.bg2:SetPoint("BOTTOMRIGHT", CraftFrame, "BOTTOMRIGHT", -38, 4) + CraftFrame.bg2:SetFrameLevel(CraftFrame.bg2:GetFrameLevel() - 1) E:StripTextures(CraftRankFrameBorder) - E:Size(CraftRankFrame, 322, 16) - CraftRankFrame:ClearAllPoints() - E:Point(CraftRankFrame, "TOP", -10, -45) + + E:StripTextures(CraftRankFrame) E:CreateBackdrop(CraftRankFrame) + E:Size(CraftRankFrame, 420, 18) + CraftRankFrame:ClearAllPoints() + CraftRankFrame:SetPoint("TOP", -10, -38) CraftRankFrame:SetStatusBarTexture(E["media"].normTex) - CraftRankFrame:SetStatusBarColor(0.13, 0.35, 0.80) E:RegisterStatusBar(CraftRankFrame) - E:StripTextures(CraftExpandButtonFrame) - E:StripTextures(CraftDetailScrollChildFrame) + CraftRankFrameSkillName:Hide() + CraftRankFrameSkillRank:ClearAllPoints() + CraftRankFrameSkillRank:SetPoint("CENTER", CraftRankFrame, "CENTER", 58, 0) E:StripTextures(CraftListScrollFrame) - S:HandleScrollBar(CraftListScrollFrameScrollBar) + E:Size(CraftListScrollFrame, 310, 405) + CraftListScrollFrame:ClearAllPoints() + CraftListScrollFrame:SetPoint("TOPLEFT", 17, -95) E:StripTextures(CraftDetailScrollFrame) + E:Size(CraftDetailScrollFrame, 300, 381) + CraftDetailScrollFrame:ClearAllPoints() + CraftDetailScrollFrame:SetPoint("TOPRIGHT", CraftFrame, -60, -95) + CraftDetailScrollFrame.scrollBarHideable = nil + + E:StripTextures(CraftDetailScrollChildFrame) + E:Size(CraftDetailScrollChildFrame, 300, 150) + + S:HandleScrollBar(CraftListScrollFrameScrollBar) S:HandleScrollBar(CraftDetailScrollFrameScrollBar) - E:StripTextures(CraftIcon) - - S:HandleButton(CraftCreateButton) + CraftCancelButton:ClearAllPoints() + CraftCancelButton:SetPoint("TOPRIGHT", CraftDetailScrollFrame, "BOTTOMRIGHT", 19, -3) S:HandleButton(CraftCancelButton) + CraftCreateButton:ClearAllPoints() + CraftCreateButton:SetPoint("TOPRIGHT", CraftCancelButton, "TOPLEFT", -3, 0) + S:HandleButton(CraftCreateButton) + + E:StripTextures(CraftIcon) + E:SetTemplate(CraftIcon, "Default") + E:StyleButton(CraftIcon, nil, true) + E:Size(CraftIcon, 47) + CraftIcon:SetPoint("TOPLEFT", 2, -1) + + CraftName:SetPoint("TOPLEFT", 55, 0) + + CraftRequirements:SetTextColor(1, 0.80, 0.10) + S:HandleCloseButton(CraftFrameCloseButton) + E:StripTextures(CraftExpandButtonFrame) + + CraftCollapseAllButton:SetPoint("LEFT", CraftExpandTabLeft, "RIGHT", -8, 5) + CraftCollapseAllButton:SetNormalTexture("Interface\\AddOns\\ElvUI\\media\\textures\\PlusMinusButton") + CraftCollapseAllButton.SetNormalTexture = E.noop + CraftCollapseAllButton:GetNormalTexture():SetPoint("LEFT", 3, 2) + E:Size(CraftCollapseAllButton:GetNormalTexture(), 15) + + CraftCollapseAllButton:SetHighlightTexture("") + CraftCollapseAllButton.SetHighlightTexture = E.noop + + CraftCollapseAllButton:SetDisabledTexture("Interface\\AddOns\\ElvUI\\media\\textures\\PlusMinusButton") + CraftCollapseAllButton.SetDisabledTexture = E.noop + CraftCollapseAllButton:GetDisabledTexture():SetPoint("LEFT", 3, 2) + E:Size(CraftCollapseAllButton:GetDisabledTexture(), 15) + CraftCollapseAllButton:GetDisabledTexture():SetTexCoord(0.045, 0.475, 0.085, 0.925) + CraftCollapseAllButton:GetDisabledTexture():SetDesaturated(true) + + hooksecurefunc(CraftCollapseAllButton, "SetNormalTexture", function(self, texture) + if find(texture, "MinusButton") then + self:GetNormalTexture():SetTexCoord(0.545, 0.975, 0.085, 0.925) + else + self:GetNormalTexture():SetTexCoord(0.045, 0.475, 0.085, 0.925) + end + end) + + for i = 9, 25 do + CreateFrame("Button", "Craft"..i, CraftFrame, "CraftButtonTemplate"):SetPoint("TOPLEFT", _G["Craft"..i - 1], "BOTTOMLEFT") + end + + for i = 1, CRAFTS_DISPLAYED do + local button = _G["Craft"..i] + local highlight = _G["Craft"..i.."Highlight"] + + button:SetNormalTexture("Interface\\AddOns\\ElvUI\\media\\textures\\PlusMinusButton") + button.SetNormalTexture = E.noop + E:Size(button:GetNormalTexture(), 14) + button:GetNormalTexture():SetPoint("LEFT", 4, 1) + + highlight:SetTexture("") + highlight.SetTexture = E.noop + + hooksecurefunc(button, "SetNormalTexture", function(self, texture) + if find(texture, "MinusButton") then + self:GetNormalTexture():SetTexCoord(0.545, 0.975, 0.085, 0.925) + elseif find(texture, "PlusButton") then + self:GetNormalTexture():SetTexCoord(0.045, 0.475, 0.085, 0.925) + else + self:GetNormalTexture():SetTexCoord(0, 0, 0, 0) + end + end) + end + for i = 1, MAX_CRAFT_REAGENTS do local reagent = _G["CraftReagent"..i] local icon = _G["CraftReagent"..i.."IconTexture"] local count = _G["CraftReagent"..i.."Count"] + local name = _G["CraftReagent"..i.."Name"] local nameFrame = _G["CraftReagent"..i.."NameFrame"] + E:SetTemplate(reagent, "Default") + E:StyleButton(reagent, nil, true) + E:Size(reagent, 143, 40) + + icon.backdrop = CreateFrame("Frame", nil, reagent) + E:SetTemplate(icon.backdrop, "Default") + icon.backdrop:SetPoint("TOPLEFT", icon, -1, 1) + icon.backdrop:SetPoint("BOTTOMRIGHT", icon, 1, -1) + icon:SetTexCoord(unpack(E.TexCoords)) icon:SetDrawLayer("OVERLAY") - - icon.backdrop = CreateFrame("Frame", nil, reagent) - icon.backdrop:SetFrameLevel(reagent:GetFrameLevel() - 1) - E:SetTemplate(icon.backdrop, "Default") - E:SetOutside(icon.backdrop, icon) - + E:Size(icon, E.PixelMode and 38 or 32) + icon:SetPoint("TOPLEFT", E.PixelMode and 1 or 4, -(E.PixelMode and 1 or 4)) icon:SetParent(icon.backdrop) + count:SetParent(icon.backdrop) count:SetDrawLayer("OVERLAY") + name:SetPoint("LEFT", nameFrame, "LEFT", 20, 0) + E:Kill(nameFrame) end + CraftReagent1:SetPoint("TOPLEFT", CraftReagentLabel, "BOTTOMLEFT", -3, -3) + CraftReagent2:SetPoint("LEFT", CraftReagent1, "RIGHT", 3, 0) + CraftReagent4:SetPoint("LEFT", CraftReagent3, "RIGHT", 3, 0) + CraftReagent6:SetPoint("LEFT", CraftReagent5, "RIGHT", 3, 0) + CraftReagent8:SetPoint("LEFT", CraftReagent7, "RIGHT", 3, 0) + hooksecurefunc("CraftFrame_SetSelection", function(id) - E:SetTemplate(CraftIcon, "Default", true) - E:StyleButton(CraftIcon, nil, true) if CraftIcon:GetNormalTexture() then + CraftReagentLabel:SetAlpha(1) + CraftIcon:SetAlpha(1) CraftIcon:GetNormalTexture():SetTexCoord(unpack(E.TexCoords)) E:SetInside(CraftIcon:GetNormalTexture()) + else + CraftReagentLabel:SetAlpha(0) + CraftIcon:SetAlpha(0) end - CraftIcon:SetWidth(40) - CraftIcon:SetHeight(40) - CraftIcon:SetPoint("TOPLEFT", 4, -3) - - CraftRequirements:SetTextColor(1, 0.80, 0.10) - local skillLink = GetCraftItemLink(id) if skillLink then local _, _, quality = GetItemInfo(match(skillLink, "enchant:(%d+)")) @@ -95,70 +203,29 @@ local function LoadSkin() local numReagents = GetCraftNumReagents(id) for i = 1, numReagents, 1 do + local _, _, reagentCount, playerReagentCount = GetCraftReagentInfo(id, i) + local reagentLink = GetCraftReagentItemLink(id, i) + local reagent = _G["CraftReagent"..i] local icon = _G["CraftReagent"..i.."IconTexture"] local name = _G["CraftReagent"..i.."Name"] - local _, _, reagentCount, playerReagentCount = GetCraftReagentInfo(id, i) - local reagentLink = GetCraftReagentItemLink(id, i) if reagentLink then local _, _, quality = GetItemInfo(match(reagentLink, "item:(%d+)")) if quality then icon.backdrop:SetBackdropBorderColor(GetItemQualityColor(quality)) + reagent:SetBackdropBorderColor(GetItemQualityColor(quality)) if playerReagentCount < reagentCount then name:SetTextColor(0.5, 0.5, 0.5) else name:SetTextColor(GetItemQualityColor(quality)) end else + reagent:SetBackdropBorderColor(unpack(E["media"].bordercolor)) icon.backdrop:SetBackdropBorderColor(unpack(E["media"].bordercolor)) end end end end) - - for i = 1, CRAFTS_DISPLAYED do - local craftButton = _G["Craft"..i] - craftButton:SetNormalTexture("") - craftButton.SetNormalTexture = E.noop - - _G["Craft"..i.."Highlight"]:SetTexture("") - _G["Craft"..i.."Highlight"].SetTexture = E.noop - - craftButton.Text = craftButton:CreateFontString(nil, "OVERLAY") - E:FontTemplate(craftButton.Text, nil, 22) - craftButton.Text:SetPoint("LEFT", 3, 0) - craftButton.Text:SetText("+") - - hooksecurefunc(craftButton, "SetNormalTexture", function(self, texture) - if find(texture, "MinusButton") then - self.Text:SetText("-") - elseif find(texture, "PlusButton") then - self.Text:SetText("+") - else - self.Text:SetText("") - end - end) - end - - CraftCollapseAllButton:SetNormalTexture("") - CraftCollapseAllButton.SetNormalTexture = E.noop - CraftCollapseAllButton:SetHighlightTexture("") - CraftCollapseAllButton.SetHighlightTexture = E.noop - CraftCollapseAllButton:SetDisabledTexture("") - CraftCollapseAllButton.SetDisabledTexture = E.noop - - CraftCollapseAllButton.Text = CraftCollapseAllButton:CreateFontString(nil, "OVERLAY") - E:FontTemplate(CraftCollapseAllButton.Text, nil, 22) - CraftCollapseAllButton.Text:SetPoint("LEFT", 3, 0) - CraftCollapseAllButton.Text:SetText("+") - - hooksecurefunc(CraftCollapseAllButton, "SetNormalTexture", function(self, texture) - if find(texture, "MinusButton") then - self.Text:SetText("-") - else - self.Text:SetText("+") - end - end) end S:AddCallbackForAddon("Blizzard_CraftUI", "Craft", LoadSkin) \ No newline at end of file diff --git a/ElvUI/Modules/Skins/Blizzard/DressingRoom.lua b/ElvUI/Modules/Skins/Blizzard/DressingRoom.lua index edcd816..04d743c 100644 --- a/ElvUI/Modules/Skins/Blizzard/DressingRoom.lua +++ b/ElvUI/Modules/Skins/Blizzard/DressingRoom.lua @@ -37,7 +37,8 @@ local function LoadSkin() E:Point(DressUpFrameResetButton, "RIGHT", DressUpFrameCancelButton, "LEFT", -3, 0) E:CreateBackdrop(DressUpModel, "Default") - E:SetOutside(DressUpModel.backdrop, DressUpBackgroundTopLeft, nil, nil, DressUpModel) + DressUpModel.backdrop:SetPoint("TOPLEFT", -2, 1) + DressUpModel.backdrop:SetPoint("BOTTOMRIGHT", 0, 19) end S:AddCallback("DressingRoom", LoadSkin) \ No newline at end of file diff --git a/ElvUI/Modules/Skins/Blizzard/Inspect.lua b/ElvUI/Modules/Skins/Blizzard/Inspect.lua index 9f24c2b..0d38889 100644 --- a/ElvUI/Modules/Skins/Blizzard/Inspect.lua +++ b/ElvUI/Modules/Skins/Blizzard/Inspect.lua @@ -90,8 +90,10 @@ local function LoadSkin() S:HandleRotateButton(InspectModelRotateRightButton) E:Point(InspectModelRotateRightButton, "TOPLEFT", InspectModelRotateLeftButton, "TOPRIGHT", 3, 0) + -- Honor Frame E:StripTextures(InspectHonorFrame) + E:CreateBackdrop(InspectHonorFrameProgressButton) InspectHonorFrameProgressBar:SetStatusBarTexture(E.media.normTex) E:RegisterStatusBar(InspectHonorFrameProgressBar) end diff --git a/ElvUI/Modules/Skins/Blizzard/Quest.lua b/ElvUI/Modules/Skins/Blizzard/Quest.lua index dbe76ca..9350698 100644 --- a/ElvUI/Modules/Skins/Blizzard/Quest.lua +++ b/ElvUI/Modules/Skins/Blizzard/Quest.lua @@ -251,6 +251,8 @@ local function LoadSkin() QuestLogTimerText:SetTextColor(1, 1, 1) + UIPanelWindows["QuestLogFrame"] = {area = "doublewide", pushable = 0, whileDead = 1} + E:CreateBackdrop(QuestFrame, "Transparent") QuestFrame.backdrop:SetPoint("TOPLEFT", 15, -11) QuestFrame.backdrop:SetPoint("BOTTOMRIGHT", -20, 0) diff --git a/ElvUI/Modules/Skins/Blizzard/TradeSkill.lua b/ElvUI/Modules/Skins/Blizzard/TradeSkill.lua index 6fb566a..c7dc68d 100644 --- a/ElvUI/Modules/Skins/Blizzard/TradeSkill.lua +++ b/ElvUI/Modules/Skins/Blizzard/TradeSkill.lua @@ -1,5 +1,5 @@ -local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB -local S = E:GetModule("Skins"); +local E, L, V, P, G = unpack(ElvUI) --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB +local S = E:GetModule("Skins") --Cache global variables --Lua functions @@ -17,22 +17,102 @@ local hooksecurefunc = hooksecurefunc local function LoadSkin() if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.tradeskill ~= true then return end + TRADE_SKILLS_DISPLAYED = 25 + + UIPanelWindows["TradeSkillFrame"] = {area = "doublewide", pushable = 0, whileDead = 1} + E:StripTextures(TradeSkillFrame, true) E:CreateBackdrop(TradeSkillFrame, "Transparent") - E:Point(TradeSkillFrame.backdrop, "TOPLEFT", 10, -11) - E:Point(TradeSkillFrame.backdrop, "BOTTOMRIGHT", -32, 74) + TradeSkillFrame.backdrop:SetPoint("TOPLEFT", 10, -12) + TradeSkillFrame.backdrop:SetPoint("BOTTOMRIGHT", -34, 0) + E:Size(TradeSkillFrame, 720, 508) + + TradeSkillFrame.bg1 = CreateFrame("Frame", nil, TradeSkillFrame) + E:SetTemplate(TradeSkillFrame.bg1, "Transparent") + TradeSkillFrame.bg1:SetPoint("TOPLEFT", 14, -92) + TradeSkillFrame.bg1:SetPoint("BOTTOMRIGHT", -367, 4) + TradeSkillFrame.bg1:SetFrameLevel(TradeSkillFrame.bg1:GetFrameLevel() - 1) + + TradeSkillFrame.bg2 = CreateFrame("Frame", nil, TradeSkillFrame) + E:SetTemplate(TradeSkillFrame.bg2, "Transparent") + TradeSkillFrame.bg2:SetPoint("TOPLEFT", TradeSkillFrame.bg1, "TOPRIGHT", 3, 0) + TradeSkillFrame.bg2:SetPoint("BOTTOMRIGHT", TradeSkillFrame, "BOTTOMRIGHT", -38, 4) + TradeSkillFrame.bg2:SetFrameLevel(TradeSkillFrame.bg2:GetFrameLevel() - 1) E:StripTextures(TradeSkillRankFrameBorder) - E:Size(TradeSkillRankFrame, 322, 16) - TradeSkillRankFrame:ClearAllPoints() - E:Point(TradeSkillRankFrame, "TOP", -10, -45) + + E:StripTextures(TradeSkillRankFrame) E:CreateBackdrop(TradeSkillRankFrame) + E:Size(TradeSkillRankFrame, 420, 18) + TradeSkillRankFrame:ClearAllPoints() + TradeSkillRankFrame:SetPoint("TOP", -10, -38) TradeSkillRankFrame:SetStatusBarTexture(E["media"].normTex) - TradeSkillRankFrame:SetStatusBarColor(0.13, 0.35, 0.80) E:RegisterStatusBar(TradeSkillRankFrame) + TradeSkillRankFrameSkillName:Hide() + TradeSkillRankFrameSkillRank:ClearAllPoints() + TradeSkillRankFrameSkillRank:SetPoint("CENTER", TradeSkillRankFrame, "CENTER", 58, 0) + + E:StripTextures(TradeSkillListScrollFrame) + E:Size(TradeSkillListScrollFrame, 310, 405) + TradeSkillListScrollFrame:ClearAllPoints() + TradeSkillListScrollFrame:SetPoint("TOPLEFT", 17, -95) + + E:StripTextures(TradeSkillDetailScrollFrame) + E:Size(TradeSkillDetailScrollFrame, 300, 381) + TradeSkillDetailScrollFrame:ClearAllPoints() + TradeSkillDetailScrollFrame:SetPoint("TOPRIGHT", TradeSkillFrame, -60, -95) + TradeSkillDetailScrollFrame.scrollBarHideable = nil + + E:StripTextures(TradeSkillDetailScrollChildFrame) + E:Size(TradeSkillDetailScrollChildFrame, 300, 150) + + S:HandleScrollBar(TradeSkillListScrollFrameScrollBar) + S:HandleScrollBar(TradeSkillDetailScrollFrameScrollBar) + TradeSkillDetailScrollFrameScrollBar:SetPoint("TOPLEFT", TradeSkillDetailScrollFrame, "TOPRIGHT", 3, -16) + + S:HandleDropDownBox(TradeSkillInvSlotDropDown, 160) + TradeSkillInvSlotDropDown:ClearAllPoints() + TradeSkillInvSlotDropDown:SetPoint("RIGHT", TradeSkillRankFrame, "RIGHT", 9, -30) + + S:HandleDropDownBox(TradeSkillSubClassDropDown, 160) + TradeSkillSubClassDropDown:SetPoint("RIGHT", TradeSkillInvSlotDropDown, "LEFT", 10, 0) + + TradeSkillCancelButton:ClearAllPoints() + TradeSkillCancelButton:SetPoint("TOPRIGHT", TradeSkillDetailScrollFrame, "BOTTOMRIGHT", 19, -3) + S:HandleButton(TradeSkillCancelButton) + + TradeSkillCreateButton:ClearAllPoints() + TradeSkillCreateButton:SetPoint("TOPRIGHT", TradeSkillCancelButton, "TOPLEFT", -3, 0) + S:HandleButton(TradeSkillCreateButton) + + TradeSkillCreateAllButton:ClearAllPoints() + TradeSkillCreateAllButton:SetPoint("TOPLEFT", TradeSkillDetailScrollFrame, "BOTTOMLEFT", 0, -3) + S:HandleButton(TradeSkillCreateAllButton) + + S:HandleNextPrevButton(TradeSkillDecrementButton) + + S:HandleEditBox(TradeSkillInputBox) + E:Size(TradeSkillInputBox, 40, 16) + TradeSkillInputBox:SetPoint("LEFT", TradeSkillDecrementButton, "RIGHT", 6, 0) + + S:HandleNextPrevButton(TradeSkillIncrementButton) + + E:StripTextures(TradeSkillSkillIcon) + E:SetTemplate(TradeSkillSkillIcon, "Default") + E:StyleButton(TradeSkillSkillIcon, nil, true) + E:Size(TradeSkillSkillIcon, 47) + TradeSkillSkillIcon:SetPoint("TOPLEFT", 2, -1) + + TradeSkillSkillName:SetPoint("TOPLEFT", 55, 0) + + TradeSkillRequirementLabel:SetTextColor(1, 0.80, 0.10) + + S:HandleCloseButton(TradeSkillFrameCloseButton) + E:StripTextures(TradeSkillExpandButtonFrame) + TradeSkillCollapseAllButton:SetPoint("LEFT", TradeSkillExpandTabLeft, "RIGHT", -8, 5) TradeSkillCollapseAllButton:SetNormalTexture("Interface\\AddOns\\ElvUI\\media\\textures\\PlusMinusButton") TradeSkillCollapseAllButton.SetNormalTexture = E.noop TradeSkillCollapseAllButton:GetNormalTexture():SetPoint("LEFT", 3, 2) @@ -56,16 +136,9 @@ local function LoadSkin() end end) - S:HandleDropDownBox(TradeSkillInvSlotDropDown, 140) - TradeSkillSubClassDropDown:ClearAllPoints() - E:Point(TradeSkillInvSlotDropDown, "TOPRIGHT", TradeSkillFrame, "TOPRIGHT", -32, -68) - - S:HandleDropDownBox(TradeSkillSubClassDropDown, 140) - TradeSkillSubClassDropDown:ClearAllPoints() - E:Point(TradeSkillSubClassDropDown, "RIGHT", TradeSkillInvSlotDropDown, "RIGHT", -120, 0) - - TradeSkillFrameTitleText:ClearAllPoints() - E:Point(TradeSkillFrameTitleText, "TOP", TradeSkillFrame, "TOP", 0, -18) + for i = 9, 25 do + CreateFrame("Button", "TradeSkillSkill"..i, TradeSkillFrame, "TradeSkillSkillButtonTemplate"):SetPoint("TOPLEFT", _G["TradeSkillSkill"..i - 1], "BOTTOMLEFT") + end for i = 1, TRADE_SKILLS_DISPLAYED do local button = _G["TradeSkillSkill"..i] @@ -90,60 +163,55 @@ local function LoadSkin() end) end - E:StripTextures(TradeSkillDetailScrollFrame) - E:StripTextures(TradeSkillListScrollFrame) - E:StripTextures(TradeSkillDetailScrollChildFrame) - - S:HandleScrollBar(TradeSkillListScrollFrameScrollBar) - S:HandleScrollBar(TradeSkillDetailScrollFrameScrollBar) - - E:StyleButton(TradeSkillSkillIcon, nil, true) - E:SetTemplate(TradeSkillSkillIcon, "Default") - for i = 1, MAX_TRADE_SKILL_REAGENTS do local reagent = _G["TradeSkillReagent"..i] local icon = _G["TradeSkillReagent"..i.."IconTexture"] local count = _G["TradeSkillReagent"..i.."Count"] + local name = _G["TradeSkillReagent"..i.."Name"] local nameFrame = _G["TradeSkillReagent"..i.."NameFrame"] + E:SetTemplate(reagent, "Default") + E:StyleButton(reagent, nil, true) + E:Size(reagent, 143, 40) + + icon.backdrop = CreateFrame("Frame", nil, reagent) + E:SetTemplate(icon.backdrop, "Default") + icon.backdrop:SetPoint("TOPLEFT", icon, -1, 1) + icon.backdrop:SetPoint("BOTTOMRIGHT", icon, 1, -1) + icon:SetTexCoord(unpack(E.TexCoords)) icon:SetDrawLayer("OVERLAY") - - icon.backdrop = CreateFrame("Frame", nil, reagent) - icon.backdrop:SetFrameLevel(reagent:GetFrameLevel() - 1) - E:SetTemplate(icon.backdrop, "Default") - E:SetOutside(icon.backdrop, icon) - + E:Size(icon, E.PixelMode and 38 or 32) + icon:SetPoint("TOPLEFT", E.PixelMode and 1 or 4, -(E.PixelMode and 1 or 4)) icon:SetParent(icon.backdrop) + count:SetParent(icon.backdrop) count:SetDrawLayer("OVERLAY") + name:SetPoint("LEFT", nameFrame, "LEFT", 20, 0) + E:Kill(nameFrame) end - S:HandleButton(TradeSkillCancelButton) - S:HandleButton(TradeSkillCreateButton) - S:HandleButton(TradeSkillCreateAllButton) - - S:HandleNextPrevButton(TradeSkillDecrementButton) - TradeSkillInputBox:SetHeight(16) - S:HandleEditBox(TradeSkillInputBox) - S:HandleNextPrevButton(TradeSkillIncrementButton) - - S:HandleCloseButton(TradeSkillFrameCloseButton) + TradeSkillReagent1:SetPoint("TOPLEFT", TradeSkillReagentLabel, "BOTTOMLEFT", -3, -3) + TradeSkillReagent2:SetPoint("LEFT", TradeSkillReagent1, "RIGHT", 3, 0) + TradeSkillReagent4:SetPoint("LEFT", TradeSkillReagent3, "RIGHT", 3, 0) + TradeSkillReagent6:SetPoint("LEFT", TradeSkillReagent5, "RIGHT", 3, 0) + TradeSkillReagent8:SetPoint("LEFT", TradeSkillReagent7, "RIGHT", 3, 0) hooksecurefunc("TradeSkillFrame_SetSelection", function(id) + TradeSkillRankFrame:SetStatusBarColor(0.13, 0.28, 0.85) + if TradeSkillSkillIcon:GetNormalTexture() then + TradeSkillReagentLabel:SetAlpha(1) TradeSkillSkillIcon:SetAlpha(1) TradeSkillSkillIcon:GetNormalTexture():SetTexCoord(unpack(E.TexCoords)) E:SetInside(TradeSkillSkillIcon:GetNormalTexture()) else + TradeSkillReagentLabel:SetAlpha(0) TradeSkillSkillIcon:SetAlpha(0) end - E:Size(TradeSkillSkillIcon, 40) - E:Point(TradeSkillSkillIcon, "TOPLEFT", 2, -3) - local skillLink = GetTradeSkillItemLink(id) if skillLink then local _, _, quality = GetItemInfo(match(skillLink, "item:(%d+)")) @@ -160,6 +228,7 @@ local function LoadSkin() for i = 1, numReagents, 1 do local _, _, reagentCount, playerReagentCount = GetTradeSkillReagentInfo(id, i) local reagentLink = GetTradeSkillReagentItemLink(id, i) + local reagent = _G["TradeSkillReagent"..i] local icon = _G["TradeSkillReagent"..i.."IconTexture"] local name = _G["TradeSkillReagent"..i.."Name"] @@ -167,12 +236,14 @@ local function LoadSkin() local _, _, quality = GetItemInfo(match(reagentLink, "item:(%d+)")) if quality then icon.backdrop:SetBackdropBorderColor(GetItemQualityColor(quality)) + reagent:SetBackdropBorderColor(GetItemQualityColor(quality)) if playerReagentCount < reagentCount then name:SetTextColor(0.5, 0.5, 0.5) else name:SetTextColor(GetItemQualityColor(quality)) end else + reagent:SetBackdropBorderColor(unpack(E["media"].bordercolor)) icon.backdrop:SetBackdropBorderColor(unpack(E["media"].bordercolor)) end end diff --git a/ElvUI/Modules/Skins/Blizzard/Trainer.lua b/ElvUI/Modules/Skins/Blizzard/Trainer.lua index b5e1daa..810a9e9 100644 --- a/ElvUI/Modules/Skins/Blizzard/Trainer.lua +++ b/ElvUI/Modules/Skins/Blizzard/Trainer.lua @@ -12,32 +12,71 @@ local hooksecurefunc = hooksecurefunc local function LoadSkin() if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.trainer ~= true then return end - E:CreateBackdrop(ClassTrainerFrame, "Transparent") - E:Point(ClassTrainerFrame.backdrop, "TOPLEFT", 10, -11) - E:Point(ClassTrainerFrame.backdrop, "BOTTOMRIGHT", -32, 74) + UIPanelWindows["ClassTrainerFrame"] = {area = "doublewide", pushable = 0, whileDead = 1} + E:Size(ClassTrainerFrame, 710, 470) E:StripTextures(ClassTrainerFrame, true) + E:CreateBackdrop(ClassTrainerFrame, "Transparent") + E:Point(ClassTrainerFrame.backdrop, "TOPLEFT", 15, -11) + E:Point(ClassTrainerFrame.backdrop, "BOTTOMRIGHT", -34, 74) + + E:StripTextures(ClassTrainerListScrollFrame) + E:Size(ClassTrainerListScrollFrame, 300) + ClassTrainerListScrollFrame.SetHeight = E.noop + ClassTrainerListScrollFrame:ClearAllPoints() + ClassTrainerListScrollFrame:SetPoint("TOPLEFT", 17, -85) + + E:StripTextures(ClassTrainerDetailScrollFrame) + E:Size(ClassTrainerDetailScrollFrame, 295, 280) + ClassTrainerDetailScrollFrame.SetHeight = E.noop + ClassTrainerDetailScrollFrame:ClearAllPoints() + ClassTrainerDetailScrollFrame:SetPoint("TOPRIGHT", ClassTrainerFrame, -64, -85) + ClassTrainerDetailScrollFrame.scrollBarHideable = nil + + ClassTrainerFrame.bg1 = CreateFrame("Frame", nil, ClassTrainerFrame) + E:SetTemplate(ClassTrainerFrame.bg1, "Transparent") + ClassTrainerFrame.bg1:SetPoint("TOPLEFT", 18, -77) + ClassTrainerFrame.bg1:SetPoint("BOTTOMRIGHT", -367, 77) + ClassTrainerFrame.bg1:SetFrameLevel(ClassTrainerFrame.bg1:GetFrameLevel() - 1) + + ClassTrainerFrame.bg2 = CreateFrame("Frame", nil, ClassTrainerFrame) + E:SetTemplate(ClassTrainerFrame.bg2, "Transparent") + ClassTrainerFrame.bg2:SetPoint("TOPLEFT", ClassTrainerFrame.bg1, "TOPRIGHT", 1, 0) + ClassTrainerFrame.bg2:SetPoint("BOTTOMRIGHT", ClassTrainerFrame, "BOTTOMRIGHT", -38, 77) + ClassTrainerFrame.bg2:SetFrameLevel(ClassTrainerFrame.bg2:GetFrameLevel() - 1) + + E:StripTextures(ClassTrainerDetailScrollChildFrame) + E:Size(ClassTrainerDetailScrollFrame, 300, 150) E:StripTextures(ClassTrainerExpandButtonFrame) S:HandleDropDownBox(ClassTrainerFrameFilterDropDown) - E:Point(ClassTrainerFrameFilterDropDown, "TOPRIGHT", -40, -64) + ClassTrainerFrameFilterDropDown:SetPoint("TOPRIGHT", -55, -40) - E:StripTextures(ClassTrainerListScrollFrame) S:HandleScrollBar(ClassTrainerListScrollFrameScrollBar) - - E:StripTextures(ClassTrainerDetailScrollFrame) S:HandleScrollBar(ClassTrainerDetailScrollFrameScrollBar) - E:StripTextures(ClassTrainerSkillIcon) - - E:Kill(ClassTrainerCancelButton) + ClassTrainerCancelButton:ClearAllPoints() + ClassTrainerCancelButton:SetPoint("TOPRIGHT", ClassTrainerDetailScrollFrame, "BOTTOMRIGHT", 23, -3) + S:HandleButton(ClassTrainerCancelButton) + ClassTrainerTrainButton:ClearAllPoints() + ClassTrainerTrainButton:SetPoint("TOPRIGHT", ClassTrainerCancelButton, "TOPLEFT", -3, 0) S:HandleButton(ClassTrainerTrainButton) - E:Point(ClassTrainerTrainButton, "BOTTOMRIGHT", -38, 80) + + ClassTrainerMoneyFrame:ClearAllPoints() + ClassTrainerMoneyFrame:SetPoint("BOTTOMLEFT", ClassTrainerFrame, "BOTTOMRIGHT", -180, 107) S:HandleCloseButton(ClassTrainerFrameCloseButton) + E:StripTextures(ClassTrainerSkillIcon) + E:SetTemplate(ClassTrainerSkillIcon, "Default") + E:StyleButton(ClassTrainerSkillIcon, nil, true) + E:Size(ClassTrainerSkillIcon, 47) + ClassTrainerSkillIcon:SetPoint("TOPLEFT", 2, -1) + + ClassTrainerSkillName:SetPoint("TOPLEFT", 55, 0) + hooksecurefunc("ClassTrainer_SetSelection", function() local skillIcon = ClassTrainerSkillIcon:GetNormalTexture() if skillIcon then @@ -48,6 +87,22 @@ local function LoadSkin() end end) + CLASS_TRAINER_SKILLS_DISPLAYED = 19 + + hooksecurefunc("ClassTrainer_SetToTradeSkillTrainer", function() + CLASS_TRAINER_SKILLS_DISPLAYED = 19 + end) + + hooksecurefunc("ClassTrainer_SetToClassTrainer", function() + CLASS_TRAINER_SKILLS_DISPLAYED = 19 + end) + + for i = 12, 19 do + CreateFrame("Button", "ClassTrainerSkill"..i, ClassTrainerFrame, "ClassTrainerSkillButtonTemplate"):SetPoint("TOPLEFT", _G["ClassTrainerSkill"..i - 1], "BOTTOMLEFT") + end + + ClassTrainerSkill1:SetPoint("TOPLEFT", 22, -80) + for i = 1, CLASS_TRAINER_SKILLS_DISPLAYED do local button = _G["ClassTrainerSkill"..i] local highlight = _G["ClassTrainerSkill"..i.."Highlight"] @@ -70,6 +125,8 @@ local function LoadSkin() end) end + ClassTrainerCollapseAllButton:SetPoint("LEFT", ClassTrainerExpandTabLeft, "RIGHT", 5, 20) + ClassTrainerCollapseAllButton:SetNormalTexture("Interface\\AddOns\\ElvUI\\media\\textures\\PlusMinusButton") ClassTrainerCollapseAllButton.SetNormalTexture = E.noop ClassTrainerCollapseAllButton:GetNormalTexture():SetPoint("LEFT", 3, 2)