fixing border and border color

Author: pedrozc90

CHANGELOG.md

@@ -16,4 +16,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- `CHANGELOG.mf' initialized.
+-   `CHANGELOG.mf' initialized.

Filger-Classic.toc

@@ -28,6 +28,7 @@ config\config.lua
 
 ## core
 core\functions.lua
+core\colors.lua
 core\api.lua
 core\commands.lua
 core\development.lua

Filger-Mainline.toc

@@ -25,6 +25,7 @@ config\config.lua
 
 ## core
 core\functions.lua
+core\colors.lua
 core\api.lua
 core\commands.lua
 core\development.lua

Filger-TBC.toc

@@ -25,6 +25,7 @@ config\config.lua
 
 ## core
 core\functions.lua
+core\colors.lua
 core\api.lua
 core\commands.lua
 core\development.lua

Filger-Wrath.toc

@@ -25,6 +25,7 @@ config\config.lua
 
 ## core
 core\functions.lua
+core\colors.lua
 core\api.lua
 core\commands.lua
 core\development.lua

Filger.lua

@@ -33,14 +33,7 @@ end
 -- player info
 local class = Filger.MyClass
 local classColor = RAID_CLASS_COLORS[class]
-
-local DebuffTypeColors = {
-    ["Curse"]   = { 0.60, 0.00, 1.00 },
-    ["Disease"] = { 0.60, 0.40, 0.00 },
-    ["Magic"]   = { 0.20, 0.60, 1.00 },
-    ["Poison"]  = { 0.00, 0.60, 0.00 },
-    ["Unknown"]  = { 0.80, 0.00, 0.00 }
-}
+local debuffColor = Filger.Colors
 
 -- import
 local tinsert, tremove, tsort, wipe = table.insert, table.remove, table.sort, table.wipe
@@ -254,10 +247,11 @@ function Filger:PostUpdateAura(element, unit, aura, index, position, duration, e
     -- 1. dispel harmful effects from friendly target.
     -- 2. dispell beneficial effects from enemy target.
     local isDispellable = (not aura.casterIsPlayer) and IsDispelable(debuffType, aura.isPlayer, targetIsEnemy, isDebuff, spellID)
+    local isPlayerDebuff = (unit == "player") and isDebuff
 
     -- set border color by aura type, if it's dispelable.
-    local color = DebuffTypeColors[debuffType]
-    if ((isDispellable or isStealable) and color) then
+    local color = (isDebuff) and debuffColor[debuffType or "none"] or debuffColor[debuffType]
+    if (color and (isDispellable or isStealable or isPlayerDebuff)) then
         aura.Backdrop:SetBorderColor(unpack(color))
     else
         aura.Backdrop:SetBorderColor(unpack(BorderColor))

config/config.lua

@@ -20,8 +20,8 @@ Config["General"] = {
     ["HideWellFed"] = true,                         -- enabled filter to hide well fed buff (too many spells with this name)
     ["Gametoolip"] = true,                          -- enabled tooltips
 
-    ["BackdropColor"] = { .05, .05, .05 },
-    ["BorderColor"] = { .125, .125, .125 },
+    ["BackdropColor"] = { .08, .08, .08 },
+    ["BorderColor"] = { .01, .01, .01 }
 }
 
 Config["Plugins"] = {

core/api.lua

@@ -112,37 +112,69 @@ API.SetInside = function(self, Anchor, OffsetX, OffsetY)
 	self:SetPoint("BOTTOMRIGHT", Anchor, "BOTTOMRIGHT", -OffsetX, OffsetY)
 end
 
+API.SetBorderColor = function(self, R, G, B, Alpha)
+    if self.BorderTop then
+		self.BorderTop:SetColorTexture(R, G, B, Alpha)
+	end
+
+	if self.BorderBottom then
+		self.BorderBottom:SetColorTexture(R, G, B, Alpha)
+	end
+
+	if self.BorderRight then
+		self.BorderRight:SetColorTexture(R, G, B, Alpha)
+	end
+
+	if self.BorderLeft then
+		self.BorderLeft:SetColorTexture(R, G, B, Alpha)
+	end
+end
+
 API.CreateBackdrop = function(self, template)
-	local BackdropColorR, BackdropColorG, BackdropColorB, BackdropColorA = unpack(Config.General.BackdropColor)
-	local BorderColorR, BorderColorG, BorderColorB = unpack(Config.General.BorderColor)
-	local BackgroundAlpha = (template == "Transparent") and 0.75 or BackdropColorA or 1
-	local Texture = Config.Medias.Blank
-
-	local Backdrop = {
-		bgFile = Texture,
-		edgeFile = Texture,
-		edgeSize = Scale(1),
-		insets = {
-			top = 0,
-			left = 0,
-			bottom = 0,
-			right = 0
-		}
-	}
+    if (self.Backdrop) then return end
 
 	self.Backdrop = CreateFrame("Frame", nil, self, "BackdropTemplate")
 	self.Backdrop:SetAllPoints()
-	-- self.Backdrop:SetOutside(self, 2, 2)
 	self.Backdrop:SetFrameLevel(self:GetFrameLevel())
-	self.Backdrop:SetBackdrop(Backdrop)
-	self.Backdrop:SetBackdropColor(BackdropColorR, BackdropColorG, BackdropColorB, BackgroundAlpha)
-	self.Backdrop:SetBackdropBorderColor(BorderColorR, BorderColorG, BorderColorB)
-end
 
-API.SetBorderColor = function(self, R, G, B, Alpha)
-    if (self.Backdrop) then
-        self.Backdrop:SetBackdropBorderColor(R, G, B, Alpha or 1)
-    end
+	local BorderR, BorderG, BorderB = unpack(Config.General.BorderColor)
+	local BackdropR, BackdropG, BackdropB, BackdropA = unpack(Config.General.BackdropColor)
+	local BackgroundAlpha = (template == "Transparent") and 0.75 or BackdropA or 1
+	local BorderSize = Scale(1)
+    local Texture = Config.Medias.Blank
+
+	self.Backdrop:SetBackdrop({ bgFile = Texture })
+	self.Backdrop:SetBackdropColor(BackdropR, BackdropG, BackdropB, BackgroundAlpha)
+
+	self.Backdrop.BorderTop = self.Backdrop:CreateTexture(nil, "BORDER", nil, 1)
+	self.Backdrop.BorderTop:SetSize(BorderSize, BorderSize)
+	self.Backdrop.BorderTop:SetPoint("TOPLEFT", self.Backdrop, "TOPLEFT", 0, 0)
+	self.Backdrop.BorderTop:SetPoint("TOPRIGHT", self.Backdrop, "TOPRIGHT", 0, 0)
+	self.Backdrop.BorderTop:SetSnapToPixelGrid(false)
+	self.Backdrop.BorderTop:SetTexelSnappingBias(0)
+
+	self.Backdrop.BorderBottom = self.Backdrop:CreateTexture(nil, "BORDER", nil, 1)
+	self.Backdrop.BorderBottom:SetSize(BorderSize, BorderSize)
+	self.Backdrop.BorderBottom:SetPoint("BOTTOMLEFT", self.Backdrop, "BOTTOMLEFT", 0, 0)
+	self.Backdrop.BorderBottom:SetPoint("BOTTOMRIGHT", self.Backdrop, "BOTTOMRIGHT", 0, 0)
+	self.Backdrop.BorderBottom:SetSnapToPixelGrid(false)
+	self.Backdrop.BorderBottom:SetTexelSnappingBias(0)
+
+	self.Backdrop.BorderLeft = self.Backdrop:CreateTexture(nil, "BORDER", nil, 1)
+	self.Backdrop.BorderLeft:SetSize(BorderSize, BorderSize)
+	self.Backdrop.BorderLeft:SetPoint("TOPLEFT", self.Backdrop, "TOPLEFT", 0, 0)
+	self.Backdrop.BorderLeft:SetPoint("BOTTOMLEFT", self.Backdrop, "BOTTOMLEFT", 0, 0)
+	self.Backdrop.BorderLeft:SetSnapToPixelGrid(false)
+	self.Backdrop.BorderLeft:SetTexelSnappingBias(0)
+
+	self.Backdrop.BorderRight = self.Backdrop:CreateTexture(nil, "BORDER", nil, 1)
+	self.Backdrop.BorderRight:SetSize(BorderSize, BorderSize)
+	self.Backdrop.BorderRight:SetPoint("TOPRIGHT", self.Backdrop, "TOPRIGHT", 0, 0)
+	self.Backdrop.BorderRight:SetPoint("BOTTOMRIGHT", self.Backdrop, "BOTTOMRIGHT", 0, 0)
+	self.Backdrop.BorderRight:SetSnapToPixelGrid(false)
+	self.Backdrop.BorderRight:SetTexelSnappingBias(0)
+
+	self.Backdrop:SetBorderColor(BorderR, BorderG, BorderB, BorderA)
 end
 
 function Filger:EnableAPI()

core/colors.lua

@@ -0,0 +1,46 @@
+local _, ns = ...
+local Filger = ns.Filger
+
+local colorMixin = {
+	SetRGBA = function(self, r, g, b, a)
+		if(r > 1 or g > 1 or b > 1) then
+			r, g, b = r / 255, g / 255, b / 255
+		end
+
+		self.r = r
+		self[1] = r
+		self.g = g
+		self[2] = g
+		self.b = b
+		self[3] = b
+		self.a = a
+
+		-- pre-generate the hex color, there's no point to this being generated on the fly
+		self.hex = string.format('ff%02x%02x%02x', self:GetRGBAsBytes())
+	end,
+	SetAtlas = function(self, atlas)
+		self.atlas = atlas
+	end,
+	GetAtlas = function(self)
+		return self.atlas
+	end,
+	GenerateHexColor = function(self)
+		return self.hex
+	end,
+}
+
+function Filger:CreateColor(r, g, b, a)
+	local color = Mixin({}, ColorMixin, colorMixin)
+	color:SetRGBA(r, g, b, a)
+	return color
+end
+
+local Colors = {
+    Stealable = Filger:CreateColor(0.93, 0.91, 0.55)
+}
+
+for debuffType, color in next, _G.DebuffTypeColor do
+	Colors[debuffType] = Filger:CreateColor(color.r, color.g, color.b)
+end
+
+Filger.Colors = Colors

core/functions.lua

@@ -32,6 +32,14 @@ function Filger.Debug(...)
     print(format("|cffff330fFilger WARNING:|r"), ...)
 end
 
+-- Want HEX color instead of RGB?
+Filger.RGBToHex = function(r, g, b)
+	r = r <= 1 and r >= 0 and r or 0
+	g = g <= 1 and g >= 0 and g or 0
+	b = b <= 1 and b >= 0 and b or 0
+	return format("|cff%02x%02x%02x", r * 255, g * 255, b * 255)
+end
+
 -- format seconds to min/hour/day
 function Filger.FormatTime(s)
 	local Day, Hour, Minute = 86400, 3600, 60