From dc3d536c7ae31d8cf0b20e58b21fc4897429986b Mon Sep 17 00:00:00 2001 From: Scott Sibley Date: Thu, 4 Aug 2011 07:25:45 -0500 Subject: [PATCH] Background module enhancements. --- Localization/enUS.lua | 4 +++ Modules/Appearance/Appearance.lua | 12 +++---- Modules/Background/Background.lua | 71 ++++++++++++++++++++++++------------- modules.xml | 1 + 4 files changed, 58 insertions(+), 30 deletions(-) diff --git a/Localization/enUS.lua b/Localization/enUS.lua index 194301a..a8a9e3b 100644 --- a/Localization/enUS.lua +++ b/Localization/enUS.lua @@ -441,3 +441,7 @@ L["This will be ran when the tooltip shows."] = true +-- Background +L["Background"] = true +L["One of these scripts will be ran when the tooltip shows."] = true + diff --git a/Modules/Appearance/Appearance.lua b/Modules/Appearance/Appearance.lua index 7323a9a..62e11e9 100644 --- a/Modules/Appearance/Appearance.lua +++ b/Modules/Appearance/Appearance.lua @@ -390,15 +390,15 @@ end function mod:OnEnable() self:SetScale() self:SetBackdrop() - self:SetBackdropColor(true) + --self:SetBackdropColor(true) StarTip:SetOptionsDisabled(options, false) end function mod:OnDisable() self:SetScale(true) - self:SetBorderColor(true) + --self:SetBorderColor(true) self:SetBackdrop(true) - self:SetBackdropColor(true) + --self:SetBackdropColor(true) StarTip:SetOptionsDisabled(options, true) end @@ -407,9 +407,9 @@ function mod:GetOptions() end function mod:SetUnit() - self.origBackdrop = self.origBackdrop or _G["StarTipTooltipMain"]:GetBackdrop() - self.origBackdropColor = self.origBackdropColor or {_G["StarTipTooltipMain"]:GetBackdropColor()} - self:SetBackdropColor() + --self.origBackdrop = self.origBackdrop or _G["StarTipTooltipMain"]:GetBackdrop() + --self.origBackdropColor = self.origBackdropColor or {_G["StarTipTooltipMain"]:GetBackdropColor()} + --self:SetBackdropColor() end function mod:OnHide() diff --git a/Modules/Background/Background.lua b/Modules/Background/Background.lua index f5c5e4b..b129b84 100644 --- a/Modules/Background/Background.lua +++ b/Modules/Background/Background.lua @@ -11,46 +11,58 @@ local Evaluator = LibStub("LibScriptableUtilsEvaluator-1.0") local defaults = { profile = { guild = [[ +-- return r, g, b, a -- RGBA colorspace +-- You have a host of color functions you can use. +-- Color2RGBA(color, true) -- returns r, g, b and a, provide it with a 32bit color, i.e. 0xff77ff77 (a|r|g|b) +-- RGBA2Color(r, g, b, a) -- Returns a 32bit color based on RGBA values. +-- HSV2RGB(h, s, v) -- Convert HSV colorspace into RGB. +-- RGB2HSV(r, g, b) -- Convert RGB colorspace into HSV. local mod = StarTip:GetModule("Appearance") -local db = mod.db.profile +local db = mod.db.profile.bgColor return unpack(db.guild) ]], hostilePC = [[ local mod = StarTip:GetModule("Appearance") -local db = mod.db.profile +local db = mod.db.profile.bgColor return unpack(db.hostilePC) ]], hostileNPC = [[ local mod = StarTip:GetModule("Appearance") -local db = mod.db.profile +local db = mod.db.profile.bgColor return unpack(db.hostileNPC) ]], neutralNPC = [[ local mod = StarTip:GetModule("Appearance") -local db = mod.db.profile +local db = mod.db.profile.bgColor return unpack(db.neutralNPC) ]], + friendlyPC = [[ +local mod = StarTip:GetModule("Appearance") +local db = mod.db.profile.bgColor +return unpack(db.friendlyPC) +]], friendlyNPC = [[ local mod = StarTip:GetModule("Appearance") -local db = mod.db.profile +local db = mod.db.profile.bgColor return unpack(db.friendlyNPC) ]], other = [[ local mod = StarTip:GetModule("Appearance") -local db = mod.db.profile +local db = mod.db.profile.bgColor return unpack(db.other) ]], dead = [[ local mod = StarTip:GetModule("Appearance") -local db = mod.db.profile +local db = mod.db.profile.bgColor return unpack(db.dead) ]], tapped = [[ local mod = StarTip:GetModule("Appearance") -local db = mod.db.profile +local db = mod.db.profile.bgColor return unpack(db.tapped) ]] + } } local get = function(info) @@ -62,16 +74,15 @@ local set = function(info, v) end local options = { - background = { - name = L["Background"], + --background = { + --[[name = L["Background"], desc = L["One of these scripts will be ran when the tooltip shows."], type = "group", width = "full", - multiline = true, get = get, set = set, - order = 4 - args = { + order = 4, + args = {]] header = { name = L["Background Color"], type = "header", @@ -83,7 +94,9 @@ local options = { type = "input", width = "full", multiline = true, - order = 2 + get = get, + set = set, + order = 50 }, hostilePC = { name = L["Hostile players"], @@ -91,7 +104,9 @@ local options = { type = "input", width = "full", multiline = true, - order = 3 + get = get, + set = set, + order = 51 }, hostileNPC = { name = L["Hostile non-player characters"], @@ -99,7 +114,9 @@ local options = { type = "input", width = "full", multiline = true, - order = 4 + get = get, + set = set, + order = 52 }, neutralNPC = { name = L["Neutral non-player characters"], @@ -107,7 +124,9 @@ local options = { type = "input", width = "full", multiline = true, - order = 5 + get = get, + set = set, + order = 53 }, friendlyPC = { name = L["Friendly players"], @@ -115,7 +134,9 @@ local options = { type = "input", width = "full", multiline = true, - order = 6 + get = get, + set = set, + order = 54 }, friendlyNPC = { name = L["Friendly non-player characters"], @@ -123,10 +144,12 @@ local options = { type = "input", width = "full", multiline = true, - order = 7 + get = get, + set = set, + order = 55 } - } - }, + --} + --} } function mod:OnInitialize() @@ -148,7 +171,7 @@ function mod:GetOptions() end function mod:GameTooltip_SetDefaultAnchor(this, owner) - local kind + local kind = "" if UnitExists(StarTip.unit or "mouseover") then if UnitIsDeadOrGhost(StarTip.unit or "mouseover") then kind = 'dead' @@ -192,7 +215,7 @@ function mod:GameTooltip_SetDefaultAnchor(this, owner) else kind = 'other' end - local r, g, b, a = Evaluator.ExecuteCode(StarTip.environment, "StarTip.Background", self.db.profile[kind]) - StarTip.tooltipMain:SetBackdropColor(r, g, b, a) + local r, g, b, a = Evaluator.ExecuteCode(StarTip.environment, "StarTip.Background." .. kind, self.db.profile[kind]) + StarTip.tooltipMain:SetBackdropColor(r or 0, g or 1, b or 0, a or .5) end diff --git a/modules.xml b/modules.xml index 9c880ad..8954d42 100644 --- a/modules.xml +++ b/modules.xml @@ -20,6 +20,7 @@