diff --git a/ElvUI_SLE/core/toolkit.lua b/ElvUI_SLE/core/toolkit.lua index 09501c6..c1beb0c 100644 --- a/ElvUI_SLE/core/toolkit.lua +++ b/ElvUI_SLE/core/toolkit.lua @@ -417,33 +417,6 @@ function SLE:UpdateAll() collectgarbage('collect'); end -local function GetTemplate(t, isPixelPerfectForced) - backdropa = 1 - - if t == "ClassColor" then - if CUSTOM_CLASS_COLORS then - borderr, borderg, borderb = CUSTOM_CLASS_COLORS[E.myclass].r, CUSTOM_CLASS_COLORS[E.myclass].g, CUSTOM_CLASS_COLORS[E.myclass].b - else - borderr, borderg, borderb = RAID_CLASS_COLORS[E.myclass].r, RAID_CLASS_COLORS[E.myclass].g, RAID_CLASS_COLORS[E.myclass].b - end - if t ~= "Transparent" then - backdropr, backdropg, backdropb = unpack(E["media"].backdropcolor) - else - backdropr, backdropg, backdropb, backdropa = unpack(E["media"].backdropfadecolor) - end - elseif t == "Transparent" then - borderr, borderg, borderb = unpack(E["media"].bordercolor) - backdropr, backdropg, backdropb, backdropa = unpack(E["media"].backdropfadecolor) - else - borderr, borderg, borderb = unpack(E["media"].bordercolor) - backdropr, backdropg, backdropb = unpack(E["media"].backdropcolor) - end - - if(isPixelPerfectForced) then - borderr, borderg, borderb = 0, 0, 0 - end -end - --New API local function LevelUpBG(frame, topcolor, bottomcolor) frame.bg = frame:CreateTexture(nil, 'BACKGROUND') @@ -506,110 +479,10 @@ local function LevelUpBG(frame, topcolor, bottomcolor) end end -local function SetTemplateSLE(f, t, glossTex, ignoreUpdates, forcePixelMode) - GetTemplate(t, f.forcePixelMode or forcePixelMode) - - if(t) then - f.template = t - end - - if(glossTex) then - f.glossTex = glossTex - end - - if(ignoreUpdates) then - f.ignoreUpdates = ignoreUpdates - end - - if(forcePixelMode) then - f.forcePixelMode = forcePixelMode - end - if t ~= "NoDrop" then - if E.private.general.pixelPerfect or f.forcePixelMode then - f:SetBackdrop({ - bgFile = E["media"].blankTex, - edgeFile = E["media"].blankTex, - tile = false, tileSize = 0, edgeSize = E.mult, - insets = { left = 0, right = 0, top = 0, bottom = 0} - }) - else - f:SetBackdrop({ - bgFile = E["media"].blankTex, - edgeFile = E["media"].blankTex, - tile = false, tileSize = 0, edgeSize = E.mult, - insets = { left = -E.mult, right = -E.mult, top = -E.mult, bottom = -E.mult} - }) - end - - if not f.backdropTexture and t ~= 'Transparent' then - local backdropTexture = f:CreateTexture(nil, "BORDER") - backdropTexture:SetDrawLayer("BACKGROUND", 1) - f.backdropTexture = backdropTexture - elseif t == 'Transparent' then - f:SetBackdropColor(backdropr, backdropg, backdropb, backdropa) - - if f.backdropTexture then - f.backdropTexture:Hide() - f.backdropTexture = nil - end - - if not f.oborder and not f.iborder and not E.private.general.pixelPerfect and not f.forcePixelMode then - local border = CreateFrame("Frame", nil, f) - border:SetInside(f, E.mult, E.mult) - border:SetBackdrop({ - edgeFile = E["media"].blankTex, - edgeSize = E.mult, - insets = { left = E.mult, right = E.mult, top = E.mult, bottom = E.mult } - }) - border:SetBackdropBorderColor(0, 0, 0, 1) - f.iborder = border - - if f.oborder then return end - local border = CreateFrame("Frame", nil, f) - border:SetOutside(f, E.mult, E.mult) - border:SetFrameLevel(f:GetFrameLevel() + 1) - border:SetBackdrop({ - edgeFile = E["media"].blankTex, - edgeSize = E.mult, - insets = { left = E.mult, right = E.mult, top = E.mult, bottom = E.mult } - }) - border:SetBackdropBorderColor(0, 0, 0, 1) - f.oborder = border - end - end - - if f.backdropTexture then - f:SetBackdropColor(0, 0, 0, backdropa) - f.backdropTexture:SetVertexColor(backdropr, backdropg, backdropb) - f.backdropTexture:SetAlpha(backdropa) - if glossTex then - f.backdropTexture:SetTexture(E["media"].glossTex) - else - f.backdropTexture:SetTexture(E["media"].blankTex) - end - - if(f.forcePixelMode or forcePixelMode) then - f.backdropTexture:SetInside(f, E.mult, E.mult) - else - f.backdropTexture:SetInside(f) - end - end - else - f:SetBackdrop(nil) - if f.backdropTexture then f.backdropTexture:SetTexture(nil) end - end - f:SetBackdropBorderColor(borderr, borderg, borderb) - - if not f.ignoreUpdates and not f.forcePixelMode then - E["frames"][f] = true - end -end - --Add API local function addapi(object) local mt = getmetatable(object).__index if not object.LevelUpBG then mt.LevelUpBG = LevelUpBG end - if not object.SetTemplateSLE then mt.SetTemplateSLE = SetTemplateSLE end end local handled = {["Frame"] = true} diff --git a/ElvUI_SLE/modules/chat/chat.lua b/ElvUI_SLE/modules/chat/chat.lua index de27528..d253bce 100644 --- a/ElvUI_SLE/modules/chat/chat.lua +++ b/ElvUI_SLE/modules/chat/chat.lua @@ -179,23 +179,17 @@ local function ChatPanels() RightChatDataPanel:Height(20) end -function LO:SetDataPanelStyle() +local function SetDataPanelStyle() if E.db.datatexts.panelTransparency then - LeftChatDataPanel:SetTemplateSLE(E.db.sle.datatexts.leftchat.noborders and "NoDrop" or "Transparent") - LeftChatToggleButton:SetTemplateSLE(E.db.sle.datatexts.leftchat.noborders and "NoDrop" or "Transparent") - LeftMiniPanel:SetTemplate("Transparent") - RightChatDataPanel:SetTemplateSLE(E.db.sle.datatexts.rightchat.noborders and "NoDrop" or "Transparent") - RightChatToggleButton:SetTemplateSLE(E.db.sle.datatexts.rightchat.noborders and "NoDrop" or "Transparent") - RightMiniPanel:SetTemplate("Transparent") - -- ElvConfigToggle:SetTemplate("Transparent") + LeftChatDataPanel:SetTemplate(E.db.sle.datatexts.leftchat.noborders and "NoDrop" or "Transparent") + LeftChatToggleButton:SetTemplate(E.db.sle.datatexts.leftchat.noborders and "NoDrop" or "Transparent") + RightChatDataPanel:SetTemplate(E.db.sle.datatexts.rightchat.noborders and "NoDrop" or "Transparent") + RightChatToggleButton:SetTemplate(E.db.sle.datatexts.rightchat.noborders and "NoDrop" or "Transparent") else - LeftChatDataPanel:SetTemplateSLE(E.db.sle.datatexts.leftchat.noborders and "NoDrop" or "Default", true) - LeftChatToggleButton:SetTemplateSLE(E.db.sle.datatexts.leftchat.noborders and "NoDrop" or "Default", true) - LeftMiniPanel:SetTemplate("Default", true) - RightChatDataPanel:SetTemplateSLE(E.db.sle.datatexts.rightchat.noborders and "NoDrop" or "Default", true) - RightChatToggleButton:SetTemplateSLE(E.db.sle.datatexts.rightchat.noborders and "NoDrop" or "Default", true) - RightMiniPanel:SetTemplate("Default", true) - -- ElvConfigToggle:SetTemplate("Default", true) + LeftChatDataPanel:SetTemplate(E.db.sle.datatexts.leftchat.noborders and "NoDrop" or "Default", true) + LeftChatToggleButton:SetTemplate(E.db.sle.datatexts.leftchat.noborders and "NoDrop" or "Default", true) + RightChatDataPanel:SetTemplate(E.db.sle.datatexts.rightchat.noborders and "NoDrop" or "Default", true) + RightChatToggleButton:SetTemplate(E.db.sle.datatexts.rightchat.noborders and "NoDrop" or "Default", true) end end @@ -213,9 +207,7 @@ local function CreateChatPanels() LeftChatDataPanel:Point("TOPLEFT", LeftChatToggleButton, "TOPRIGHT", -1 + E.Spacing*2, 0) LeftChatDataPanel:Point("BOTTOMLEFT", LeftChatToggleButton, "BOTTOMRIGHT", -1 + E.Spacing*2, 0) LeftChatDataPanel:Size(E.db.sle.datatexts.leftchat.width, PANEL_HEIGHT) - - -- LeftChatDataPanel:SetTemplateSLE("NoDrop") - + --Right Chat RightChatTab:Point('TOPRIGHT', RightChatPanel, 'TOPRIGHT', -2, -2) RightChatTab:Point('BOTTOMLEFT', RightChatPanel, 'TOPLEFT', 2, -PANEL_HEIGHT) @@ -308,7 +300,7 @@ function C:Initialize() C:InitTabs() end hooksecurefunc(LO, "CreateChatPanels", CreateChatPanels) --- hooksecurefunc(LO, "SetDataPanelStyle", SetDataPanelStyle) +hooksecurefunc(LO, "SetDataPanelStyle", SetDataPanelStyle) CH:AddPluginIcons(GetChatIcon) SLE:RegisterModule(C:GetName()) \ No newline at end of file diff --git a/ElvUI_SLE/modules/datatexts.lua b/ElvUI_SLE/modules/datatexts.lua index 010a2cd..7705928 100644 --- a/ElvUI_SLE/modules/datatexts.lua +++ b/ElvUI_SLE/modules/datatexts.lua @@ -99,9 +99,9 @@ end function DTP:Template(i) if DTP.db["panel"..i].transparent then - self["Panel_"..i]:SetTemplateSLE(DTP.db["panel"..i].noback and "NoDrop" or "Transparent") + self["Panel_"..i]:SetTemplate(DTP.db["panel"..i].noback and "NoDrop" or "Transparent") else - self["Panel_"..i]:SetTemplateSLE(DTP.db["panel"..i].noback and "NoDrop" or "Default", true) + self["Panel_"..i]:SetTemplate(DTP.db["panel"..i].noback and "NoDrop" or "Default", true) end end