diff --git a/ElvUI/Modules/NamePlates/NamePlates.lua b/ElvUI/Modules/NamePlates/NamePlates.lua index 66baf81..e8ecd21 100644 --- a/ElvUI/Modules/NamePlates/NamePlates.lua +++ b/ElvUI/Modules/NamePlates/NamePlates.lua @@ -193,75 +193,75 @@ function mod:StyleFrame(parent, noBackdrop, point) if E.PixelMode then point.bordertop = parent:CreateTexture() - E:Point(point.bordertop, "TOPLEFT", point, "TOPLEFT", -noscalemult, noscalemult) - E:Point(point.bordertop, "TOPRIGHT", point, "TOPRIGHT", noscalemult, noscalemult) - E:Height(point.bordertop, noscalemult) + point.bordertop:SetPoint("TOPLEFT", point, "TOPLEFT", -noscalemult, noscalemult) + point.bordertop:SetPoint("TOPRIGHT", point, "TOPRIGHT", noscalemult, noscalemult) + point.bordertop:SetHeight(noscalemult) point.bordertop:SetTexture(unpack(E["media"].bordercolor)) point.borderbottom = parent:CreateTexture() - E:Point(point.borderbottom, "BOTTOMLEFT", point, "BOTTOMLEFT", -noscalemult, -noscalemult) - E:Point(point.borderbottom, "BOTTOMRIGHT", point, "BOTTOMRIGHT", noscalemult, -noscalemult) - E:Height(point.borderbottom, noscalemult) + point.borderbottom:SetPoint("BOTTOMLEFT", point, "BOTTOMLEFT", -noscalemult, -noscalemult) + point.borderbottom:SetPoint("BOTTOMRIGHT", point, "BOTTOMRIGHT", noscalemult, -noscalemult) + point.borderbottom:SetHeight(noscalemult) point.borderbottom:SetTexture(unpack(E["media"].bordercolor)) point.borderleft = parent:CreateTexture() - E:Point(point.borderleft, "TOPLEFT", point, "TOPLEFT", -noscalemult, noscalemult) - E:Point(point.borderleft, "BOTTOMLEFT", point, "BOTTOMLEFT", noscalemult, -noscalemult) - E:Width(point.borderleft, noscalemult) + point.borderleft:SetPoint("TOPLEFT", point, "TOPLEFT", -noscalemult, noscalemult) + point.borderleft:SetPoint("BOTTOMLEFT", point, "BOTTOMLEFT", noscalemult, -noscalemult) + point.borderleft:SetWidth(noscalemult) point.borderleft:SetTexture(unpack(E["media"].bordercolor)) point.borderright = parent:CreateTexture() - E:Point(point.borderright, "TOPRIGHT", point, "TOPRIGHT", noscalemult, noscalemult) - E:Point(point.borderright, "BOTTOMRIGHT", point, "BOTTOMRIGHT", -noscalemult, -noscalemult) - E:Width(point.borderright, noscalemult) + point.borderright:SetPoint("TOPRIGHT", point, "TOPRIGHT", noscalemult, noscalemult) + point.borderright:SetPoint("BOTTOMRIGHT", point, "BOTTOMRIGHT", -noscalemult, -noscalemult) + point.borderright:SetWidth(noscalemult) point.borderright:SetTexture(unpack(E["media"].bordercolor)) else point.bordertop = parent:CreateTexture(nil, "OVERLAY") - E:Point(point.bordertop, "TOPLEFT", point, "TOPLEFT", -noscalemult, noscalemult*2) - E:Point(point.bordertop, "TOPRIGHT", point, "TOPRIGHT", noscalemult, noscalemult*2) - E:Height(point.bordertop, noscalemult) + point.bordertop:SetPoint("TOPLEFT", point, "TOPLEFT", -noscalemult, noscalemult*2) + point.bordertop:SetPoint("TOPRIGHT", point, "TOPRIGHT", noscalemult, noscalemult*2) + point.bordertop:SetHeight(noscalemult) point.bordertop:SetTexture(unpack(E.media.bordercolor)) point.bordertop.backdrop = parent:CreateTexture() - E:Point(point.bordertop.backdrop, "TOPLEFT", point.bordertop, "TOPLEFT", noscalemult, noscalemult) - E:Point(point.bordertop.backdrop, "TOPRIGHT", point.bordertop, "TOPRIGHT", -noscalemult, noscalemult) - E:Height(point.bordertop.backdrop, noscalemult * 3) + point.bordertop.backdrop:SetPoint("TOPLEFT", point.bordertop, "TOPLEFT", noscalemult, noscalemult) + point.bordertop.backdrop:SetPoint("TOPRIGHT", point.bordertop, "TOPRIGHT", -noscalemult, noscalemult) + point.bordertop.backdrop:SetHeight(noscalemult * 3) point.bordertop.backdrop:SetTexture(0, 0, 0) point.borderbottom = parent:CreateTexture(nil, "OVERLAY") - E:Point(point.borderbottom, "BOTTOMLEFT", point, "BOTTOMLEFT", -noscalemult, -noscalemult*2) - E:Point(point.borderbottom, "BOTTOMRIGHT", point, "BOTTOMRIGHT", noscalemult, -noscalemult*2) - E:Height(point.borderbottom, noscalemult) + point.borderbottom:SetPoint("BOTTOMLEFT", point, "BOTTOMLEFT", -noscalemult, -noscalemult*2) + point.borderbottom:SetPoint("BOTTOMRIGHT", point, "BOTTOMRIGHT", noscalemult, -noscalemult*2) + point.borderbottom:SetHeight(noscalemult) point.borderbottom:SetTexture(unpack(E.media.bordercolor)) point.borderbottom.backdrop = parent:CreateTexture() - E:Point(point.borderbottom.backdrop, "BOTTOMLEFT", point.borderbottom, "BOTTOMLEFT", noscalemult, -noscalemult) - E:Point(point.borderbottom.backdrop, "BOTTOMRIGHT", point.borderbottom, "BOTTOMRIGHT", -noscalemult, -noscalemult) - E:Height(point.borderbottom.backdrop, noscalemult * 3) + point.borderbottom.backdrop:SetPoint("BOTTOMLEFT", point.borderbottom, "BOTTOMLEFT", noscalemult, -noscalemult) + point.borderbottom.backdrop:SetPoint("BOTTOMRIGHT", point.borderbottom, "BOTTOMRIGHT", -noscalemult, -noscalemult) + point.borderbottom.backdrop:SetHeight(noscalemult * 3) point.borderbottom.backdrop:SetTexture(0, 0, 0) point.borderleft = parent:CreateTexture(nil, "OVERLAY") - E:Point(point.borderleft, "TOPLEFT", point, "TOPLEFT", -noscalemult*2, noscalemult*2) - E:Point(point.borderleft, "BOTTOMLEFT", point, "BOTTOMLEFT", noscalemult*2, -noscalemult*2) - E:Width(point.borderleft, noscalemult) + point.borderleft:SetPoint("TOPLEFT", point, "TOPLEFT", -noscalemult*2, noscalemult*2) + point.borderleft:SetPoint("BOTTOMLEFT", point, "BOTTOMLEFT", noscalemult*2, -noscalemult*2) + point.borderleft:SetWidth(noscalemult) point.borderleft:SetTexture(unpack(E.media.bordercolor)) point.borderleft.backdrop = parent:CreateTexture() - E:Point(point.borderleft.backdrop, "TOPLEFT", point.borderleft, "TOPLEFT", -noscalemult, noscalemult) - E:Point(point.borderleft.backdrop, "BOTTOMLEFT", point.borderleft, "BOTTOMLEFT", -noscalemult, -noscalemult) - E:Width(point.borderleft.backdrop, noscalemult * 3) + point.borderleft.backdrop:SetPoint("TOPLEFT", point.borderleft, "TOPLEFT", -noscalemult, noscalemult) + point.borderleft.backdrop:SetPoint("BOTTOMLEFT", point.borderleft, "BOTTOMLEFT", -noscalemult, -noscalemult) + point.borderleft.backdrop:SetWidth(noscalemult * 3) point.borderleft.backdrop:SetTexture(0, 0, 0) point.borderright = parent:CreateTexture(nil, "OVERLAY") - E:Point(point.borderright, "TOPRIGHT", point, "TOPRIGHT", noscalemult*2, noscalemult*2) - E:Point(point.borderright, "BOTTOMRIGHT", point, "BOTTOMRIGHT", -noscalemult*2, -noscalemult*2) - E:Width(point.borderright, noscalemult) + point.borderright:SetPoint("TOPRIGHT", point, "TOPRIGHT", noscalemult*2, noscalemult*2) + point.borderright:SetPoint("BOTTOMRIGHT", point, "BOTTOMRIGHT", -noscalemult*2, -noscalemult*2) + point.borderright:SetWidth(noscalemult) point.borderright:SetTexture(unpack(E.media.bordercolor)) point.borderright.backdrop = parent:CreateTexture() - E:Point(point.borderright.backdrop, "TOPRIGHT", point.borderright, "TOPRIGHT", noscalemult, noscalemult) - E:Point(point.borderright.backdrop, "BOTTOMRIGHT", point.borderright, "BOTTOMRIGHT", noscalemult, -noscalemult) - E:Width(point.borderright.backdrop, noscalemult * 3) + point.borderright.backdrop:SetPoint("TOPRIGHT", point.borderright, "TOPRIGHT", noscalemult, noscalemult) + point.borderright.backdrop:SetPoint("BOTTOMRIGHT", point.borderright, "BOTTOMRIGHT", noscalemult, -noscalemult) + point.borderright.backdrop:SetWidth(noscalemult * 3) point.borderright.backdrop:SetTexture(0, 0, 0) end end diff --git a/ElvUI/Modules/Skins/Blizzard/Craft.lua b/ElvUI/Modules/Skins/Blizzard/Craft.lua index 80cb9d8..a554cb7 100644 --- a/ElvUI/Modules/Skins/Blizzard/Craft.lua +++ b/ElvUI/Modules/Skins/Blizzard/Craft.lua @@ -7,10 +7,12 @@ local _G = _G local unpack = unpack local find, match, split = string.find, string.match, string.split --WoW API / Variables +local CreateFrame = CreateFrame local GetItemInfo = GetItemInfo local GetItemQualityColor = GetItemQualityColor -local GetCraftReagentInfo = GetCraftReagentInfo local GetCraftItemLink = GetCraftItemLink +local GetCraftReagentInfo = GetCraftReagentInfo +local GetCraftReagentItemLink = GetCraftReagentItemLink local hooksecurefunc = hooksecurefunc local function LoadSkin() @@ -50,6 +52,7 @@ local function LoadSkin() CraftRankFrameSkillName:Hide() CraftRankFrameSkillRank:ClearAllPoints() + CraftRankFrameSkillRank:SetParent(CraftRankFrame) CraftRankFrameSkillRank:SetPoint("CENTER", CraftRankFrame, "CENTER", 58, 0) E:StripTextures(CraftListScrollFrame) @@ -61,7 +64,6 @@ local function LoadSkin() E:Size(CraftDetailScrollFrame, 300, 381) CraftDetailScrollFrame:ClearAllPoints() CraftDetailScrollFrame:SetPoint("TOPRIGHT", CraftFrame, -60, -95) - CraftDetailScrollFrame.scrollBarHideable = nil E:StripTextures(CraftDetailScrollChildFrame) E:Size(CraftDetailScrollChildFrame, 300, 150) @@ -81,9 +83,9 @@ local function LoadSkin() E:SetTemplate(CraftIcon, "Default") E:StyleButton(CraftIcon, nil, true) E:Size(CraftIcon, 47) - CraftIcon:SetPoint("TOPLEFT", 2, -1) + CraftIcon:SetPoint("TOPLEFT", 1, -3) - CraftName:SetPoint("TOPLEFT", 55, 0) + CraftName:SetPoint("TOPLEFT", 55, -3) CraftRequirements:SetTextColor(1, 0.80, 0.10) @@ -178,7 +180,13 @@ local function LoadSkin() CraftReagent6:SetPoint("LEFT", CraftReagent5, "RIGHT", 3, 0) CraftReagent8:SetPoint("LEFT", CraftReagent7, "RIGHT", 3, 0) + hooksecurefunc("CraftFrame_Update", function() + CraftRankFrame:SetStatusBarColor(0.13, 0.28, 0.85) + end) + hooksecurefunc("CraftFrame_SetSelection", function(id) + CraftReagentLabel:SetPoint("TOPLEFT", CraftDescription, "BOTTOMLEFT", 0, -10) + if CraftIcon:GetNormalTexture() then CraftReagentLabel:SetAlpha(1) CraftIcon:SetAlpha(1) diff --git a/ElvUI/Modules/Skins/Blizzard/TradeSkill.lua b/ElvUI/Modules/Skins/Blizzard/TradeSkill.lua index cacaf4b..1da9e77 100644 --- a/ElvUI/Modules/Skins/Blizzard/TradeSkill.lua +++ b/ElvUI/Modules/Skins/Blizzard/TradeSkill.lua @@ -7,6 +7,7 @@ local _G = _G local unpack = unpack local find, match, split = string.find, string.match, string.split --WoW API / Variables +local CreateFrame = CreateFrame local GetItemInfo = GetItemInfo local GetItemQualityColor = GetItemQualityColor local GetTradeSkillItemLink = GetTradeSkillItemLink @@ -51,6 +52,7 @@ local function LoadSkin() TradeSkillRankFrameSkillName:Hide() TradeSkillRankFrameSkillRank:ClearAllPoints() + TradeSkillRankFrameSkillRank:SetParent(TradeSkillRankFrame) TradeSkillRankFrameSkillRank:SetPoint("CENTER", TradeSkillRankFrame, "CENTER", 58, 0) E:StripTextures(TradeSkillListScrollFrame) @@ -102,9 +104,9 @@ local function LoadSkin() E:SetTemplate(TradeSkillSkillIcon, "Default") E:StyleButton(TradeSkillSkillIcon, nil, true) E:Size(TradeSkillSkillIcon, 47) - TradeSkillSkillIcon:SetPoint("TOPLEFT", 2, -1) + TradeSkillSkillIcon:SetPoint("TOPLEFT", 1, -3) - TradeSkillSkillName:SetPoint("TOPLEFT", 55, 0) + TradeSkillSkillName:SetPoint("TOPLEFT", 55, -3) TradeSkillRequirementLabel:SetTextColor(1, 0.80, 0.10) @@ -193,6 +195,9 @@ local function LoadSkin() E:Kill(nameFrame) end + TradeSkillReagentLabel:ClearAllPoints() + TradeSkillReagentLabel:SetPoint("TOPLEFT", TradeSkillSkillIcon, "BOTTOMLEFT", 5, -10) + TradeSkillReagent1:SetPoint("TOPLEFT", TradeSkillReagentLabel, "BOTTOMLEFT", -3, -3) TradeSkillReagent2:SetPoint("LEFT", TradeSkillReagent1, "RIGHT", 3, 0) TradeSkillReagent4:SetPoint("LEFT", TradeSkillReagent3, "RIGHT", 3, 0)