diff --git a/Interface/AddOns/SVUI/assets/artwork/Icons/CLOSE-BUTTON.blp b/Interface/AddOns/SVUI/assets/artwork/Icons/CLOSE-BUTTON.blp new file mode 100644 index 0000000..faf517b Binary files /dev/null and b/Interface/AddOns/SVUI/assets/artwork/Icons/CLOSE-BUTTON.blp differ diff --git a/Interface/AddOns/SVUI/libs/oUF_Villain/oUF/elements/eclipsebar.lua b/Interface/AddOns/SVUI/libs/oUF_Villain/oUF/elements/eclipsebar.lua index b794c0b..8653f0f 100644 --- a/Interface/AddOns/SVUI/libs/oUF_Villain/oUF/elements/eclipsebar.lua +++ b/Interface/AddOns/SVUI/libs/oUF_Villain/oUF/elements/eclipsebar.lua @@ -92,7 +92,7 @@ local ECLIPSE_DIRECTION_CHANGE = function(self, event, status) local eb = self.EclipseBar if(status and eb:IsVisible() and eb.PostDirectionChange[status]) then - return eb.PostDirectionChange[status](self.unit) + return eb.PostDirectionChange[status](eb) end end diff --git a/Interface/AddOns/SVUI/packages/unit/SVUnit.lua b/Interface/AddOns/SVUI/packages/unit/SVUnit.lua index 788c12e..6e0a8de 100644 --- a/Interface/AddOns/SVUI/packages/unit/SVUnit.lua +++ b/Interface/AddOns/SVUI/packages/unit/SVUnit.lua @@ -1145,8 +1145,13 @@ function MOD:RefreshUnitLayout(frame, template) --[[ RANGE CHECK LAYOUT ]]-- - if frame.Range then - frame.Range.outsideAlpha = self.db.OORAlpha or 1; + if frame.Range then + if(template:find("raid") or template:find("party")) then + frame.Range.outsideAlpha = self.db.groupOORAlpha or 1 + else + frame.Range.outsideAlpha = self.db.OORAlpha or 1 + end + if db.rangeCheck then if not frame:IsElementEnabled('Range')then frame:EnableElement('Range') diff --git a/Interface/AddOns/SVUI/packages/unit/config.lua b/Interface/AddOns/SVUI/packages/unit/config.lua index 96ec2de..5b0c2f0 100644 --- a/Interface/AddOns/SVUI/packages/unit/config.lua +++ b/Interface/AddOns/SVUI/packages/unit/config.lua @@ -49,7 +49,8 @@ CONFIGS["SVUnit"] = { ["auraFontSize"] = 12, ["auraFontOutline"] = "OUTLINE", - ["OORAlpha"] = 0.65, + ["OORAlpha"] = 0.65, + ["groupOORAlpha"] = 0.45, ["combatFadeRoles"] = true, ["combatFadeNames"] = true, ["debuffHighlighting"] = true, diff --git a/Interface/AddOns/SVUI/system/common.lua b/Interface/AddOns/SVUI/system/common.lua index 7ded30a..0c3de1c 100644 --- a/Interface/AddOns/SVUI/system/common.lua +++ b/Interface/AddOns/SVUI/system/common.lua @@ -819,11 +819,11 @@ end TEMPLATE HELPERS ########################################################## ]]-- -local function CreatePanelTemplate(frame, templateName, underlay, noupdate, padding, xOffset, yOffset) +local function CreatePanelTemplate(frame, templateName, underlay, noupdate, padding, xOffset, yOffset, defaultColor) if(not templateName or not _templates[templateName]) then templateName = frame._template or 'Default' end local settings = _templates[templateName] - local colorName = settings.color + local colorName = defaultColor or settings.color or "default" local gradientName = settings.gradient local texFile = settings.texture local hasShadow = settings.shadow @@ -1191,13 +1191,13 @@ local function SetBasicPanel(self, topX, topY, bottomX, bottomY, hasShadow) end end -local function SetPanelTemplate(self, templateName, noupdate, overridePadding, xOffset, yOffset) +local function SetPanelTemplate(self, templateName, noupdate, overridePadding, xOffset, yOffset, defaultColor) local padding = false if(overridePadding and type(overridePadding) == "number") then padding = overridePadding end - CreatePanelTemplate(self, templateName, true, noupdate, padding, xOffset, yOffset) + CreatePanelTemplate(self, templateName, true, noupdate, padding, xOffset, yOffset, defaultColor) if(not self._noupdate and not self.__registered) then TemplateUpdateFrames[self] = true @@ -1205,13 +1205,13 @@ local function SetPanelTemplate(self, templateName, noupdate, overridePadding, x end end -local function SetFixedPanelTemplate(self, templateName, noupdate, overridePadding, xOffset, yOffset) +local function SetFixedPanelTemplate(self, templateName, noupdate, overridePadding, xOffset, yOffset, defaultColor) local padding = false if(overridePadding and type(overridePadding) == "number") then padding = overridePadding end - CreatePanelTemplate(self, templateName, false, noupdate, padding, xOffset, yOffset) + CreatePanelTemplate(self, templateName, false, noupdate, padding, xOffset, yOffset, defaultColor) if(not self._noupdate and not self.__registered) then TemplateUpdateFrames[self] = true @@ -1264,22 +1264,28 @@ end APPENDED BUTTON TEMPLATING METHODS ########################################################## ]]-- -local function SetButtonTemplate(self, invisible, overridePadding, xOffset, yOffset, keepNormal) +local function SetButtonTemplate(self, invisible, overridePadding, xOffset, yOffset, keepNormal, defaultColor) if(not self) then return end local padding = 1 if(overridePadding and type(overridePadding) == "number") then padding = overridePadding end - xOffset = xOffset or -1 - yOffset = yOffset or -1 + + local x,y = -1,-1 + local underlay = false + if(xOffset or yOffset) then + x = xOffset or -1 + y = yOffset or -1 + underlay = true + end if(invisible) then - CreatePanelTemplate(self, "Transparent", false, true, padding, xOffset, yOffset) + CreatePanelTemplate(self, "Transparent", underlay, true, padding, x, y, defaultColor) self:SetBackdropColor(0,0,0,0) self:SetBackdropBorderColor(0,0,0,0) else - CreatePanelTemplate(self, "Button", false, true, padding, xOffset, yOffset) + CreatePanelTemplate(self, "Button", underlay, true, padding, x, y, defaultColor) end if(self.Left) then diff --git a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/core.lua b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/core.lua index 8ed9bfe..819fe39 100644 --- a/Interface/AddOns/SVUI_ConfigOMatic/modules/units/core.lua +++ b/Interface/AddOns/SVUI_ConfigOMatic/modules/units/core.lua @@ -1545,6 +1545,19 @@ SV.Options.args.SVUnit = { MOD:ChangeDBVar(value, key[#key]); end }, + groupOORAlpha = { + order = 7, + name = L["Group Range Fading"], + desc = L["The transparency of group units that are out of range."], + type = "range", + min = 0, + max = 1, + step = 0.01, + width = "full", + set = function(key, value) + MOD:ChangeDBVar(value, key[#key]); + end + }, } }, backgroundGroup = { diff --git a/Interface/AddOns/SVUI_StyleOMatic/addons/auctionhouse.lua b/Interface/AddOns/SVUI_StyleOMatic/addons/auctionhouse.lua index 5d811ba..37941d4 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/addons/auctionhouse.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/addons/auctionhouse.lua @@ -103,11 +103,14 @@ local function AuctionStyle() --ExactMatchCheckButton:SetCheckboxTemplate(true) SideDressUpFrame:RemoveTextures(true) - SideDressUpFrame:SetPanelTemplate("Halftone") - SideDressUpFrame:Point("TOPLEFT", AuctionFrame, "TOPRIGHT", 7, 0) + SideDressUpFrame:Size(300, 400) + SideDressUpFrame:SetPoint("LEFT", AuctionFrame, "RIGHT", 16, 0) + SideDressUpFrame.SetPoint = SV.fubar SideDressUpModel:RemoveTextures(true) + SideDressUpModel:SetAllPoints(SideDressUpFrame) SideDressUpModel:SetFixedPanelTemplate("ModelComic") SideDressUpModelResetButton:SetButtonTemplate() + SideDressUpModelResetButton:SetPoint("BOTTOM", SideDressUpModel, "BOTTOM", 0, 20) STYLE:ApplyCloseButtonStyle(SideDressUpModelCloseButton) AuctionProgressFrame:RemoveTextures() diff --git a/Interface/AddOns/SVUI_StyleOMatic/common/methods.lua b/Interface/AddOns/SVUI_StyleOMatic/common/methods.lua index 4ef8230..02607b8 100644 --- a/Interface/AddOns/SVUI_StyleOMatic/common/methods.lua +++ b/Interface/AddOns/SVUI_StyleOMatic/common/methods.lua @@ -131,7 +131,11 @@ local CloseButton_OnLeave = function(self) end function STYLE:ApplyCloseButtonStyle(this, anchor) - if not this then return end + if not this then return end + this:RemoveTextures() + this:SetButtonTemplate(nil, 1, -7, -7, nil, "red") + this:SetFrameLevel(this:GetFrameLevel() + 4) + this:SetNormalTexture([[Interface\AddOns\SVUI\assets\artwork\Icons\CLOSE-BUTTON]]) if not this.hookedColors then this:HookScript("OnEnter", CloseButton_OnEnter) this:HookScript("OnLeave", CloseButton_OnLeave) @@ -589,20 +593,20 @@ function STYLE:ApplyAlertStyle(frame) alertpanel:SetAllPoints(frame) alertpanel:SetFrameLevel(frame:GetFrameLevel() - 1) alertpanel:SetBackdrop({ - bgFile = "Interface\\AddOns\\SVUI\\assets\\artwork\\Template\\Alert\\ALERT-BG" + bgFile = [[Interface\AddOns\SVUI\assets\artwork\Template\Alert\ALERT-BG]] }) alertpanel:SetBackdropColor(0.8, 0.2, 0.2) --[[ LEFT ]]-- local left = alertpanel:CreateTexture(nil, "BORDER") - left:SetTexture("Interface\\AddOns\\SVUI\\assets\\artwork\\Template\\Alert\\ALERT-LEFT") + left:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Template\Alert\ALERT-LEFT]]) left:Point("TOPRIGHT", alertpanel,"TOPLEFT", 0, 0) left:Point("BOTTOMRIGHT", alertpanel, "BOTTOMLEFT", 0, 0) left:Width(frame:GetHeight()) --[[ RIGHT ]]-- local right = alertpanel:CreateTexture(nil, "BORDER") - right:SetTexture("Interface\\AddOns\\SVUI\\assets\\artwork\\Template\\Alert\\ALERT-RIGHT") + right:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Template\Alert\ALERT-RIGHT]]) right:SetVertexColor(0.8, 0.2, 0.2) right:Point("TOPLEFT", alertpanel,"TOPRIGHT", -1, 0) right:Point("BOTTOMLEFT", alertpanel, "BOTTOMRIGHT", -1, 0) @@ -610,14 +614,14 @@ function STYLE:ApplyAlertStyle(frame) --[[ TOP ]]-- local top = alertpanel:CreateTexture(nil, "BORDER") - top:SetTexture("Interface\\AddOns\\SVUI\\assets\\artwork\\Template\\Alert\\ALERT-TOP") + top:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Template\Alert\ALERT-TOP]]) top:Point("BOTTOMLEFT", alertpanel,"TOPLEFT", 0, 0) top:Point("BOTTOMRIGHT", alertpanel, "TOPRIGHT", 0, 0) top:Height(frame:GetHeight() * 0.5) --[[ BOTTOM ]]-- local bottom = alertpanel:CreateTexture(nil, "BORDER") - bottom:SetTexture("Interface\\AddOns\\SVUI\\assets\\artwork\\Template\\Alert\\ALERT-BOTTOM") + bottom:SetTexture([[Interface\AddOns\SVUI\assets\artwork\Template\Alert\ALERT-BOTTOM]]) bottom:Point("TOPLEFT", alertpanel,"BOTTOMLEFT", 0, 0) bottom:Point("TOPRIGHT", alertpanel, "BOTTOMRIGHT", 0, 0) bottom:Width(frame:GetHeight() * 0.5) diff --git a/Interface/AddOns/SVUI_TrackingDevice/SVUI_TrackingDevice.lua b/Interface/AddOns/SVUI_TrackingDevice/SVUI_TrackingDevice.lua index 48770b2..9e9be5e 100644 --- a/Interface/AddOns/SVUI_TrackingDevice/SVUI_TrackingDevice.lua +++ b/Interface/AddOns/SVUI_TrackingDevice/SVUI_TrackingDevice.lua @@ -78,7 +78,7 @@ BUILD ]]-- function SVUI_TrackingDoodad_OnLoad() local frame = _G["SVUI_TrackingDoodad"] - frame.Border:SetGradient(unpack(SV.Media.gradient.dark)) + --frame.Border:SetGradient(unpack(SV.Media.gradient.dark)) frame.Arrow:SetVertexColor(0.1, 0.8, 0.8) frame.Range:SetFont(SV.Media.font.roboto, 14, "OUTLINE") frame.Range:SetTextColor(1, 1, 1, 0.75)