Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions UnitFrames/Components/UnitFrame.lua
Original file line number Diff line number Diff line change
Expand Up @@ -278,11 +278,12 @@ end

local function StateOff(cfg) return not cfg.enabled end

-- A unit state's look: greyscale, blended towards `color`.
local function UnitStateSchema(tooltip, colorLabel, color)
-- A unit state's look: greyscale, blended towards `color` (or the theme
-- colour at `inherit`).
local function UnitStateSchema(tooltip, colorLabel, color, inherit)
return {
{ key = "enabled", type = "toggle", label = "Enabled", default = true, tooltip = tooltip },
{ key = "color", type = "color", label = colorLabel, default = color, hidden = StateOff },
{ key = "color", type = "color", label = colorLabel, default = color, inherit = inherit, hidden = StateOff },
{ key = "strength", type = "range", label = "Strength", min = 0, max = 1, step = 0.05, default = 0.85, hidden = StateOff,
tooltip = "How far bars, portrait artwork, border and texts blend towards the colour. 3D portraits only turn greyscale." },
{ key = "bars", type = "toggle", label = "Bars", default = true, hidden = StateOff },
Expand Down Expand Up @@ -329,7 +330,7 @@ UnitFrame.BLIZZARD_AURAS_SCHEMA = {
UnitFrame.UNIT_STATES = {
{ key = "dead", label = "Dead & ghost", schema = UnitStateSchema(
"While the unit is dead or a ghost, turn this frame greyscale and tint it with the ghost colour. Bar fills take one uniform colour; the health bar shows it across its whole length instead of an empty or 1 health fill.",
"Ghost colour", { 0.48, 0.65, 0.70, 1 }) },
"Ghost colour", { 0.48, 0.65, 0.70, 1 }, "colors.dead") },
{ key = "offline", label = "Offline", schema = UnitStateSchema(
"While the unit is offline, turn this frame greyscale. Bar fills take one uniform grey; the health bar shows it across its whole length.",
"Offline colour", { 0.62, 0.62, 0.62, 1 }) },
Expand Down
1 change: 1 addition & 0 deletions UnitFrames/Core/Theme.lua
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ Theme.schema = {
{ "friendly", "Friendly NPC", 0.2, 0.75, 0.2 },
{ "tapped", "Tapped by others", 0.55, 0.55, 0.55 },
{ "disconnected", "Disconnected", 0.45, 0.45, 0.45 },
{ "dead", "Dead & ghost", 0.48, 0.65, 0.70 },
{ "heal", "Incoming heals", 0.2, 1, 0.3, 0.5 },
{ "absorb", "Absorb shields", 0.2, 0.65, 1, 0.75 },
{ "healAbsorb", "Heal absorbs", 0.6, 0, 0, 0.6 },
Expand Down
21 changes: 12 additions & 9 deletions tests/fixtures/schema_snapshot.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ option colors.neutral type="color" label="Neutral NPC" default={0.95,0.8,0.15,1}
option colors.friendly type="color" label="Friendly NPC" default={0.2,0.75,0.2,1}
option colors.tapped type="color" label="Tapped by others" default={0.55,0.55,0.55,1}
option colors.disconnected type="color" label="Disconnected" default={0.45,0.45,0.45,1}
option colors.dead type="color" label="Dead & ghost" default={0.48,0.65,0.7,1}
option colors.heal type="color" label="Incoming heals" default={0.2,1,0.3,0.5}
option colors.absorb type="color" label="Absorb shields" default={0.2,0.65,1,0.75}
option colors.healAbsorb type="color" label="Heal absorbs" default={0.6,0,0,0.6}
Expand Down Expand Up @@ -174,6 +175,7 @@ default colors.castFailed = {1,0,0,1}
default colors.castSuccess = {0,1,0,1}
default colors.channel = {0,1,0,1}
default colors.comboPoints = {1,0.96,0.41,1}
default colors.dead = {0.48,0.65,0.7,1}
default colors.disconnected = {0.45,0.45,0.45,1}
default colors.energy = {1,0.85,0.1,1}
default colors.experience = {0.58,0,0.55,1}
Expand Down Expand Up @@ -271,6 +273,7 @@ resolved colors.castFailed = {1,0,0,1}
resolved colors.castSuccess = {0,1,0,1}
resolved colors.channel = {0,1,0,1}
resolved colors.comboPoints = {1,0.96,0.41,1}
resolved colors.dead = {0.48,0.65,0.7,1}
resolved colors.disconnected = {0.45,0.45,0.45,1}
resolved colors.energy = {1,0.85,0.1,1}
resolved colors.experience = {0.58,0,0.55,1}
Expand Down Expand Up @@ -2582,7 +2585,7 @@ option readyCheck.hold type="range" label="Hold after the check (seconds)" defau
option readyCheck.fade type="range" label="Fade duration (seconds)" default=1.5 min=0 max=5 step=0.25 tooltip=#ded41b0c
option dead type="group" label="Dead & ghost"
option dead.enabled type="toggle" label="Enabled" default=true tooltip=#02954430
option dead.color type="color" label="Ghost colour" default={0.48,0.65,0.7,1} hidden
option dead.color type="color" label="Ghost colour" default={0.48,0.65,0.7,1} inherit="colors.dead" hidden
option dead.strength type="range" label="Strength" default=0.85 min=0 max=1 step=0.05 tooltip=#2553aeb7 hidden
option dead.bars type="toggle" label="Bars" default=true hidden
option dead.portrait type="toggle" label="Portrait" default=true hidden
Expand Down Expand Up @@ -5976,7 +5979,7 @@ option readyCheck.hold type="range" label="Hold after the check (seconds)" defau
option readyCheck.fade type="range" label="Fade duration (seconds)" default=1.5 min=0 max=5 step=0.25 tooltip=#ded41b0c
option dead type="group" label="Dead & ghost"
option dead.enabled type="toggle" label="Enabled" default=true tooltip=#02954430
option dead.color type="color" label="Ghost colour" default={0.48,0.65,0.7,1} hidden
option dead.color type="color" label="Ghost colour" default={0.48,0.65,0.7,1} inherit="colors.dead" hidden
option dead.strength type="range" label="Strength" default=0.85 min=0 max=1 step=0.05 tooltip=#2553aeb7 hidden
option dead.bars type="toggle" label="Bars" default=true hidden
option dead.portrait type="toggle" label="Portrait" default=true hidden
Expand Down Expand Up @@ -8546,7 +8549,7 @@ option readyCheck.hold type="range" label="Hold after the check (seconds)" defau
option readyCheck.fade type="range" label="Fade duration (seconds)" default=1.5 min=0 max=5 step=0.25 tooltip=#ded41b0c
option dead type="group" label="Dead & ghost"
option dead.enabled type="toggle" label="Enabled" default=true tooltip=#02954430
option dead.color type="color" label="Ghost colour" default={0.48,0.65,0.7,1} hidden
option dead.color type="color" label="Ghost colour" default={0.48,0.65,0.7,1} inherit="colors.dead" hidden
option dead.strength type="range" label="Strength" default=0.85 min=0 max=1 step=0.05 tooltip=#2553aeb7 hidden
option dead.bars type="toggle" label="Bars" default=true hidden
option dead.portrait type="toggle" label="Portrait" default=true hidden
Expand Down Expand Up @@ -11211,7 +11214,7 @@ option readyCheck.hold type="range" label="Hold after the check (seconds)" defau
option readyCheck.fade type="range" label="Fade duration (seconds)" default=1.5 min=0 max=5 step=0.25 tooltip=#ded41b0c
option dead type="group" label="Dead & ghost"
option dead.enabled type="toggle" label="Enabled" default=true tooltip=#02954430
option dead.color type="color" label="Ghost colour" default={0.48,0.65,0.7,1} hidden
option dead.color type="color" label="Ghost colour" default={0.48,0.65,0.7,1} inherit="colors.dead" hidden
option dead.strength type="range" label="Strength" default=0.85 min=0 max=1 step=0.05 tooltip=#2553aeb7 hidden
option dead.bars type="toggle" label="Bars" default=true hidden
option dead.portrait type="toggle" label="Portrait" default=true hidden
Expand Down Expand Up @@ -13784,7 +13787,7 @@ option readyCheck.hold type="range" label="Hold after the check (seconds)" defau
option readyCheck.fade type="range" label="Fade duration (seconds)" default=1.5 min=0 max=5 step=0.25 tooltip=#ded41b0c
option dead type="group" label="Dead & ghost"
option dead.enabled type="toggle" label="Enabled" default=true tooltip=#02954430
option dead.color type="color" label="Ghost colour" default={0.48,0.65,0.7,1} hidden
option dead.color type="color" label="Ghost colour" default={0.48,0.65,0.7,1} inherit="colors.dead" hidden
option dead.strength type="range" label="Strength" default=0.85 min=0 max=1 step=0.05 tooltip=#2553aeb7 hidden
option dead.bars type="toggle" label="Bars" default=true hidden
option dead.portrait type="toggle" label="Portrait" default=true hidden
Expand Down Expand Up @@ -16358,7 +16361,7 @@ option readyCheck.hold type="range" label="Hold after the check (seconds)" defau
option readyCheck.fade type="range" label="Fade duration (seconds)" default=1.5 min=0 max=5 step=0.25 tooltip=#ded41b0c
option dead type="group" label="Dead & ghost"
option dead.enabled type="toggle" label="Enabled" default=true tooltip=#02954430
option dead.color type="color" label="Ghost colour" default={0.48,0.65,0.7,1} hidden
option dead.color type="color" label="Ghost colour" default={0.48,0.65,0.7,1} inherit="colors.dead" hidden
option dead.strength type="range" label="Strength" default=0.85 min=0 max=1 step=0.05 tooltip=#2553aeb7 hidden
option dead.bars type="toggle" label="Bars" default=true hidden
option dead.portrait type="toggle" label="Portrait" default=true hidden
Expand Down Expand Up @@ -21099,7 +21102,7 @@ option readyCheck.hold type="range" label="Hold after the check (seconds)" defau
option readyCheck.fade type="range" label="Fade duration (seconds)" default=1.5 min=0 max=5 step=0.25 tooltip=#ded41b0c
option dead type="group" label="Dead & ghost"
option dead.enabled type="toggle" label="Enabled" default=true tooltip=#02954430
option dead.color type="color" label="Ghost colour" default={0.48,0.65,0.7,1} hidden
option dead.color type="color" label="Ghost colour" default={0.48,0.65,0.7,1} inherit="colors.dead" hidden
option dead.strength type="range" label="Strength" default=0.85 min=0 max=1 step=0.05 tooltip=#2553aeb7 hidden
option dead.bars type="toggle" label="Bars" default=true hidden
option dead.portrait type="toggle" label="Portrait" default=true hidden
Expand Down Expand Up @@ -23598,7 +23601,7 @@ option hover.enabled type="toggle" label="Enabled" default=true tooltip=#dbbae48
option hover.color type="color" label="Mouseover colour" default={1,1,1,0.12} hidden
option dead type="group" label="Dead & ghost"
option dead.enabled type="toggle" label="Enabled" default=true tooltip=#02954430
option dead.color type="color" label="Ghost colour" default={0.48,0.65,0.7,1} hidden
option dead.color type="color" label="Ghost colour" default={0.48,0.65,0.7,1} inherit="colors.dead" hidden
option dead.strength type="range" label="Strength" default=0.85 min=0 max=1 step=0.05 tooltip=#2553aeb7 hidden
option dead.bars type="toggle" label="Bars" default=true hidden
option dead.portrait type="toggle" label="Portrait" default=true hidden
Expand Down Expand Up @@ -26113,7 +26116,7 @@ option hover.enabled type="toggle" label="Enabled" default=true tooltip=#dbbae48
option hover.color type="color" label="Mouseover colour" default={1,1,1,0.12} hidden
option dead type="group" label="Dead & ghost"
option dead.enabled type="toggle" label="Enabled" default=true tooltip=#02954430
option dead.color type="color" label="Ghost colour" default={0.48,0.65,0.7,1} hidden
option dead.color type="color" label="Ghost colour" default={0.48,0.65,0.7,1} inherit="colors.dead" hidden
option dead.strength type="range" label="Strength" default=0.85 min=0 max=1 step=0.05 tooltip=#2553aeb7 hidden
option dead.bars type="toggle" label="Bars" default=true hidden
option dead.portrait type="toggle" label="Portrait" default=true hidden
Expand Down
15 changes: 15 additions & 0 deletions tests/spec/units/unit_state_spec.lua
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,21 @@ describe("Dead & ghost and offline looks", function()
AssertGhost("enabled again")
end)

it("takes the ghost colour from the theme unless the frame sets its own", function()
Mock.dead.player = true
Update()
ns.Config:SetThemeValue("colors.dead", { 0.9, 0.1, 0.5, 1 })
for _, unit in ipairs(ns.Units.order) do
assert.same({ 0.9, 0.1, 0.5, 1 }, ns.Units.frames[unit].uf.resolved.dead.color, unit)
end
assert.same({ 0.9, 0.1, 0.5, STRENGTH }, { Health():GetTint() })
Set("dead.color", { 0.2, 0.2, 0.9, 1 })
assert.same({ 0.2, 0.2, 0.9, STRENGTH }, { Health():GetTint() }, "the frame's own colour wins")
Set("dead.color", nil)
ns.Config:SetThemeValue("colors.dead", nil)
AssertGhost("back to the default")
end)

it("survives restyling", function()
Mock.dead.player = true
Update()
Expand Down
Loading