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
26 changes: 7 additions & 19 deletions AuraBlacklist/Options.lua
Original file line number Diff line number Diff line change
Expand Up @@ -389,26 +389,12 @@ function DF.BuildAuraBlacklistPage(guiRef, pageRef, dbRef)
end

-- ========== CURATED LIST NOTICE ==========
local noticeBanner = CreateFrame("Frame", nil, parent, "BackdropTemplate")
local noticeBanner = GUI:CreateInfoBanner(parent, {
tone = "warning",
text = L["This is a curated list selected by Blizzard. Additional spells cannot be added as these are the only spells Blizzard has allowed. If more are permitted in the future, they will be added to this list."],
})
noticeBanner:SetPoint("TOPLEFT", 10, -10)
noticeBanner:SetPoint("RIGHT", -135, 0)
noticeBanner:SetHeight(44)
if not noticeBanner.SetBackdrop then Mixin(noticeBanner, BackdropTemplateMixin) end
noticeBanner:SetBackdrop({ bgFile = "Interface\\Buttons\\WHITE8x8", edgeFile = "Interface\\Buttons\\WHITE8x8", edgeSize = 1 })
noticeBanner:SetBackdropColor(0.25, 0.22, 0.10, 1)
noticeBanner:SetBackdropBorderColor(0.6, 0.55, 0.2, 0.6)

local noticeIcon = noticeBanner:CreateTexture(nil, "OVERLAY")
noticeIcon:SetPoint("LEFT", 10, 0)
noticeIcon:SetSize(20, 20)
noticeIcon:SetTexture("Interface\\AddOns\\DandersFrames\\Media\\Icons\\warning")

local noticeText = noticeBanner:CreateFontString(nil, "OVERLAY", "DFFontHighlightSmall")
noticeText:SetPoint("LEFT", noticeIcon, "RIGHT", 8, 0)
noticeText:SetPoint("RIGHT", noticeBanner, "RIGHT", -10, 0)
noticeText:SetJustifyH("LEFT")
noticeText:SetText(L["This is a curated list selected by Blizzard. Additional spells cannot be added as these are the only spells Blizzard has allowed. If more are permitted in the future, they will be added to this list."])
noticeText:SetTextColor(1, 0.82, 0)

-- ========== DESCRIPTION ==========
local desc = parent:CreateFontString(nil, "OVERLAY", "DFFontHighlightSmall")
Expand All @@ -419,9 +405,11 @@ function DF.BuildAuraBlacklistPage(guiRef, pageRef, dbRef)
desc:SetTextColor(0.6, 0.6, 0.6)

-- ========== CLASS DROPDOWN ==========
-- Anchored to desc's BOTTOMLEFT (which itself trails noticeBanner) so this
-- block shifts down when the banner wraps to multiple lines.
local dropdownContainer = CreateFrame("Frame", nil, parent)
dropdownContainer:SetSize(280, 55)
dropdownContainer:SetPoint("TOPLEFT", 10, -80)
dropdownContainer:SetPoint("TOPLEFT", desc, "BOTTOMLEFT", 0, -10)

local classLabel = dropdownContainer:CreateFontString(nil, "OVERLAY", "DFFontNormal")
classLabel:SetPoint("TOPLEFT", 0, 0)
Expand Down
24 changes: 5 additions & 19 deletions AuraDesigner/Options.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2903,26 +2903,12 @@ local function BuildTypeContent(parent, typeKey, auraName, width, optProxy, yOff
topSpacer:SetHeight(4)
g:AddWidget(topSpacer, 4)

local banner = CreateFrame("Frame", nil, parent, "BackdropTemplate")
banner:SetHeight(36)
local banner = GUI:CreateInfoBanner(parent, {
tone = "warning",
text = L["Sound alerts only work when you are in a group."],
})
banner:SetWidth(contentWidth - 10)
banner:SetBackdrop({ bgFile = "Interface\\Buttons\\WHITE8x8", edgeFile = "Interface\\Buttons\\WHITE8x8", edgeSize = 1 })
banner:SetBackdropColor(0.25, 0.22, 0.10, 1)
banner:SetBackdropBorderColor(0.6, 0.55, 0.2, 0.6)

local icon = banner:CreateTexture(nil, "OVERLAY")
icon:SetPoint("LEFT", 8, 0)
icon:SetSize(18, 18)
icon:SetTexture("Interface\\AddOns\\DandersFrames\\Media\\Icons\\warning")

local text = banner:CreateFontString(nil, "OVERLAY", "DFFontHighlightSmall")
text:SetPoint("LEFT", icon, "RIGHT", 7, 0)
text:SetPoint("RIGHT", banner, "RIGHT", -8, 0)
text:SetJustifyH("LEFT")
text:SetText(L["Sound alerts only work when you are in a group."])
text:SetTextColor(1, 0.82, 0)

g:AddWidget(banner, 36)
g:AddWidget(banner, banner.layoutHeight)

local spacer = CreateFrame("Frame", nil, parent)
spacer:SetHeight(6)
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
### Improvements

* Reset, Copy, and Sync confirmation popups now use the addon's themed popup style.
* Info and warning banners across all settings pages now have consistent styling with tone-coloured icons (info, warning, caution). (PR by Krathe)
* (Aura Designer) Reworked sound indicator: Missing Trigger and Expire Alert can now be toggled independently, with separate loop intervals and a new Play Once option. (PR #54 by Krathe)

### Bug Fixes
Expand All @@ -21,6 +22,7 @@
* (Aura Designer) Fix indicators not firing on the first aura application after joining a group or entering a new zone. (PR #53 by Krathe)
* (Aura Designer) Fix sound expire alert not re-triggering after a buff is refreshed and decays again. (PR #54 by Krathe)
* (Targeted List) Fix self-target colour overlay covering the text, sticking on the wrong bar, and snapping off instead of fading. (PR #55 by Krathe)
* (Aura Filters) Info banner text now wraps correctly at narrow window widths instead of overflowing the banner. (PR by Krathe)
* (Aura Designer) Fix Global Defaults changes not applying to live frames without a /reload.
* (Aura Designer) Fix the Reset All Aura Configs button not clearing indicators from live frames until /reload.
* (Aura Designer) Fix Color Duration by Time not transitioning live as a buff ticks down on icon, square, and bar indicators.
Expand Down
Loading