Skip to content

Commit

Permalink
Add status icon system for display buttons
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrbuds
mrbuds committed Jan 23, 2024
1 parent 4794eee commit 49c430d
Show file tree
Hide file tree
Showing 5 changed files with 201 additions and 54 deletions.
1 change: 1 addition & 0 deletions .luacheckrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1556,6 +1556,7 @@ globals = {
"CreateFont",
"CreateForbiddenFrame",
"CreateFrame",
"CreateFramePool",
"CreateMacro",
"CreateNewRaidProfile",
"CursorCanGoInSlot",
Expand Down
43 changes: 41 additions & 2 deletions WeakAuras/AuraWarnings.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ local icons = {
info = [[Interface/friendsframe/informationicon.blp]],
sound = [[chatframe-button-icon-voicechat]],
tts = [[chatframe-button-icon-tts]],
warning = [[Interface/buttons/adventureguidemicrobuttonalert.blp]],
error = [[Interface/DialogFrame/UI-Dialog-Icon-AlertNew]]
warning = [[services-icon-warning]],
error = [[Interface/HELPFRAME/HelpIcon-Bug]]
}

--- @type table<AuraWarningSeverity, string>
Expand Down Expand Up @@ -150,3 +150,42 @@ function Private.AuraWarnings.FormatWarnings(uid)
result = AddMessages(result, messagePerSeverity["info"], icons["info"], mixedSeverity)
return icons[maxSeverity], titles[maxSeverity], result
end

function Private.AuraWarnings.GetAllWarnings(uid)
local results = {}
local thisWarnings
local data = Private.GetDataByUID(uid)
if data.regionType == "group" or data.regionType == "dynamicgroup" then
thisWarnings = {}
for child in Private.TraverseLeafs(data) do
local childWarnings = warnings[child.uid]
if childWarnings then
for key, warning in pairs(childWarnings) do
if not thisWarnings[key] then
thisWarnings[key] = {
severity = warning.severity,
message = warning.message,
auraId = child.id
}
end
end
end
end
else
thisWarnings = CopyTable(warnings[uid])
local auraId = Private.UIDtoID(uid)
for key in pairs(thisWarnings) do
thisWarnings[key].auraId = auraId
end
end
for key, warning in pairs(thisWarnings) do
results[warning.severity] = {
icon = icons[warning.severity],
prio = 5 + severityLevel[warning.severity],
title = warning.severity,
message = warning.message,
auraId = warning.auraId
}
end
return results
end
163 changes: 116 additions & 47 deletions WeakAurasOptions/AceGUI-Widgets/AceGUIWidget-WeakAurasDisplayButton.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,8 @@ local function ensure(t, k, v)
return t and k and v and t[k] == v
end

local statusIconPool = CreateFramePool("Button")

--[[ Actions ]]--

local Actions = {
Expand Down Expand Up @@ -307,6 +309,7 @@ local Actions = {
WeakAuras.ClearAndUpdateOptions(group.data.id)
WeakAuras.ClearAndUpdateOptions(source.data.id)
group.callbacks.UpdateExpandButton();
group:UpdateParentWarning()
group:ReloadTooltip()
else
WeakAuras.Add(source.data)
Expand Down Expand Up @@ -337,6 +340,7 @@ local Actions = {
WeakAuras.ClearAndUpdateOptions(parent.id);
local group = OptionsPrivate.GetDisplayButton(parent.id)
group.callbacks.UpdateExpandButton();
group:UpdateParentWarning()
group:ReloadTooltip()
else
error("Display thinks it is a member of a group which does not control it")
Expand Down Expand Up @@ -558,6 +562,7 @@ local methods = {
WeakAuras.Add(self.data);
OptionsPrivate.Private.AddParents(self.data)
self.callbacks.UpdateExpandButton();
self:UpdateParentWarning();
OptionsPrivate.StopGrouping();
OptionsPrivate.ClearOptions(self.data.id);
WeakAuras.FillOptions();
Expand Down Expand Up @@ -633,10 +638,12 @@ local methods = {

local button = OptionsPrivate.GetDisplayButton(newGroup.id)
button.callbacks.UpdateExpandButton()
button:UpdateParentWarning()

for old, new in pairs(mapping) do
local button = OptionsPrivate.GetDisplayButton(new.id)
button.callbacks.UpdateExpandButton()
button:UpdateParentWarning()
end

OptionsPrivate.SortDisplayButtons(nil, true)
Expand Down Expand Up @@ -781,6 +788,7 @@ local methods = {
if not(newid == oldid) then
WeakAuras.Rename(self.data, newid);
end
self:UpdateParentWarning()
end

function self.callbacks.OnDragStart()
Expand Down Expand Up @@ -915,12 +923,10 @@ local methods = {
func = function() LibDD:CloseDropDownMenus() end
});
if(self.data.controlledChildren) then
self.loaded:Hide();
self.expand:Show();
self.callbacks.UpdateExpandButton();
self:SetOnExpandCollapse(function() OptionsPrivate.SortDisplayButtons(nil, true) end);
else
self.loaded:Show();
self.expand:Hide();
end
self.group:Show();
Expand Down Expand Up @@ -1133,7 +1139,7 @@ local methods = {
self.frame:SetScript("OnClick", nil)
self.view:Hide()
self.expand:Hide()
self.loaded:Hide()
self.statusIcons:Hide()
Hide_Tooltip()
if picked then
self.frame:EnableKeyboard(true)
Expand Down Expand Up @@ -1225,10 +1231,9 @@ local methods = {
self.frame:SetScript("OnClick", self.callbacks.OnClickNormal)
self.frame:EnableKeyboard(false); -- disables self.callbacks.OnKeyDown
self.view:Show()
self.statusIcons:Show()
if self.data.controlledChildren then
self.expand:Show()
else
self.loaded:Show()
end
self:Enable()

Expand Down Expand Up @@ -1369,27 +1374,95 @@ local methods = {
self:Collapse();
end
end,
["UpdateWarning"] = function(self)
local icon, title, warningText = OptionsPrivate.Private.AuraWarnings.FormatWarnings(self.data.uid)
if warningText then
self.warning:Show()
if C_Texture.GetAtlasInfo(icon) then
self.warning:SetNormalAtlas(icon)
else
self.warning:SetNormalTexture(icon)
["UpdateStatusIcon"] = function(self, key, prio, icon, title, tooltip, onClick, color)
local iconButton
for _, button in ipairs(self.statusIcons.buttons) do
if button.key == key then
iconButton = button
break
end
self.warning:SetScript("OnEnter", function()
end
if not iconButton then
iconButton = statusIconPool:Acquire()
tinsert(self.statusIcons.buttons, iconButton)
iconButton:SetParent(self.statusIcons)
iconButton.key = key
iconButton:SetSize(16, 16)
end
iconButton.prio = prio
if C_Texture.GetAtlasInfo(icon) then
iconButton:SetNormalAtlas(icon)
else
iconButton:SetNormalTexture(icon)
end
if title then
iconButton:SetScript("OnEnter", function()
Show_Tooltip(
self.frame,
title,
warningText
tooltip
)
end)
self.warning:SetScript("OnClick", function()
WeakAuras.PickDisplay(self.data.id, "information")
end)
iconButton:SetScript("OnLeave", Hide_Tooltip)
else
iconButton:SetScript("OnEnter", nil)
end
if color then
iconButton:GetNormalTexture():SetVertexColor(unpack(color))
else
self.warning:Hide()
iconButton:GetNormalTexture():SetVertexColor(1, 1, 1, 1)
end
iconButton:SetScript("OnClick", onClick)
iconButton:Show()
end,
["ClearStatusIcon"] = function(self, key)
for index, button in ipairs(self.statusIcons.buttons) do
if button.key == key then
statusIconPool:Release(button)
table.remove(self.statusIcons.buttons, index)
return
end
end
end,
["SortStatusIcons"] = function(self)
table.sort(self.statusIcons.buttons, function(a, b)
return a.prio < b.prio
end)
local lastAnchor = self.statusIcons
if self:IsGroup() then
self.statusIcons:SetWidth(17)
else
self.statusIcons:SetWidth(1)
end
for _, button in ipairs(self.statusIcons.buttons) do
button:ClearAllPoints()
button:SetPoint("BOTTOMLEFT", lastAnchor, "BOTTOMRIGHT", 4, 0)
lastAnchor = button
end
end,
["UpdateWarning"] = function(self)
local warnings = OptionsPrivate.Private.AuraWarnings.GetAllWarnings(self.data.uid)
local warningTypes = {"info", "sound", "tts", "warning", "error"}
for _, key in ipairs(warningTypes) do
self:ClearStatusIcon(key)
end
if warnings then
for severity, warning in pairs(warnings) do
local onClick = function()
WeakAuras.PickDisplay(warning.auraId, "information")
end
self:UpdateStatusIcon(severity, warning.prio, warning.icon, warning.title, warning.message, onClick)
end
end
self:SortStatusIcons()
end,
["UpdateParentWarning"] = function(self)
self:UpdateWarning()
for parent in OptionsPrivate.Private.TraverseParents(self.data) do
local parentButton = OptionsPrivate.GetDisplayButton(parent.id)
if parentButton then
parentButton:UpdateWarning()
end
end
end,
["SetGroupOrder"] = function(self, order, max)
Expand Down Expand Up @@ -1418,10 +1491,13 @@ local methods = {
["GetGroupOrder"] = function(self)
return self.frame.dgrouporder;
end,
["SetLoaded"] = function(self, color, title, description)
self.loaded.title = title;
self.loaded.desc = description;
self.loaded:GetNormalTexture():SetVertexColor(unpack(color))
["ClearLoaded"] = function(self)
self:ClearStatusIcon("load")
self:SortStatusIcons()
end,
["SetLoaded"] = function(self, prio, color, title, description)
self:UpdateStatusIcon("load", prio, "Interface\\AddOns\\WeakAuras\\Media\\Textures\\loaded", title, description, nil, color)
self:SortStatusIcons()
end,
["IsLoaded"] = function(self)
return OptionsPrivate.Private.loaded[self.data.id] == true
Expand Down Expand Up @@ -1550,8 +1626,10 @@ local methods = {
self.view:Disable();
self.group:Disable();
self.ungroup:Disable();
self.loaded:Disable();
self.expand:Disable();
for _, button in ipairs(self.statusIcons.buttons) do
button:Disable();
end
self:UpdateUpDownButtons()
end,
["Enable"] = function(self)
Expand All @@ -1560,7 +1638,9 @@ local methods = {
self.view:Enable();
self.group:Enable();
self.ungroup:Enable();
self.loaded:Enable();
for _, button in ipairs(self.statusIcons.buttons) do
button:Enable();
end
self:UpdateUpDownButtons()
if not(self.expand.disabled) then
self.expand:Enable();
Expand All @@ -1584,6 +1664,10 @@ local methods = {
--self.frame:EnableMouse(false);
self.frame:ClearAllPoints();
self.frame:Hide();
for _, button in ipairs(self.statusIcons.buttons) do
statusIconPool:Release(button)
end
wipe(self.statusIcons.buttons)
self.frame = nil;
self.data = nil;
end,
Expand Down Expand Up @@ -1729,19 +1813,6 @@ local function Constructor()

view.visibility = 0;

local loaded = CreateFrame("Button", nil, button);
button.loaded = loaded;
loaded:SetWidth(16);
loaded:SetHeight(16);
loaded:SetPoint("BOTTOM", button, "BOTTOM");
loaded:SetPoint("LEFT", icon, "RIGHT", 0, 0);
loaded:SetNormalTexture("Interface\\AddOns\\WeakAuras\\Media\\Textures\\loaded");
loaded:GetNormalTexture():SetVertexColor(0, 0, 0, 0) -- transparent
loaded.title = L["Loaded"];
loaded.desc = L["This display is currently loaded"];
loaded:SetScript("OnEnter", function() Show_Tooltip(button, loaded.title, loaded.desc) end);
loaded:SetScript("OnLeave", Hide_Tooltip);

local renamebox = CreateFrame("EditBox", nil, button, "InputBoxTemplate");
renamebox:SetHeight(14);
renamebox:SetPoint("TOP", button, "TOP");
Expand Down Expand Up @@ -1851,13 +1922,12 @@ local function Constructor()
expand:SetScript("OnEnter", function() Show_Tooltip(button, expand.title, expand.desc) end);
expand:SetScript("OnLeave", Hide_Tooltip);

local warning = CreateFrame("Button", nil, button);
button.warning = warning
warning:SetWidth(16)
warning:SetHeight(16)
warning:SetPoint("RIGHT", button, "RIGHT", -60, 0)
warning:SetScript("OnLeave", Hide_Tooltip)
warning:Hide()
local statusIcons = CreateFrame("Frame", nil, button);
button.statusIcons = statusIcons
statusIcons:SetPoint("BOTTOM", button, "BOTTOM", 0, 1);
statusIcons:SetPoint("LEFT", icon, "RIGHT");
statusIcons:SetSize(1,1)
statusIcons.buttons = {}

local widget = {
frame = button,
Expand All @@ -1869,10 +1939,9 @@ local function Constructor()
ungroup = ungroup,
upgroup = upgroup,
downgroup = downgroup,
loaded = loaded,
background = background,
expand = expand,
warning = warning,
statusIcons = statusIcons,
type = Type,
offset = offset
}
Expand Down
2 changes: 2 additions & 0 deletions WeakAurasOptions/OptionsFrames/Update.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1996,6 +1996,7 @@ local methods = {
button:SetGroupOrder(nil, nil)
end
button.callbacks.UpdateExpandButton()
button:UpdateParentWarning()
WeakAuras.UpdateGroupOrders(data)
WeakAuras.UpdateThumbnail(data)
WeakAuras.ClearAndUpdateOptions(data.id)
Expand Down Expand Up @@ -2057,6 +2058,7 @@ local methods = {
button:SetGroupOrder(nil, nil)
end
button.callbacks.UpdateExpandButton()
button:UpdateParentWarning()
WeakAuras.UpdateGroupOrders(data)
WeakAuras.UpdateThumbnail(data)
WeakAuras.ClearAndUpdateOptions(data.id)
Expand Down
Loading

0 comments on commit 49c430d

Please sign in to comment.