Added background indicator.

Changed some border and background settings.

Author: michaelspain

Grid2.toc

@@ -60,6 +60,7 @@ GridDefaultsClassic.lua
 # Indicators
 modules\IndicatorAlpha.lua
 modules\IndicatorBorder.lua
+modules\IndicatorBackground.lua
 modules\IndicatorBar.lua
 modules\IndicatorMultiBar.lua
 modules\IndicatorText.lua

GridDefaults.lua

@@ -51,7 +51,7 @@ end
 function Grid2:UpdateDefaults()
 
 	local version= Grid2:DbGetValue("versions","Grid2") or 0
-	if version>=6 then return end
+	if version>=7 then return end
 	if version==0 then
 		self:MakeDefaultsCommon()
 		self:MakeDefaultsClass()
@@ -86,8 +86,11 @@ function Grid2:UpdateDefaults()
 		if version<6 then
 			Grid2:DbSetValue( "indicators", "tooltip", {type = "tooltip", displayUnitOOC = true} )
 		end
+		if version<7 then
+			Grid2:DbSetValue( "indicators", "background", {type = "background"})
+		end
 	end
 	-- Set database version
-	Grid2:DbSetValue("versions","Grid2",6)
+	Grid2:DbSetValue("versions","Grid2",7)
 
 end

GridDefaultsClassic.lua

@@ -8,6 +8,8 @@ local defaultFont = "Friz Quadrata TT"
 
 -- Default configurations
 function Grid2:MakeDefaultsCommon()
+	Grid2:DbSetValue( "indicators",  "background", {type = "background"})
+
 	Grid2:DbSetValue( "indicators",  "tooltip", {type = "tooltip", showTooltip = 4, showDefault = true} )
 
 	Grid2:DbSetValue( "indicators",  "alpha", {type = "alpha"})

GridDefaultsRetail.lua

@@ -8,6 +8,8 @@ local defaultFont = "Friz Quadrata TT"
 
 -- Default configurations
 function Grid2:MakeDefaultsCommon()
+	Grid2:DbSetValue( "indicators",  "background", {type = "background"})
+
 	Grid2:DbSetValue( "indicators",  "tooltip", {type = "tooltip", showTooltip = 4, showDefault = true} )
 
 	Grid2:DbSetValue( "indicators",  "alpha", {type = "alpha"})

GridFrame.lua

@@ -136,9 +136,9 @@ function GridFramePrototype:Layout()
 	-- visible background
 	local container= self.container
 	container:SetPoint("CENTER", self, "CENTER")
-	-- visible background color
-	local cb = dbx.frameContentColor
-	container:SetVertexColor(cb.r, cb.g, cb.b, cb.a)
+	-- visible background color (commented because now this color is set by the background indicator)
+	-- local cb = dbx.frameContentColor
+	-- container:SetVertexColor(cb.r, cb.g, cb.b, cb.a)
 	-- shrink the background, showing part of the real frame background (that is behind) as a inner border.
 	local inset = (dbx.frameBorder+dbx.frameBorderDistance)*2
 	container:SetSize( w-inset, h-inset )
@@ -190,6 +190,7 @@ Grid2Frame.defaultDB = {
 		frameHeight = 48,
 		frameWidth  = 48,
 		frameBorder = 2,
+		frameBorderColor = {r=0, g=0, b=0, a=0},
 		frameBorderTexture = "Grid2 Flat",
 		frameBorderDistance= 1,
 		frameTexture = "Gradient",
@@ -441,4 +442,4 @@ _G.Grid2Frame = Grid2Frame
 -- Allow other modules/addons to easily modify the grid unit frames
 Grid2Frame.Prototype = GridFramePrototype
 -- Allow other modules to access the variable for speed optimization
-Grid2.frames_of_unit = frames_of_unit
+Grid2.frames_of_unit = frames_of_unit

Options/GridIndicators.lua

@@ -12,7 +12,7 @@ Grid2Options.indicatorIconPath = "Interface\\Addons\\Grid2Options\\media\\indica
 Grid2Options.indicatorTypes = {}
 
 -- Indicators sort order
-Grid2Options.indicatorTypesOrder= { tooltip = 1, alpha = 2, border = 3, multibar = 4, bar = 5, text = 6, square = 7, icon = 8, icons = 9, portrait = 10 }
+Grid2Options.indicatorTypesOrder= { tooltip = 1, alpha = 2, background = 3, border = 4, multibar = 5, bar = 6, text = 7, square = 8, icon = 9, icons = 10, portrait = 11 }
 
 do
 	-- ban these indicator names

Options/GridThemes.lua

@@ -341,6 +341,14 @@ Grid2:RegisterMessage("Grid_ThemeChanged", function() LibStub("AceConfigRegistry
 
 --===========================================================================================
 
+function Grid2Options:ThemesAreEnabled()
+	return Grid2Frame.dba.profile.extraThemes ~= nil
+end
+
+function Grid2Options:ThemesAreDisabled()
+	return Grid2Frame.dba.profile.extraThemes == nil
+end
+
 local order = 0
 function Grid2Options:AddThemeOptions( key, name, options )
 	order = order + 1

Options/locales/esES.lua

@@ -585,6 +585,7 @@ L["power"] = "poder"
 L["poweralt"] = "poder alternativo"
 L["alpha"] = "transparencia"
 L["border"] = "borde"
+L["background"] = "fondo"
 L["heals"] = "curas"
 L["health"] = "vida"
 L["charmed"] = "controlado"

Options/media/indicator-background.tga

@@ -36,6 +36,7 @@
 
 <Script file="modules\indicators\Indicator.lua"/>
 <Script file="modules\indicators\IndicatorAlpha.lua"/>
+<Script file="modules\indicators\IndicatorBackground.lua"/>
 <Script file="modules\indicators\IndicatorBar.lua"/>
 <Script file="modules\indicators\IndicatorMultiBar.lua"/>
 <Script file="modules\indicators\IndicatorBorder.lua"/>

Options/modules.xml

@@ -0,0 +1,35 @@
+local L = Grid2Options.L
+
+Grid2Options:RegisterIndicatorOptions("background", false, function(self, indicator)
+	local statuses, options = {}, {}
+	self:MakeIndicatorBackgroundOptions(indicator, options)
+	self:MakeIndicatorStatusOptions(indicator, statuses)
+	self:AddIndicatorOptions(indicator, statuses, options)
+end)
+
+function Grid2Options:MakeIndicatorBackgroundOptions(indicator,options)
+	options.colorBackground = {
+		type = "color",
+		hasAlpha = true,
+		order = 10,
+		width = "full",
+		name = L["Default Background Color"],
+		desc = L["Sets the background color to use when no status is active."],
+		get = function()
+			local c= Grid2Frame.db.profile.frameContentColor
+			return c.r, c.g, c.b, c.a
+		end,
+		set = function( info, r,g,b,a )
+			local c= Grid2Frame.db.profile.frameContentColor
+			c.r, c.g, c.b, c.a = r, g, b, a
+			Grid2Frame:UpdateIndicators()
+		end,
+	}
+	options.message = {
+		type = "description",
+		order = 100,
+		name = L['|cFFe0e000\nWarning: These options are applied to the active theme, if you want to change the settings for another theme go to the Appearance tab inside the Themes section.'],
+		hidden = self.ThemesAreDisabled,
+	}
+	return options
+end

Options/modules/indicators/IndicatorBackground.lua

@@ -1,21 +1,34 @@
 local L = Grid2Options.L
 
 Grid2Options:RegisterIndicatorOptions("border", false, function(self, indicator)
-	local options, statuses = {}, {}
-	self:MakeIndicatorBorderCustomOptions(indicator,options)
-	self:MakeIndicatorColorOptions(indicator, options, {
-		color1 = L["Border Background Color"],
-		colorDesc1 = L["Adjust border background color and alpha."],
-		typeKey = "indicators",
-	})
+	local statuses, options = {}, {}
+	self:MakeIndicatorBorderCustomOptions(indicator, options)
 	self:MakeIndicatorStatusOptions(indicator, statuses)
 	self:AddIndicatorOptions(indicator, statuses, options )
 end)
 
 function Grid2Options:MakeIndicatorBorderCustomOptions(indicator,options)
+	options.borderColor = {
+		type = "color",
+		order = 10,
+		name = L["Default Border Color"],
+		desc = L["Sets the color for the border when no status is active."],
+		hasAlpha = true,
+		get = function()
+			c = Grid2:MakeColor( Grid2Frame.db.profile.frameBorderColor, 'TRANSPARENT' )
+			return c.r, c.g, c.b, c.a
+		end,
+		set = function( info, r,g,b,a )
+			local c = Grid2Frame.db.profile.frameBorderColor or {}
+			c.r, c.g, c.b, c.a = r, g, b, a
+			Grid2Frame.db.profile.frameBorderColor = c
+			Grid2Frame:UpdateIndicators()
+		end,
+	}
+	options.sepColor = { order = 11, type = "description", name = "" }
 	options.borderSize = {
 		type = "range",
-		order = 10,
+		order = 20,
 		name = L["Border Size"],
 		desc = L["Adjust the border of each unit's frame."],
 		min = 1,
@@ -28,23 +41,10 @@ function Grid2Options:MakeIndicatorBorderCustomOptions(indicator,options)
 		end,
 		disabled = InCombatLockdown,
 	}
-	options.borderDistance= {
-		type = "range",
-		name = L["Border separation"],
-		desc = L["Adjust the distance between the border and the frame content."],
-		min = -16,
-		max = 16,
-		step = 1,
-		order = 15,
-		get = function () return Grid2Frame.db.profile.frameBorderDistance end,
-		set = function (_, v)
-			Grid2Frame.db.profile.frameBorderDistance = v
-			Grid2Frame:LayoutFrames(true)
-		end,
-	}
+	options.sepSize = { order = 21, type = "description", name = "" }
 	options.borderTexture = {
 		type = "select", dialogControl = "LSM30_Border",
-		order = 25,
+		order = 30,
 		name = L["Border Texture"],
 		desc = L["Adjust the border texture."],
 		get = function (info) return Grid2Frame.db.profile.frameBorderTexture or "Grid2 Flat" end,
@@ -54,5 +54,11 @@ function Grid2Options:MakeIndicatorBorderCustomOptions(indicator,options)
 		end,
 		values = AceGUIWidgetLSMlists.border,
 	}
+	options.message = {
+		type = "description",
+		order = 100,
+		name = L['|cFFe0e000\nWarning: These options are applied to the active theme, if you want to change the settings for another theme go to the Appearance tab inside the Themes section.'],
+		hidden = self.ThemesAreDisabled,
+	}
 end
 

Options/modules/indicators/IndicatorBorder.lua

@@ -301,9 +301,13 @@ local frameOptions = { framewidth = {
 			Grid2Options:LayoutTestRefresh()
 		end,
 		disabled = InCombatLockdown,
-}, texture = {
+}, headerback = {
+		type = "header",
+		order = 21,
+		name = L["Background"],
+}, backgroundTexture = {
 		type = "select", dialogControl = "LSM30_Statusbar",
-		order = 25,
+		order = 22,
 		name = L["Background Texture"],
 		desc = L["Select the frame background texture."],
 		get = function (info) return theme.frame.frameTexture or "Gradient" end,
@@ -312,39 +316,56 @@ local frameOptions = { framewidth = {
 			Grid2Frame:LayoutFrames(true)
 		end,
 		values = AceGUIWidgetLSMlists.statusbar,
-}, borderDistance= {
-		type = "range",
-		name = L["Inner Border Size"],
-		desc = L["Sets the size of the inner border of each unit frame"],
-		min = -16,
-		max = 16,
-		step = 1,
-		order = 27,
-		get = function ()
-			return theme.frame.frameBorderDistance
-		end,
-		set = function (_, v)
-			theme.frame.frameBorderDistance = v
-			Grid2Frame:LayoutFrames(true)
-		end,
-}, colorContent = {
+},  backgroundColor = {
 		type = "color",
-		order = 30,
+		order = 23,
 		name = L["Background Color"],
-		desc = L["Sets the background color of each unit frame"],
+		desc = L["Sets the default color for the background indicator."],
 		get = function()
 			local c= theme.frame.frameContentColor
 			return c.r, c.g, c.b, c.a
 		end,
 		set = function( info, r,g,b,a )
-			local c= theme.frame.frameContentColor
+			local c = theme.frame.frameContentColor
 			c.r, c.g, c.b, c.a = r, g, b, a
-			Grid2Frame:LayoutFrames(true)
 			Grid2Frame:UpdateIndicators()
 		 end,
 		hasAlpha = true,
-
-}, colorFrame = {
+}, headerborder = {
+		type = "header",
+		order = 25,
+		name = L["Borders"],
+}, borderIndicatorColor = {
+	type = "color",
+	order = 32,
+	name = L["Outer Border Color"],
+	desc = L["Sets the default color for the border indicator."],
+	get = function()
+		c = Grid2:MakeColor( theme.frame.frameBorderColor, 'TRANSPARENT' )
+		return c.r, c.g, c.b, c.a
+	end,
+	set = function( info, r,g,b,a )
+		local c = theme.frame.frameBorderColor or {}
+		c.r, c.g, c.b, c.a = r, g, b, a
+		theme.frame.frameBorderColor = c
+		Grid2Frame:UpdateIndicators()
+	 end,
+	hasAlpha = true,
+}, borderIndicatorSize = {
+	type = "range",
+	order = 33,
+	name = L["Outer Border Size"],
+	desc = L["Adjust the border of each unit's frame."],
+	min = 1,
+	max = 20,
+	step = 1,
+	get = function () return theme.frame.frameBorder end,
+	set = function (_, frameBorder)
+		theme.frame.frameBorder = frameBorder
+		Grid2Frame:LayoutFrames(true)
+	end,
+	disabled = InCombatLockdown,
+}, innerBordercolor = {
 		type = "color",
 		order = 40,
 		name = L["Inner Border Color"],
@@ -359,11 +380,42 @@ local frameOptions = { framewidth = {
 			Grid2Frame:LayoutFrames(true)
 		 end,
 		hasAlpha = true,
+}, innerBorderDistance= {
+		type = "range",
+		order = 41,
+		name = L["Inner Border Size"],
+		desc = L["Sets the size of the inner border of each unit frame"],
+		min = -16,
+		max = 16,
+		step = 1,
+		get = function ()
+			return theme.frame.frameBorderDistance
+		end,
+		set = function (_, v)
+			theme.frame.frameBorderDistance = v
+			Grid2Frame:LayoutFrames(true)
+		end,
+}, borderIndicatorTexture = {
+	type = "select", dialogControl = "LSM30_Border",
+	order = 42,
+	name = L["Outer Border Texture"],
+	desc = L["Adjust the border texture."],
+	get = function (info) return theme.frame.frameBorderTexture or "Grid2 Flat" end,
+	set = function (info, v)
+		theme.frame.frameBorderTexture = v
+		Grid2Frame:LayoutFrames(true)
+	end,
+	values = AceGUIWidgetLSMlists.border,
+
+}, headermouse = {
+		type = "header",
+		order = 50,
+		name = L["Mouseover"],
 }, mouseoverHighlight = {
 		type = "toggle",
 		name = L["Mouseover Highlight"],
 		desc = L["Toggle mouseover highlight."],
-		order = 60,
+		order = 51,
 		get = function ()
 			return theme.frame.mouseoverHighlight
 		end,
@@ -373,7 +425,7 @@ local frameOptions = { framewidth = {
 		end,
 }, mouseoverColor = {
 		type = "color",
-		order = 70,
+		order = 55,
 		name = L["Highlight Color"],
 		desc = L["Sets the hightlight color of each unit frame"],
 		get = function()