Skip to content

Add Circle Opacity controls for cursor rings #346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
liamcooper wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add Circle Opacity controls for cursor rings #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
86 changes: 59 additions & 27 deletions EllesmereUIQoL/EUI_QoL_Cursor_Options.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,16 +252,16 @@ initFrame:SetScript("OnEvent", function(self)
end }
); y = y - h

-- Only Show in Instances ---- Cursor Trail
-- Circle Opacity ---- Cursor Trail
_, h = W:DualRow(parent, y,
{ type="toggle", text="Only Show in Instances",
{ type="slider", text="Circle Opacity", min=0, max=100, step=1,
disabled=function() local p = DB(); return p and p.enabled == false end,
disabledTooltip="Enable Cursor Circle",
getValue=function() local p = DB(); return p and p.instanceOnly end,
getValue=function() local p = DB(); return p and (p.alpha or 100) end,
setValue=function(v)
local p = DB(); if not p then return end
p.instanceOnly = v
if _G._ECL_UpdateVisibility then _G._ECL_UpdateVisibility() end
p.alpha = v
RefreshAddon()
end },
{ type="toggle", text="Cursor Trail",
disabled=function() local p = DB(); return p and p.enabled == false end,
Expand All @@ -274,6 +274,20 @@ initFrame:SetScript("OnEvent", function(self)
end }
); y = y - h

-- Only Show in Instances
_, h = W:DualRow(parent, y,
{ type="toggle", text="Only Show in Instances",
disabled=function() local p = DB(); return p and p.enabled == false end,
disabledTooltip="Enable Cursor Circle",
getValue=function() local p = DB(); return p and p.instanceOnly end,
setValue=function(v)
local p = DB(); if not p then return end
p.instanceOnly = v
if _G._ECL_UpdateVisibility then _G._ECL_UpdateVisibility() end
end },
{ type="label", text="" }
); y = y - h

_, h = W:Spacer(parent, y, 20); y = y - h

-----------------------------------------------------------------------
Expand All @@ -293,16 +307,15 @@ initFrame:SetScript("OnEvent", function(self)
{ type="multiSwatch", text="Color",
swatches = {
{ tooltip = "Custom Color",
hasAlpha = true,
hasAlpha = false,
getValue = function()
local g = GCD_DB()
local r, ng, b = HexToRGB(g.hex)
return r, ng, b, (g.alpha or 80) / 100
return r, ng, b
end,
setValue = function(r, g, b, a)
setValue = function(r, g, b)
local gd = GCD_DB()
gd.hex = RGBToHex(r, g, b)
if a then gd.alpha = floor(a * 100 + 0.5) end
RefreshGCD()
end,
onClick = function(self)
Expand Down Expand Up @@ -393,16 +406,13 @@ initFrame:SetScript("OnEvent", function(self)
setValue=function(v) GCD_DB().radius = v; RefreshGCD() end }
); y = y - h

-- Only Show in Instances ---- Attach to Cursor
-- Circle Opacity ---- Attach to Cursor
_, h = W:DualRow(parent, y,
{ type="toggle", text="Only Show in Instances",
{ type="slider", text="Circle Opacity", min=0, max=100, step=1,
disabled=function() return not GCD_DB().enabled end,
disabledTooltip="Enable GCD Circle",
getValue=function() return GCD_DB().instanceOnly or false end,
setValue=function(v)
GCD_DB().instanceOnly = v
if _G._ECL_UpdateVisibility then _G._ECL_UpdateVisibility() end
end },
getValue=function() return GCD_DB().alpha or 80 end,
setValue=function(v) GCD_DB().alpha = v; RefreshGCD() end },
{ type="toggle", text="Attach to Cursor",
disabled=function() return not GCD_DB().enabled end,
disabledTooltip="Enable GCD Circle",
Expand All @@ -414,6 +424,19 @@ initFrame:SetScript("OnEvent", function(self)
end }
); y = y - h

-- Only Show in Instances
_, h = W:DualRow(parent, y,
{ type="toggle", text="Only Show in Instances",
disabled=function() return not GCD_DB().enabled end,
disabledTooltip="Enable GCD Circle",
getValue=function() return GCD_DB().instanceOnly or false end,
setValue=function(v)
GCD_DB().instanceOnly = v
if _G._ECL_UpdateVisibility then _G._ECL_UpdateVisibility() end
end },
{ type="label", text="" }
); y = y - h

_, h = W:Spacer(parent, y, 20); y = y - h

-----------------------------------------------------------------------
Expand All @@ -433,16 +456,15 @@ initFrame:SetScript("OnEvent", function(self)
{ type="multiSwatch", text="Color",
swatches = {
{ tooltip = "Custom Color",
hasAlpha = true,
hasAlpha = false,
getValue = function()
local c = Cast_DB()
local r, ng, b = HexToRGB(c.hex)
return r, ng, b, (c.alpha or 80) / 100
return r, ng, b
end,
setValue = function(r, g, b, a)
setValue = function(r, g, b)
local cd = Cast_DB()
cd.hex = RGBToHex(r, g, b)
if a then cd.alpha = floor(a * 100 + 0.5) end
RefreshCast()
end,
onClick = function(self)
Expand Down Expand Up @@ -566,16 +588,13 @@ initFrame:SetScript("OnEvent", function(self)
setValue=function(v) Cast_DB().radius = v; RefreshCast() end }
); y = y - h

-- Only Show in Instances ---- Attach to Cursor
-- Circle Opacity ---- Attach to Cursor
row, h = W:DualRow(parent, y,
{ type="toggle", text="Only Show in Instances",
{ type="slider", text="Circle Opacity", min=0, max=100, step=1,
disabled=function() return not Cast_DB().enabled end,
disabledTooltip="Enable Cast Bar Circle",
getValue=function() return Cast_DB().instanceOnly or false end,
setValue=function(v)
Cast_DB().instanceOnly = v
if _G._ECL_UpdateVisibility then _G._ECL_UpdateVisibility() end
end },
getValue=function() return Cast_DB().alpha or 80 end,
setValue=function(v) Cast_DB().alpha = v; RefreshCast() end },
{ type="toggle", text="Attach to Cursor",
disabled=function() return not Cast_DB().enabled end,
disabledTooltip="Enable Cast Bar Circle",
Expand All @@ -587,6 +606,19 @@ initFrame:SetScript("OnEvent", function(self)
end }
); y = y - h

-- Only Show in Instances
_, h = W:DualRow(parent, y,
{ type="toggle", text="Only Show in Instances",
disabled=function() return not Cast_DB().enabled end,
disabledTooltip="Enable Cast Bar Circle",
getValue=function() return Cast_DB().instanceOnly or false end,
setValue=function(v)
Cast_DB().instanceOnly = v
if _G._ECL_UpdateVisibility then _G._ECL_UpdateVisibility() end
end },
{ type="label", text="" }
); y = y - h

return math.abs(y)
end

Expand Down
12 changes: 6 additions & 6 deletions EllesmereUIQoL/EllesmereUIQoL_Cursor.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ local UnitChannelInfo = UnitChannelInfo or ChannelInfo
local f, t
local lastX, lastY

local lastScale, lastHex, lastTex
local lastScale, lastHex, lastTex, lastAlpha
local lastR, lastG, lastB
local isVisible = true

Expand Down Expand Up @@ -106,13 +106,13 @@ local function Apply()
-- Recompute whenever hex, class mode, accent mode, or the mode flag
-- changed. Accent mode also needs per-frame re-read since ELLESMERE_GREEN
-- mutates in place when the user changes their accent color mid-session.
if hex ~= lastHex or p.useClassColor or p.useAccentColor or colorModeChanged then
local a = (p.alpha or 100) / 100
if hex ~= lastHex or p.useClassColor or p.useAccentColor or colorModeChanged or a ~= lastAlpha then
lastHex = hex
lastAlpha = a
local r, g, b = ResolveColor(p)
if r ~= lastR or g ~= lastG or b ~= lastB or colorModeChanged then
lastR, lastG, lastB = r, g, b
t:SetVertexColor(r, g, b, 1)
end
lastR, lastG, lastB = r, g, b
t:SetVertexColor(r, g, b, a)
end

local tex = p.texture or DEF_TEX
Expand Down