diff --git a/UnitFrames/Components/AuraBar.lua b/UnitFrames/Components/AuraBar.lua index 56b2a20..63a21af 100644 --- a/UnitFrames/Components/AuraBar.lua +++ b/UnitFrames/Components/AuraBar.lua @@ -39,6 +39,7 @@ for _, kind in ipairs(KINDS) do local source = ns.Schema.Find(Auras.schema, kind) local group = ns.Schema.Without(ns.Util.Copy(source.schema), { position = true, alignment = true, growth = true, gap = true, offsetX = true, offsetY = true, lineSize = true, + separateHeight = true, height = true, }) group = ns.Schema.Override(group, "size", { label = "Icon width", default = 32, tooltip = "Artwork stays square and centred vertically. Icons wider than their section show none." }) diff --git a/UnitFrames/Components/AuraIcon.lua b/UnitFrames/Components/AuraIcon.lua index 579cd60..2447539 100644 --- a/UnitFrames/Components/AuraIcon.lua +++ b/UnitFrames/Components/AuraIcon.lua @@ -104,13 +104,12 @@ function AuraIcon.Create(button, kind, preview, opts) button.ufHarmful = opts.harmful == true button.ufPreview = preview and true or false -- The button includes the below-icon timer in its layout bounds. The - -- artwork stays square, even when the container flows upwards. + -- artwork keeps its configured size, even when the container flows upwards. local iconFrame = CreateFrame("Frame", nil, button, "BackdropTemplate") iconFrame:SetPoint("TOPLEFT", button, "TOPLEFT", 0, 0) button.ufIconFrame = iconFrame local icon = iconFrame:CreateTexture(nil, "ARTWORK") - icon:SetTexCoord(0.08, 0.92, 0.08, 0.92) button.ufIcon = icon if not preview then button:SetIcon(icon) end @@ -121,7 +120,7 @@ function AuraIcon.Create(button, kind, preview, opts) local cover = CreateFrame("Frame", nil, iconFrame) cover:SetAllPoints(iconFrame) - cover:SetFrameLevel(cooldown:GetFrameLevel() + 1) + button.ufCover = cover -- The engine fills registered texts immediately, before OnApply. button.ufCountHolder = CreateFrame("Frame", nil, cover) @@ -170,16 +169,40 @@ end -- The icon artwork's inset inside its frame border. Keep a drawable centre -- even at the smallest icon size. -local function ArtPadding(cfg, size) - return cfg.border.enabled and math.min(cfg.border.padding, (size - 2) / 2) or 0 +local function ArtPadding(cfg, width, height) + return cfg.border.enabled and math.min(cfg.border.padding, (math.min(width, height) - 2) / 2) or 0 end -function AuraIcon.Apply(button, cfg, size, dispelColors, swipe, showSwipeEdge) +-- Trims Blizzard's baked icon edge, then crops the longer side so the +-- artwork fills a non-square icon without stretching. +local ICON_TRIM = 0.08 +function AuraIcon.TexCoords(width, height) + local cropX, cropY = ICON_TRIM, ICON_TRIM + if width > height then + cropY = 0.5 - (0.5 - ICON_TRIM) * height / width + elseif height > width then + cropX = 0.5 - (0.5 - ICON_TRIM) * width / height + end + return cropX, 1 - cropX, cropY, 1 - cropY +end + +-- Stacked above the artwork and swipe: the frame's border edges, then the +-- texts. Levels are set on every apply, since owners may relevel the button. +local function ApplyLayers(button, backdrop) + local level = button.ufCooldown:GetFrameLevel() + if backdrop and (backdrop.edgeFile or backdrop.raidBorder) then + Backdrop.SetBorderLevel(button.ufIconFrame, level + 1) + end + button.ufCover:SetFrameLevel(level + 2) +end + +function AuraIcon.Apply(button, cfg, width, height, dispelColors, swipe, showSwipeEdge) AuraIcon.ApplySwipe(button, swipe, showSwipeEdge) - button:SetSize(size, size + AuraIcon.TextRoom(cfg)) - button.ufIconFrame:SetSize(size, size) - Backdrop.ApplyToFixedSize(button.ufIconFrame, cfg.border, size, size, false) - local pad = ArtPadding(cfg, size) + button:SetSize(width, height + AuraIcon.TextRoom(cfg)) + button.ufIconFrame:SetSize(width, height) + ApplyLayers(button, Backdrop.ApplyToFixedSize(button.ufIconFrame, cfg.border, width, height, false)) + local pad = ArtPadding(cfg, width, height) + button.ufIcon:SetTexCoord(AuraIcon.TexCoords(width - 2 * pad, height - 2 * pad)) for _, region in ipairs({ button.ufIcon, button.ufCooldown }) do region:ClearAllPoints() region:SetPoint("TOPLEFT", button.ufIconFrame, "TOPLEFT", pad, -pad) @@ -197,14 +220,14 @@ function AuraIcon.Apply(button, cfg, size, dispelColors, swipe, showSwipeEdge) end button.ufCountHolder:SetShown(cfg.showCount) button.ufTime:SetShown(cfg.showDuration) - AuraIcon.ApplyDispelBorder(button, cfg, size, dispelColors) - AuraIcon.ApplyDispelGlow(button, cfg, size, dispelColors) + AuraIcon.ApplyDispelBorder(button, cfg, width, height, dispelColors) + AuraIcon.ApplyDispelGlow(button, cfg, width, height, dispelColors) end -- Per button: the reused border settings (the icon border without a -- background) and what the dispel textures were last registered with. local dispelBorders = setmetatable({}, { __mode = "k" }) -function AuraIcon.ApplyDispelBorder(button, cfg, size, dispelColors) +function AuraIcon.ApplyDispelBorder(button, cfg, width, height, dispelColors) local enabled = cfg.border.enabled and cfg.dispelBorder and button.ufHarmful or false local state = dispelBorders[button] if not state then @@ -219,12 +242,13 @@ function AuraIcon.ApplyDispelBorder(button, cfg, size, dispelColors) -- button redrawn per texture). Unchanged artwork, size and colours keep -- the engine's tint; only the icon frame's border, which applying the -- icon backdrop recoloured, is hidden again. - if state.applied and state.enabled == enabled and state.info == info and state.size == size - and state.colors == dispelColors then + if state.applied and state.enabled == enabled and state.info == info and state.width == width + and state.height == height and state.colors == dispelColors then if state.registered then Backdrop.SetBorderColor(button.ufIconFrame, 0, 0, 0, 0) end return end - state.applied, state.enabled, state.info, state.size, state.colors = true, enabled, info, size, dispelColors + state.applied, state.enabled, state.info, state.colors = true, enabled, info, dispelColors + state.width, state.height = width, height state.registered = false -- Re-register after applying the backdrop: its setters reset vertex -- colours, and inbound options are copied by the engine, not shared. @@ -237,7 +261,7 @@ function AuraIcon.ApplyDispelBorder(button, cfg, size, dispelColors) Backdrop.ApplyTo(button.ufBorder, { enabled = false }) return end - local backdrop = Backdrop.ApplyToFixedSize(button.ufBorder, border, size, size, false) + local backdrop = Backdrop.ApplyToFixedSize(button.ufBorder, border, width, height, false) if backdrop and (backdrop.edgeFile or backdrop.raidBorder) then state.registered = true Backdrop.SetBorderColor(button.ufIconFrame, 0, 0, 0, 0) @@ -286,18 +310,18 @@ function AuraIcon.GetGlow(button) return state and state.active end -function AuraIcon.ApplyDispelGlow(button, cfg, size, dispelColors) +function AuraIcon.ApplyDispelGlow(button, cfg, width, height, dispelColors) local glow = cfg.dispelGlow local enabled = glow and glow.enabled and button.ufHarmful or false local style = enabled and (glow.style == "proc" and "proc" or "halo") or nil local active = style and GlowHolder(button, style) or nil for _, holder in pairs(glowHolders[button] or {}) do holder:SetShown(holder == active) end if style == "proc" then - Glow.ApplyProc(active, glow, size) + Glow.ApplyProc(active, glow, width, height) elseif active then -- From the artwork's edge: border art draws its line anywhere within -- the edge, so the halo starts under the border to leave no gap. - local pad = ArtPadding(cfg, size) + local pad = ArtPadding(cfg, width, height) active:ClearAllPoints() active:SetPoint("TOPLEFT", button.ufIconFrame, "TOPLEFT", pad, -pad) active:SetPoint("BOTTOMRIGHT", button.ufIconFrame, "BOTTOMRIGHT", -pad, pad) diff --git a/UnitFrames/Components/Auras.lua b/UnitFrames/Components/Auras.lua index 151b8d4..65afbc9 100644 --- a/UnitFrames/Components/Auras.lua +++ b/UnitFrames/Components/Auras.lua @@ -88,7 +88,15 @@ local function GroupSchema(label, filters, size, position) } }, { key = "showSwipeEdge", type = "toggle", label = "Show swipe edge", default = true, tooltip = "Show the spinning line along the cooldown swipe. Hidden when Cooldown swipe is None." }, - { key = "size", type = "range", label = "Icon size", min = 10, max = 64, step = 1, default = size }, + { key = "size", type = "range", label = "Icon size", min = 10, max = 64, step = 1, default = size, + tooltip = "With a separate icon height, this sets the icon width." }, + { key = "separateHeight", type = "toggle", label = "Separate icon height", default = false, + tooltip = "Enable to set the icon height on its own. The artwork fills the icon and is cropped to its shape.", + onSet = function(config, value, before) + if value and not before.separateHeight and config.height == nil then config.height = before.size end + end }, + { key = "height", type = "range", label = "Icon height", min = 6, max = 64, step = 1, default = size, + hidden = function(cfg) return not cfg.separateHeight end }, { key = "position", type = "select", label = "Side", values = Auras.POSITIONS, default = position }, { key = "alignment", type = "select", label = "Alignment", values = Auras.ALIGNMENTS, default = "start", tooltip = "Align the whole aura block along the selected side. Centre aligns the block, including wrapped rows." }, @@ -226,10 +234,16 @@ function Auras:UpdateStyleToken() self.styleToken = StyleToken(self, self.styleToken) end +-- A group's configured icon width and height; square without a separate height. +function Auras.IconSize(group) + return group.size, group.separateHeight and group.height or group.size +end + function Auras:StyleButton(button) ns.Perf:Count("auraButtonStyle") local group = self.resolved[button.ufKind] - AuraIcon.Apply(button, self:GetArtworkConfig(), group.size, self.dispelColors, group.swipe, group.showSwipeEdge) + local width, height = Auras.IconSize(group) + AuraIcon.Apply(button, self:GetArtworkConfig(), width, height, self.dispelColors, group.swipe, group.showSwipeEdge) end -- A group's native candidate filters (nil = none). @@ -318,7 +332,8 @@ end function Auras:LineLength(group) local vertical = VerticalSide(group) local length = group.lineSize > 0 and group.lineSize or vertical and self.hostHeight or self.hostWidth - return math.max(length, group.size + (vertical and AuraIcon.TextRoom(self:GetArtworkConfig()) or 0)) + local width, height = Auras.IconSize(group) + return math.max(length, vertical and height + AuraIcon.TextRoom(self:GetArtworkConfig()) or width) end local function OtherKind(kind) @@ -359,8 +374,9 @@ function Auras:StackDepth(group) local vertical = VerticalSide(group) local textRoom = AuraIcon.TextRoom(self:GetArtworkConfig()) local spacing = self.resolved.spacing - local along = group.size + (vertical and textRoom or 0) - local across = group.size + (vertical and 0 or textRoom) + local width, height = Auras.IconSize(group) + local along = vertical and height + textRoom or width + local across = vertical and width or height + textRoom local perLine = math.max(1, math.floor((self:LineLength(group) + spacing) / (along + spacing))) local lines = math.ceil(group.max / perLine) local side = group.position @@ -378,9 +394,9 @@ function Auras:Layout(width, height) local firstKind = self:CombinedFirstKind() for _, containerKind in ipairs(self.containers.buffs and KINDS or {}) do for _, kind in ipairs(self:ContainerGroups(containerKind)) do - local size = self.resolved[kind].size - Auras.ApplyGroupLayout(self.containers[containerKind], kind, size, - size + AuraIcon.TextRoom(self:GetArtworkConfig()), self.resolved.spacing, self.resolved.spacing, + local width, height = Auras.IconSize(self.resolved[kind]) + Auras.ApplyGroupLayout(self.containers[containerKind], kind, width, + height + AuraIcon.TextRoom(self:GetArtworkConfig()), self.resolved.spacing, self.resolved.spacing, firstKind and kind ~= firstKind and 2 or 1) end end diff --git a/UnitFrames/Components/CategoryAuras.lua b/UnitFrames/Components/CategoryAuras.lua index ca6aa9b..8b0b4d6 100644 --- a/UnitFrames/Components/CategoryAuras.lua +++ b/UnitFrames/Components/CategoryAuras.lua @@ -201,10 +201,10 @@ end function CategoryAuras:StyleButton(button) ns.Perf:Count("categoryButtonStyle") local cfg = self.resolved - AuraIcon.Apply(button, self.art[button.ufKind], self.size, nil, cfg.swipe, cfg.showSwipeEdge) + button:SetFrameLevel(self.level + 1 + (#CategoryAuras.CATEGORIES - PRIORITY[button.ufKind]) * LEVEL_BAND) + AuraIcon.Apply(button, self.art[button.ufKind], self.size, self.size, nil, cfg.swipe, cfg.showSwipeEdge) button:ClearAllPoints() button:SetPoint("CENTER", self.anchor, "CENTER", 0, 0) - button:SetFrameLevel(self.level + 1 + (#CategoryAuras.CATEGORIES - PRIORITY[button.ufKind]) * LEVEL_BAND) end -- Access to native slot buttons may be denied while aura data is secret: diff --git a/UnitFrames/Components/Glow.lua b/UnitFrames/Components/Glow.lua index 6c45f26..5e7387f 100644 --- a/UnitFrames/Components/Glow.lua +++ b/UnitFrames/Components/Glow.lua @@ -143,10 +143,10 @@ function Glow.CreateProc(parent) return holder end --- size: the owner's known configured square size. -function Glow.ApplyProc(holder, cfg, size) - holder:SetSize(size * PROC_SCALE, size * PROC_SCALE) - holder.Start:SetSize(size * PROC_START_SCALE, size * PROC_START_SCALE) +-- width, height: the owner's known configured size. +function Glow.ApplyProc(holder, cfg, width, height) + holder:SetSize(width * PROC_SCALE, height * PROC_SCALE) + holder.Start:SetSize(width * PROC_START_SCALE, height * PROC_START_SCALE) holder:SetAlpha(cfg.opacity) end diff --git a/UnitFrames_ClickGrid/Auras/Slots.lua b/UnitFrames_ClickGrid/Auras/Slots.lua index a8c9a12..17f2fab 100644 --- a/UnitFrames_ClickGrid/Auras/Slots.lua +++ b/UnitFrames_ClickGrid/Auras/Slots.lua @@ -41,7 +41,8 @@ function Slots:InitButton(button, key, preview) end function Slots:StyleButton(button) - AuraIcon.Apply(button, self.resolved, self.resolved[button.ufKind].size) + local size = self.resolved[button.ufKind].size + AuraIcon.Apply(button, self.resolved, size, size) end function Slots:OnApply(cfg) diff --git a/tests/fixtures/schema_snapshot.txt b/tests/fixtures/schema_snapshot.txt index f1b3e6a..28645d1 100644 --- a/tests/fixtures/schema_snapshot.txt +++ b/tests/fixtures/schema_snapshot.txt @@ -1942,7 +1942,9 @@ option buffs.maxDuration type="range" label="Maximum total duration" default=0 m option buffs.sort type="select" label="Order" default="expiration" values=#1cce513e option buffs.swipe type="select" label="Cooldown swipe" default="normal" values=#f0e7db26 option buffs.showSwipeEdge type="toggle" label="Show swipe edge" default=true tooltip=#f5996ae7 -option buffs.size type="range" label="Icon size" default=20 min=10 max=64 step=1 +option buffs.size type="range" label="Icon size" default=20 min=10 max=64 step=1 tooltip=#82819ad4 +option buffs.separateHeight type="toggle" label="Separate icon height" default=false tooltip=#5479568a +option buffs.height type="range" label="Icon height" default=20 min=6 max=64 step=1 hidden option buffs.position type="select" label="Side" default="top" values=#eef25c33 option buffs.alignment type="select" label="Alignment" default="start" values=#1b2acdcf tooltip=#4d70b052 option buffs.growth type="select" label="Grow direction" default="forward" values=#613b9896 tooltip=#a87e8370 @@ -1958,7 +1960,9 @@ option debuffs.maxDuration type="range" label="Maximum total duration" default=0 option debuffs.sort type="select" label="Order" default="expiration" values=#1cce513e option debuffs.swipe type="select" label="Cooldown swipe" default="normal" values=#f0e7db26 option debuffs.showSwipeEdge type="toggle" label="Show swipe edge" default=true tooltip=#f5996ae7 -option debuffs.size type="range" label="Icon size" default=26 min=10 max=64 step=1 +option debuffs.size type="range" label="Icon size" default=26 min=10 max=64 step=1 tooltip=#82819ad4 +option debuffs.separateHeight type="toggle" label="Separate icon height" default=false tooltip=#5479568a +option debuffs.height type="range" label="Icon height" default=26 min=6 max=64 step=1 hidden option debuffs.position type="select" label="Side" default="bottom" values=#eef25c33 option debuffs.alignment type="select" label="Alignment" default="start" values=#1b2acdcf tooltip=#4d70b052 option debuffs.growth type="select" label="Grow direction" default="forward" values=#613b9896 tooltip=#a87e8370 @@ -1976,12 +1980,14 @@ default buffs.enabled = true default buffs.filter = "HELPFUL" default buffs.gap = 2 default buffs.growth = "forward" +default buffs.height = 20 default buffs.lineSize = 0 default buffs.max = 16 default buffs.maxDuration = 0 default buffs.offsetX = 0 default buffs.offsetY = 0 default buffs.position = "top" +default buffs.separateHeight = false default buffs.showSwipeEdge = true default buffs.size = 20 default buffs.sort = "expiration" @@ -1992,12 +1998,14 @@ default debuffs.enabled = true default debuffs.filter = "HARMFUL" default debuffs.gap = 2 default debuffs.growth = "forward" +default debuffs.height = 26 default debuffs.lineSize = 0 default debuffs.max = 16 default debuffs.maxDuration = 0 default debuffs.offsetX = 0 default debuffs.offsetY = 0 default debuffs.position = "bottom" +default debuffs.separateHeight = false default debuffs.showSwipeEdge = true default debuffs.size = 26 default debuffs.sort = "expiration" @@ -2034,12 +2042,14 @@ resolved buffs.enabled = true resolved buffs.filter = "HELPFUL" resolved buffs.gap = 2 resolved buffs.growth = "forward" +resolved buffs.height = 20 resolved buffs.lineSize = 0 resolved buffs.max = 16 resolved buffs.maxDuration = 0 resolved buffs.offsetX = 0 resolved buffs.offsetY = 0 resolved buffs.position = "top" +resolved buffs.separateHeight = false resolved buffs.showSwipeEdge = true resolved buffs.size = 20 resolved buffs.sort = "expiration" @@ -2050,12 +2060,14 @@ resolved debuffs.enabled = true resolved debuffs.filter = "HARMFUL" resolved debuffs.gap = 2 resolved debuffs.growth = "forward" +resolved debuffs.height = 26 resolved debuffs.lineSize = 0 resolved debuffs.max = 16 resolved debuffs.maxDuration = 0 resolved debuffs.offsetX = 0 resolved debuffs.offsetY = 0 resolved debuffs.position = "bottom" +resolved debuffs.separateHeight = false resolved debuffs.showSwipeEdge = true resolved debuffs.size = 26 resolved debuffs.sort = "expiration" @@ -3418,7 +3430,9 @@ option auras.buffs.maxDuration type="range" label="Maximum total duration" defau option auras.buffs.sort type="select" label="Order" default="expiration" values=#1cce513e option auras.buffs.swipe type="select" label="Cooldown swipe" default="normal" values=#f0e7db26 option auras.buffs.showSwipeEdge type="toggle" label="Show swipe edge" default=true tooltip=#f5996ae7 -option auras.buffs.size type="range" label="Icon size" default=20 min=10 max=64 step=1 +option auras.buffs.size type="range" label="Icon size" default=20 min=10 max=64 step=1 tooltip=#82819ad4 +option auras.buffs.separateHeight type="toggle" label="Separate icon height" default=false tooltip=#5479568a +option auras.buffs.height type="range" label="Icon height" default=20 min=6 max=64 step=1 hidden option auras.buffs.position type="select" label="Side" default="top" values=#eef25c33 option auras.buffs.alignment type="select" label="Alignment" default="start" values=#1b2acdcf tooltip=#4d70b052 option auras.buffs.growth type="select" label="Grow direction" default="forward" values=#613b9896 tooltip=#a87e8370 @@ -3434,7 +3448,9 @@ option auras.debuffs.maxDuration type="range" label="Maximum total duration" def option auras.debuffs.sort type="select" label="Order" default="expiration" values=#1cce513e option auras.debuffs.swipe type="select" label="Cooldown swipe" default="normal" values=#f0e7db26 option auras.debuffs.showSwipeEdge type="toggle" label="Show swipe edge" default=true tooltip=#f5996ae7 -option auras.debuffs.size type="range" label="Icon size" default=26 min=10 max=64 step=1 +option auras.debuffs.size type="range" label="Icon size" default=26 min=10 max=64 step=1 tooltip=#82819ad4 +option auras.debuffs.separateHeight type="toggle" label="Separate icon height" default=false tooltip=#5479568a +option auras.debuffs.height type="range" label="Icon height" default=26 min=6 max=64 step=1 hidden option auras.debuffs.position type="select" label="Side" default="bottom" values=#eef25c33 option auras.debuffs.alignment type="select" label="Alignment" default="start" values=#1b2acdcf tooltip=#4d70b052 option auras.debuffs.growth type="select" label="Grow direction" default="forward" values=#613b9896 tooltip=#a87e8370 @@ -3647,12 +3663,14 @@ default auras.buffs.enabled = true default auras.buffs.filter = "HELPFUL" default auras.buffs.gap = 0 default auras.buffs.growth = "forward" +default auras.buffs.height = 20 default auras.buffs.lineSize = 0 default auras.buffs.max = 16 default auras.buffs.maxDuration = 0 default auras.buffs.offsetX = 0 default auras.buffs.offsetY = 0 default auras.buffs.position = "top" +default auras.buffs.separateHeight = false default auras.buffs.showSwipeEdge = true default auras.buffs.size = 20 default auras.buffs.sort = "expiration" @@ -3663,12 +3681,14 @@ default auras.debuffs.enabled = true default auras.debuffs.filter = "HARMFUL" default auras.debuffs.gap = 0 default auras.debuffs.growth = "forward" +default auras.debuffs.height = 26 default auras.debuffs.lineSize = 0 default auras.debuffs.max = 16 default auras.debuffs.maxDuration = 0 default auras.debuffs.offsetX = 0 default auras.debuffs.offsetY = 0 default auras.debuffs.position = "top" +default auras.debuffs.separateHeight = false default auras.debuffs.showSwipeEdge = true default auras.debuffs.size = 26 default auras.debuffs.sort = "expiration" @@ -4643,12 +4663,14 @@ resolved auras.buffs.enabled = true resolved auras.buffs.filter = "HELPFUL" resolved auras.buffs.gap = 0 resolved auras.buffs.growth = "forward" +resolved auras.buffs.height = 20 resolved auras.buffs.lineSize = 0 resolved auras.buffs.max = 16 resolved auras.buffs.maxDuration = 0 resolved auras.buffs.offsetX = 0 resolved auras.buffs.offsetY = 0 resolved auras.buffs.position = "top" +resolved auras.buffs.separateHeight = false resolved auras.buffs.showSwipeEdge = true resolved auras.buffs.size = 20 resolved auras.buffs.sort = "expiration" @@ -4659,12 +4681,14 @@ resolved auras.debuffs.enabled = true resolved auras.debuffs.filter = "HARMFUL" resolved auras.debuffs.gap = 0 resolved auras.debuffs.growth = "forward" +resolved auras.debuffs.height = 26 resolved auras.debuffs.lineSize = 0 resolved auras.debuffs.max = 16 resolved auras.debuffs.maxDuration = 0 resolved auras.debuffs.offsetX = 0 resolved auras.debuffs.offsetY = 0 resolved auras.debuffs.position = "top" +resolved auras.debuffs.separateHeight = false resolved auras.debuffs.showSwipeEdge = true resolved auras.debuffs.size = 26 resolved auras.debuffs.sort = "expiration" @@ -6480,7 +6504,9 @@ option auras.buffs.maxDuration type="range" label="Maximum total duration" defau option auras.buffs.sort type="select" label="Order" default="expiration" values=#1cce513e option auras.buffs.swipe type="select" label="Cooldown swipe" default="normal" values=#f0e7db26 option auras.buffs.showSwipeEdge type="toggle" label="Show swipe edge" default=true tooltip=#f5996ae7 -option auras.buffs.size type="range" label="Icon size" default=20 min=10 max=64 step=1 +option auras.buffs.size type="range" label="Icon size" default=20 min=10 max=64 step=1 tooltip=#82819ad4 +option auras.buffs.separateHeight type="toggle" label="Separate icon height" default=false tooltip=#5479568a +option auras.buffs.height type="range" label="Icon height" default=20 min=6 max=64 step=1 hidden option auras.buffs.position type="select" label="Side" default="top" values=#eef25c33 option auras.buffs.alignment type="select" label="Alignment" default="start" values=#1b2acdcf tooltip=#4d70b052 option auras.buffs.growth type="select" label="Grow direction" default="forward" values=#613b9896 tooltip=#a87e8370 @@ -6496,7 +6522,9 @@ option auras.debuffs.maxDuration type="range" label="Maximum total duration" def option auras.debuffs.sort type="select" label="Order" default="expiration" values=#1cce513e option auras.debuffs.swipe type="select" label="Cooldown swipe" default="normal" values=#f0e7db26 option auras.debuffs.showSwipeEdge type="toggle" label="Show swipe edge" default=true tooltip=#f5996ae7 -option auras.debuffs.size type="range" label="Icon size" default=26 min=10 max=64 step=1 +option auras.debuffs.size type="range" label="Icon size" default=26 min=10 max=64 step=1 tooltip=#82819ad4 +option auras.debuffs.separateHeight type="toggle" label="Separate icon height" default=false tooltip=#5479568a +option auras.debuffs.height type="range" label="Icon height" default=26 min=6 max=64 step=1 hidden option auras.debuffs.position type="select" label="Side" default="bottom" values=#eef25c33 option auras.debuffs.alignment type="select" label="Alignment" default="start" values=#1b2acdcf tooltip=#4d70b052 option auras.debuffs.growth type="select" label="Grow direction" default="forward" values=#613b9896 tooltip=#a87e8370 @@ -6701,12 +6729,14 @@ default auras.buffs.enabled = true default auras.buffs.filter = "HELPFUL" default auras.buffs.gap = 2 default auras.buffs.growth = "forward" +default auras.buffs.height = 20 default auras.buffs.lineSize = 0 default auras.buffs.max = 6 default auras.buffs.maxDuration = 0 default auras.buffs.offsetX = 0 default auras.buffs.offsetY = 0 default auras.buffs.position = "top" +default auras.buffs.separateHeight = false default auras.buffs.showSwipeEdge = true default auras.buffs.size = 18 default auras.buffs.sort = "expiration" @@ -6717,12 +6747,14 @@ default auras.debuffs.enabled = true default auras.debuffs.filter = "HARMFUL" default auras.debuffs.gap = 2 default auras.debuffs.growth = "forward" +default auras.debuffs.height = 26 default auras.debuffs.lineSize = 0 default auras.debuffs.max = 6 default auras.debuffs.maxDuration = 0 default auras.debuffs.offsetX = 0 default auras.debuffs.offsetY = 0 default auras.debuffs.position = "bottom" +default auras.debuffs.separateHeight = false default auras.debuffs.showSwipeEdge = true default auras.debuffs.size = 18 default auras.debuffs.sort = "expiration" @@ -7445,12 +7477,14 @@ resolved auras.buffs.enabled = true resolved auras.buffs.filter = "HELPFUL" resolved auras.buffs.gap = 2 resolved auras.buffs.growth = "forward" +resolved auras.buffs.height = 20 resolved auras.buffs.lineSize = 0 resolved auras.buffs.max = 6 resolved auras.buffs.maxDuration = 0 resolved auras.buffs.offsetX = 0 resolved auras.buffs.offsetY = 0 resolved auras.buffs.position = "top" +resolved auras.buffs.separateHeight = false resolved auras.buffs.showSwipeEdge = true resolved auras.buffs.size = 18 resolved auras.buffs.sort = "expiration" @@ -7461,12 +7495,14 @@ resolved auras.debuffs.enabled = true resolved auras.debuffs.filter = "HARMFUL" resolved auras.debuffs.gap = 2 resolved auras.debuffs.growth = "forward" +resolved auras.debuffs.height = 26 resolved auras.debuffs.lineSize = 0 resolved auras.debuffs.max = 6 resolved auras.debuffs.maxDuration = 0 resolved auras.debuffs.offsetX = 0 resolved auras.debuffs.offsetY = 0 resolved auras.debuffs.position = "bottom" +resolved auras.debuffs.separateHeight = false resolved auras.debuffs.showSwipeEdge = true resolved auras.debuffs.size = 18 resolved auras.debuffs.sort = "expiration" @@ -9054,7 +9090,9 @@ option auras.buffs.maxDuration type="range" label="Maximum total duration" defau option auras.buffs.sort type="select" label="Order" default="expiration" values=#1cce513e option auras.buffs.swipe type="select" label="Cooldown swipe" default="normal" values=#f0e7db26 option auras.buffs.showSwipeEdge type="toggle" label="Show swipe edge" default=true tooltip=#f5996ae7 -option auras.buffs.size type="range" label="Icon size" default=20 min=10 max=64 step=1 +option auras.buffs.size type="range" label="Icon size" default=20 min=10 max=64 step=1 tooltip=#82819ad4 +option auras.buffs.separateHeight type="toggle" label="Separate icon height" default=false tooltip=#5479568a +option auras.buffs.height type="range" label="Icon height" default=20 min=6 max=64 step=1 hidden option auras.buffs.position type="select" label="Side" default="top" values=#eef25c33 option auras.buffs.alignment type="select" label="Alignment" default="start" values=#1b2acdcf tooltip=#4d70b052 option auras.buffs.growth type="select" label="Grow direction" default="forward" values=#613b9896 tooltip=#a87e8370 @@ -9070,7 +9108,9 @@ option auras.debuffs.maxDuration type="range" label="Maximum total duration" def option auras.debuffs.sort type="select" label="Order" default="expiration" values=#1cce513e option auras.debuffs.swipe type="select" label="Cooldown swipe" default="normal" values=#f0e7db26 option auras.debuffs.showSwipeEdge type="toggle" label="Show swipe edge" default=true tooltip=#f5996ae7 -option auras.debuffs.size type="range" label="Icon size" default=26 min=10 max=64 step=1 +option auras.debuffs.size type="range" label="Icon size" default=26 min=10 max=64 step=1 tooltip=#82819ad4 +option auras.debuffs.separateHeight type="toggle" label="Separate icon height" default=false tooltip=#5479568a +option auras.debuffs.height type="range" label="Icon height" default=26 min=6 max=64 step=1 hidden option auras.debuffs.position type="select" label="Side" default="bottom" values=#eef25c33 option auras.debuffs.alignment type="select" label="Alignment" default="start" values=#1b2acdcf tooltip=#4d70b052 option auras.debuffs.growth type="select" label="Grow direction" default="forward" values=#613b9896 tooltip=#a87e8370 @@ -9275,12 +9315,14 @@ default auras.buffs.enabled = true default auras.buffs.filter = "HELPFUL" default auras.buffs.gap = 0 default auras.buffs.growth = "forward" +default auras.buffs.height = 20 default auras.buffs.lineSize = 0 default auras.buffs.max = 16 default auras.buffs.maxDuration = 0 default auras.buffs.offsetX = 0 default auras.buffs.offsetY = 0 default auras.buffs.position = "bottom" +default auras.buffs.separateHeight = false default auras.buffs.showSwipeEdge = true default auras.buffs.size = 20 default auras.buffs.sort = "expiration" @@ -9291,12 +9333,14 @@ default auras.debuffs.enabled = true default auras.debuffs.filter = "HARMFUL" default auras.debuffs.gap = 0 default auras.debuffs.growth = "forward" +default auras.debuffs.height = 26 default auras.debuffs.lineSize = 0 default auras.debuffs.max = 16 default auras.debuffs.maxDuration = 0 default auras.debuffs.offsetX = 0 default auras.debuffs.offsetY = 0 default auras.debuffs.position = "bottom" +default auras.debuffs.separateHeight = false default auras.debuffs.showSwipeEdge = true default auras.debuffs.size = 26 default auras.debuffs.sort = "expiration" @@ -10048,12 +10092,14 @@ resolved auras.buffs.enabled = true resolved auras.buffs.filter = "HELPFUL" resolved auras.buffs.gap = 0 resolved auras.buffs.growth = "forward" +resolved auras.buffs.height = 20 resolved auras.buffs.lineSize = 0 resolved auras.buffs.max = 16 resolved auras.buffs.maxDuration = 0 resolved auras.buffs.offsetX = 0 resolved auras.buffs.offsetY = 0 resolved auras.buffs.position = "bottom" +resolved auras.buffs.separateHeight = false resolved auras.buffs.showSwipeEdge = true resolved auras.buffs.size = 20 resolved auras.buffs.sort = "expiration" @@ -10064,12 +10110,14 @@ resolved auras.debuffs.enabled = true resolved auras.debuffs.filter = "HARMFUL" resolved auras.debuffs.gap = 0 resolved auras.debuffs.growth = "forward" +resolved auras.debuffs.height = 26 resolved auras.debuffs.lineSize = 0 resolved auras.debuffs.max = 16 resolved auras.debuffs.maxDuration = 0 resolved auras.debuffs.offsetX = 0 resolved auras.debuffs.offsetY = 0 resolved auras.debuffs.position = "bottom" +resolved auras.debuffs.separateHeight = false resolved auras.debuffs.showSwipeEdge = true resolved auras.debuffs.size = 26 resolved auras.debuffs.sort = "expiration" @@ -11662,7 +11710,9 @@ option auras.buffs.maxDuration type="range" label="Maximum total duration" defau option auras.buffs.sort type="select" label="Order" default="expiration" values=#1cce513e option auras.buffs.swipe type="select" label="Cooldown swipe" default="normal" values=#f0e7db26 option auras.buffs.showSwipeEdge type="toggle" label="Show swipe edge" default=true tooltip=#f5996ae7 -option auras.buffs.size type="range" label="Icon size" default=20 min=10 max=64 step=1 +option auras.buffs.size type="range" label="Icon size" default=20 min=10 max=64 step=1 tooltip=#82819ad4 +option auras.buffs.separateHeight type="toggle" label="Separate icon height" default=false tooltip=#5479568a +option auras.buffs.height type="range" label="Icon height" default=20 min=6 max=64 step=1 hidden option auras.buffs.position type="select" label="Side" default="top" values=#eef25c33 option auras.buffs.alignment type="select" label="Alignment" default="start" values=#1b2acdcf tooltip=#4d70b052 option auras.buffs.growth type="select" label="Grow direction" default="forward" values=#613b9896 tooltip=#a87e8370 @@ -11678,7 +11728,9 @@ option auras.debuffs.maxDuration type="range" label="Maximum total duration" def option auras.debuffs.sort type="select" label="Order" default="expiration" values=#1cce513e option auras.debuffs.swipe type="select" label="Cooldown swipe" default="normal" values=#f0e7db26 option auras.debuffs.showSwipeEdge type="toggle" label="Show swipe edge" default=true tooltip=#f5996ae7 -option auras.debuffs.size type="range" label="Icon size" default=26 min=10 max=64 step=1 +option auras.debuffs.size type="range" label="Icon size" default=26 min=10 max=64 step=1 tooltip=#82819ad4 +option auras.debuffs.separateHeight type="toggle" label="Separate icon height" default=false tooltip=#5479568a +option auras.debuffs.height type="range" label="Icon height" default=26 min=6 max=64 step=1 hidden option auras.debuffs.position type="select" label="Side" default="bottom" values=#eef25c33 option auras.debuffs.alignment type="select" label="Alignment" default="start" values=#1b2acdcf tooltip=#4d70b052 option auras.debuffs.growth type="select" label="Grow direction" default="forward" values=#613b9896 tooltip=#a87e8370 @@ -11883,12 +11935,14 @@ default auras.buffs.enabled = true default auras.buffs.filter = "HELPFUL" default auras.buffs.gap = 2 default auras.buffs.growth = "forward" +default auras.buffs.height = 20 default auras.buffs.lineSize = 0 default auras.buffs.max = 8 default auras.buffs.maxDuration = 0 default auras.buffs.offsetX = 0 default auras.buffs.offsetY = 0 default auras.buffs.position = "top" +default auras.buffs.separateHeight = false default auras.buffs.showSwipeEdge = true default auras.buffs.size = 16 default auras.buffs.sort = "expiration" @@ -11899,12 +11953,14 @@ default auras.debuffs.enabled = true default auras.debuffs.filter = "HARMFUL" default auras.debuffs.gap = 2 default auras.debuffs.growth = "forward" +default auras.debuffs.height = 26 default auras.debuffs.lineSize = 0 default auras.debuffs.max = 8 default auras.debuffs.maxDuration = 0 default auras.debuffs.offsetX = 0 default auras.debuffs.offsetY = 0 default auras.debuffs.position = "bottom" +default auras.debuffs.separateHeight = false default auras.debuffs.showSwipeEdge = true default auras.debuffs.size = 18 default auras.debuffs.sort = "expiration" @@ -12633,12 +12689,14 @@ resolved auras.buffs.enabled = true resolved auras.buffs.filter = "HELPFUL" resolved auras.buffs.gap = 2 resolved auras.buffs.growth = "forward" +resolved auras.buffs.height = 20 resolved auras.buffs.lineSize = 0 resolved auras.buffs.max = 8 resolved auras.buffs.maxDuration = 0 resolved auras.buffs.offsetX = 0 resolved auras.buffs.offsetY = 0 resolved auras.buffs.position = "top" +resolved auras.buffs.separateHeight = false resolved auras.buffs.showSwipeEdge = true resolved auras.buffs.size = 16 resolved auras.buffs.sort = "expiration" @@ -12649,12 +12707,14 @@ resolved auras.debuffs.enabled = true resolved auras.debuffs.filter = "HARMFUL" resolved auras.debuffs.gap = 2 resolved auras.debuffs.growth = "forward" +resolved auras.debuffs.height = 26 resolved auras.debuffs.lineSize = 0 resolved auras.debuffs.max = 8 resolved auras.debuffs.maxDuration = 0 resolved auras.debuffs.offsetX = 0 resolved auras.debuffs.offsetY = 0 resolved auras.debuffs.position = "bottom" +resolved auras.debuffs.separateHeight = false resolved auras.debuffs.showSwipeEdge = true resolved auras.debuffs.size = 18 resolved auras.debuffs.sort = "expiration" @@ -14208,7 +14268,9 @@ option auras.buffs.maxDuration type="range" label="Maximum total duration" defau option auras.buffs.sort type="select" label="Order" default="expiration" values=#1cce513e option auras.buffs.swipe type="select" label="Cooldown swipe" default="normal" values=#f0e7db26 option auras.buffs.showSwipeEdge type="toggle" label="Show swipe edge" default=true tooltip=#f5996ae7 -option auras.buffs.size type="range" label="Icon size" default=20 min=10 max=64 step=1 +option auras.buffs.size type="range" label="Icon size" default=20 min=10 max=64 step=1 tooltip=#82819ad4 +option auras.buffs.separateHeight type="toggle" label="Separate icon height" default=false tooltip=#5479568a +option auras.buffs.height type="range" label="Icon height" default=20 min=6 max=64 step=1 hidden option auras.buffs.position type="select" label="Side" default="top" values=#eef25c33 option auras.buffs.alignment type="select" label="Alignment" default="start" values=#1b2acdcf tooltip=#4d70b052 option auras.buffs.growth type="select" label="Grow direction" default="forward" values=#613b9896 tooltip=#a87e8370 @@ -14224,7 +14286,9 @@ option auras.debuffs.maxDuration type="range" label="Maximum total duration" def option auras.debuffs.sort type="select" label="Order" default="expiration" values=#1cce513e option auras.debuffs.swipe type="select" label="Cooldown swipe" default="normal" values=#f0e7db26 option auras.debuffs.showSwipeEdge type="toggle" label="Show swipe edge" default=true tooltip=#f5996ae7 -option auras.debuffs.size type="range" label="Icon size" default=26 min=10 max=64 step=1 +option auras.debuffs.size type="range" label="Icon size" default=26 min=10 max=64 step=1 tooltip=#82819ad4 +option auras.debuffs.separateHeight type="toggle" label="Separate icon height" default=false tooltip=#5479568a +option auras.debuffs.height type="range" label="Icon height" default=26 min=6 max=64 step=1 hidden option auras.debuffs.position type="select" label="Side" default="bottom" values=#eef25c33 option auras.debuffs.alignment type="select" label="Alignment" default="start" values=#1b2acdcf tooltip=#4d70b052 option auras.debuffs.growth type="select" label="Grow direction" default="forward" values=#613b9896 tooltip=#a87e8370 @@ -14429,12 +14493,14 @@ default auras.buffs.enabled = true default auras.buffs.filter = "HELPFUL" default auras.buffs.gap = 0 default auras.buffs.growth = "forward" +default auras.buffs.height = 20 default auras.buffs.lineSize = 0 default auras.buffs.max = 16 default auras.buffs.maxDuration = 0 default auras.buffs.offsetX = 0 default auras.buffs.offsetY = 0 default auras.buffs.position = "top" +default auras.buffs.separateHeight = false default auras.buffs.showSwipeEdge = true default auras.buffs.size = 20 default auras.buffs.sort = "expiration" @@ -14445,12 +14511,14 @@ default auras.debuffs.enabled = true default auras.debuffs.filter = "HARMFUL" default auras.debuffs.gap = 0 default auras.debuffs.growth = "forward" +default auras.debuffs.height = 26 default auras.debuffs.lineSize = 0 default auras.debuffs.max = 16 default auras.debuffs.maxDuration = 0 default auras.debuffs.offsetX = 0 default auras.debuffs.offsetY = 0 default auras.debuffs.position = "top" +default auras.debuffs.separateHeight = false default auras.debuffs.showSwipeEdge = true default auras.debuffs.size = 26 default auras.debuffs.sort = "expiration" @@ -15179,12 +15247,14 @@ resolved auras.buffs.enabled = true resolved auras.buffs.filter = "HELPFUL" resolved auras.buffs.gap = 0 resolved auras.buffs.growth = "forward" +resolved auras.buffs.height = 20 resolved auras.buffs.lineSize = 0 resolved auras.buffs.max = 16 resolved auras.buffs.maxDuration = 0 resolved auras.buffs.offsetX = 0 resolved auras.buffs.offsetY = 0 resolved auras.buffs.position = "top" +resolved auras.buffs.separateHeight = false resolved auras.buffs.showSwipeEdge = true resolved auras.buffs.size = 20 resolved auras.buffs.sort = "expiration" @@ -15195,12 +15265,14 @@ resolved auras.debuffs.enabled = true resolved auras.debuffs.filter = "HARMFUL" resolved auras.debuffs.gap = 0 resolved auras.debuffs.growth = "forward" +resolved auras.debuffs.height = 26 resolved auras.debuffs.lineSize = 0 resolved auras.debuffs.max = 16 resolved auras.debuffs.maxDuration = 0 resolved auras.debuffs.offsetX = 0 resolved auras.debuffs.offsetY = 0 resolved auras.debuffs.position = "top" +resolved auras.debuffs.separateHeight = false resolved auras.debuffs.showSwipeEdge = true resolved auras.debuffs.size = 26 resolved auras.debuffs.sort = "expiration" @@ -16756,7 +16828,9 @@ option auras.buffs.maxDuration type="range" label="Maximum total duration" defau option auras.buffs.sort type="select" label="Order" default="expiration" values=#1cce513e option auras.buffs.swipe type="select" label="Cooldown swipe" default="normal" values=#f0e7db26 option auras.buffs.showSwipeEdge type="toggle" label="Show swipe edge" default=true tooltip=#f5996ae7 -option auras.buffs.size type="range" label="Icon size" default=20 min=10 max=64 step=1 +option auras.buffs.size type="range" label="Icon size" default=20 min=10 max=64 step=1 tooltip=#82819ad4 +option auras.buffs.separateHeight type="toggle" label="Separate icon height" default=false tooltip=#5479568a +option auras.buffs.height type="range" label="Icon height" default=20 min=6 max=64 step=1 hidden option auras.buffs.position type="select" label="Side" default="top" values=#eef25c33 option auras.buffs.alignment type="select" label="Alignment" default="start" values=#1b2acdcf tooltip=#4d70b052 option auras.buffs.growth type="select" label="Grow direction" default="forward" values=#613b9896 tooltip=#a87e8370 @@ -16772,7 +16846,9 @@ option auras.debuffs.maxDuration type="range" label="Maximum total duration" def option auras.debuffs.sort type="select" label="Order" default="expiration" values=#1cce513e option auras.debuffs.swipe type="select" label="Cooldown swipe" default="normal" values=#f0e7db26 option auras.debuffs.showSwipeEdge type="toggle" label="Show swipe edge" default=true tooltip=#f5996ae7 -option auras.debuffs.size type="range" label="Icon size" default=26 min=10 max=64 step=1 +option auras.debuffs.size type="range" label="Icon size" default=26 min=10 max=64 step=1 tooltip=#82819ad4 +option auras.debuffs.separateHeight type="toggle" label="Separate icon height" default=false tooltip=#5479568a +option auras.debuffs.height type="range" label="Icon height" default=26 min=6 max=64 step=1 hidden option auras.debuffs.position type="select" label="Side" default="bottom" values=#eef25c33 option auras.debuffs.alignment type="select" label="Alignment" default="start" values=#1b2acdcf tooltip=#4d70b052 option auras.debuffs.growth type="select" label="Grow direction" default="forward" values=#613b9896 tooltip=#a87e8370 @@ -16977,12 +17053,14 @@ default auras.buffs.enabled = true default auras.buffs.filter = "HELPFUL" default auras.buffs.gap = 2 default auras.buffs.growth = "forward" +default auras.buffs.height = 20 default auras.buffs.lineSize = 0 default auras.buffs.max = 8 default auras.buffs.maxDuration = 0 default auras.buffs.offsetX = 0 default auras.buffs.offsetY = 0 default auras.buffs.position = "top" +default auras.buffs.separateHeight = false default auras.buffs.showSwipeEdge = true default auras.buffs.size = 16 default auras.buffs.sort = "expiration" @@ -16993,12 +17071,14 @@ default auras.debuffs.enabled = true default auras.debuffs.filter = "HARMFUL" default auras.debuffs.gap = 2 default auras.debuffs.growth = "forward" +default auras.debuffs.height = 26 default auras.debuffs.lineSize = 0 default auras.debuffs.max = 8 default auras.debuffs.maxDuration = 0 default auras.debuffs.offsetX = 0 default auras.debuffs.offsetY = 0 default auras.debuffs.position = "bottom" +default auras.debuffs.separateHeight = false default auras.debuffs.showSwipeEdge = true default auras.debuffs.size = 18 default auras.debuffs.sort = "expiration" @@ -17727,12 +17807,14 @@ resolved auras.buffs.enabled = true resolved auras.buffs.filter = "HELPFUL" resolved auras.buffs.gap = 2 resolved auras.buffs.growth = "forward" +resolved auras.buffs.height = 20 resolved auras.buffs.lineSize = 0 resolved auras.buffs.max = 8 resolved auras.buffs.maxDuration = 0 resolved auras.buffs.offsetX = 0 resolved auras.buffs.offsetY = 0 resolved auras.buffs.position = "top" +resolved auras.buffs.separateHeight = false resolved auras.buffs.showSwipeEdge = true resolved auras.buffs.size = 16 resolved auras.buffs.sort = "expiration" @@ -17743,12 +17825,14 @@ resolved auras.debuffs.enabled = true resolved auras.debuffs.filter = "HARMFUL" resolved auras.debuffs.gap = 2 resolved auras.debuffs.growth = "forward" +resolved auras.debuffs.height = 26 resolved auras.debuffs.lineSize = 0 resolved auras.debuffs.max = 8 resolved auras.debuffs.maxDuration = 0 resolved auras.debuffs.offsetX = 0 resolved auras.debuffs.offsetY = 0 resolved auras.debuffs.position = "bottom" +resolved auras.debuffs.separateHeight = false resolved auras.debuffs.showSwipeEdge = true resolved auras.debuffs.size = 18 resolved auras.debuffs.sort = "expiration" @@ -21470,7 +21554,9 @@ option auras.buffs.maxDuration type="range" label="Maximum total duration" defau option auras.buffs.sort type="select" label="Order" default="expiration" values=#1cce513e option auras.buffs.swipe type="select" label="Cooldown swipe" default="normal" values=#f0e7db26 option auras.buffs.showSwipeEdge type="toggle" label="Show swipe edge" default=true tooltip=#f5996ae7 -option auras.buffs.size type="range" label="Icon size" default=20 min=10 max=64 step=1 +option auras.buffs.size type="range" label="Icon size" default=20 min=10 max=64 step=1 tooltip=#82819ad4 +option auras.buffs.separateHeight type="toggle" label="Separate icon height" default=false tooltip=#5479568a +option auras.buffs.height type="range" label="Icon height" default=20 min=6 max=64 step=1 hidden option auras.buffs.position type="select" label="Side" default="top" values=#eef25c33 option auras.buffs.alignment type="select" label="Alignment" default="start" values=#1b2acdcf tooltip=#4d70b052 option auras.buffs.growth type="select" label="Grow direction" default="forward" values=#613b9896 tooltip=#a87e8370 @@ -21486,7 +21572,9 @@ option auras.debuffs.maxDuration type="range" label="Maximum total duration" def option auras.debuffs.sort type="select" label="Order" default="expiration" values=#1cce513e option auras.debuffs.swipe type="select" label="Cooldown swipe" default="normal" values=#f0e7db26 option auras.debuffs.showSwipeEdge type="toggle" label="Show swipe edge" default=true tooltip=#f5996ae7 -option auras.debuffs.size type="range" label="Icon size" default=26 min=10 max=64 step=1 +option auras.debuffs.size type="range" label="Icon size" default=26 min=10 max=64 step=1 tooltip=#82819ad4 +option auras.debuffs.separateHeight type="toggle" label="Separate icon height" default=false tooltip=#5479568a +option auras.debuffs.height type="range" label="Icon height" default=26 min=6 max=64 step=1 hidden option auras.debuffs.position type="select" label="Side" default="bottom" values=#eef25c33 option auras.debuffs.alignment type="select" label="Alignment" default="start" values=#1b2acdcf tooltip=#4d70b052 option auras.debuffs.growth type="select" label="Grow direction" default="forward" values=#613b9896 tooltip=#a87e8370 @@ -21666,12 +21754,14 @@ default auras.buffs.enabled = false default auras.buffs.filter = "HELPFUL|PLAYER|RAID_IN_COMBAT" default auras.buffs.gap = 1 default auras.buffs.growth = "forward" +default auras.buffs.height = 20 default auras.buffs.lineSize = 0 default auras.buffs.max = 4 default auras.buffs.maxDuration = 120 default auras.buffs.offsetX = 0 default auras.buffs.offsetY = 0 default auras.buffs.position = "top" +default auras.buffs.separateHeight = false default auras.buffs.showSwipeEdge = true default auras.buffs.size = 14 default auras.buffs.sort = "expiration" @@ -21682,12 +21772,14 @@ default auras.debuffs.enabled = false default auras.debuffs.filter = "HARMFUL" default auras.debuffs.gap = 1 default auras.debuffs.growth = "forward" +default auras.debuffs.height = 26 default auras.debuffs.lineSize = 0 default auras.debuffs.max = 3 default auras.debuffs.maxDuration = 0 default auras.debuffs.offsetX = 0 default auras.debuffs.offsetY = 0 default auras.debuffs.position = "bottom" +default auras.debuffs.separateHeight = false default auras.debuffs.showSwipeEdge = true default auras.debuffs.size = 16 default auras.debuffs.sort = "unitDebuff" @@ -22388,12 +22480,14 @@ resolved auras.buffs.enabled = false resolved auras.buffs.filter = "HELPFUL|PLAYER|RAID_IN_COMBAT" resolved auras.buffs.gap = 1 resolved auras.buffs.growth = "forward" +resolved auras.buffs.height = 20 resolved auras.buffs.lineSize = 0 resolved auras.buffs.max = 4 resolved auras.buffs.maxDuration = 120 resolved auras.buffs.offsetX = 0 resolved auras.buffs.offsetY = 0 resolved auras.buffs.position = "top" +resolved auras.buffs.separateHeight = false resolved auras.buffs.showSwipeEdge = true resolved auras.buffs.size = 14 resolved auras.buffs.sort = "expiration" @@ -22404,12 +22498,14 @@ resolved auras.debuffs.enabled = false resolved auras.debuffs.filter = "HARMFUL" resolved auras.debuffs.gap = 1 resolved auras.debuffs.growth = "forward" +resolved auras.debuffs.height = 26 resolved auras.debuffs.lineSize = 0 resolved auras.debuffs.max = 3 resolved auras.debuffs.maxDuration = 0 resolved auras.debuffs.offsetX = 0 resolved auras.debuffs.offsetY = 0 resolved auras.debuffs.position = "bottom" +resolved auras.debuffs.separateHeight = false resolved auras.debuffs.showSwipeEdge = true resolved auras.debuffs.size = 16 resolved auras.debuffs.sort = "unitDebuff" @@ -23942,7 +24038,9 @@ option auras.buffs.maxDuration type="range" label="Maximum total duration" defau option auras.buffs.sort type="select" label="Order" default="expiration" values=#1cce513e option auras.buffs.swipe type="select" label="Cooldown swipe" default="normal" values=#f0e7db26 option auras.buffs.showSwipeEdge type="toggle" label="Show swipe edge" default=true tooltip=#f5996ae7 -option auras.buffs.size type="range" label="Icon size" default=20 min=10 max=64 step=1 +option auras.buffs.size type="range" label="Icon size" default=20 min=10 max=64 step=1 tooltip=#82819ad4 +option auras.buffs.separateHeight type="toggle" label="Separate icon height" default=false tooltip=#5479568a +option auras.buffs.height type="range" label="Icon height" default=20 min=6 max=64 step=1 hidden option auras.buffs.position type="select" label="Side" default="top" values=#eef25c33 option auras.buffs.alignment type="select" label="Alignment" default="start" values=#1b2acdcf tooltip=#4d70b052 option auras.buffs.growth type="select" label="Grow direction" default="forward" values=#613b9896 tooltip=#a87e8370 @@ -23958,7 +24056,9 @@ option auras.debuffs.maxDuration type="range" label="Maximum total duration" def option auras.debuffs.sort type="select" label="Order" default="expiration" values=#1cce513e option auras.debuffs.swipe type="select" label="Cooldown swipe" default="normal" values=#f0e7db26 option auras.debuffs.showSwipeEdge type="toggle" label="Show swipe edge" default=true tooltip=#f5996ae7 -option auras.debuffs.size type="range" label="Icon size" default=26 min=10 max=64 step=1 +option auras.debuffs.size type="range" label="Icon size" default=26 min=10 max=64 step=1 tooltip=#82819ad4 +option auras.debuffs.separateHeight type="toggle" label="Separate icon height" default=false tooltip=#5479568a +option auras.debuffs.height type="range" label="Icon height" default=26 min=6 max=64 step=1 hidden option auras.debuffs.position type="select" label="Side" default="bottom" values=#eef25c33 option auras.debuffs.alignment type="select" label="Alignment" default="start" values=#1b2acdcf tooltip=#4d70b052 option auras.debuffs.growth type="select" label="Grow direction" default="forward" values=#613b9896 tooltip=#a87e8370 @@ -24154,12 +24254,14 @@ default auras.buffs.enabled = true default auras.buffs.filter = "HELPFUL" default auras.buffs.gap = 2 default auras.buffs.growth = "forward" +default auras.buffs.height = 20 default auras.buffs.lineSize = 0 default auras.buffs.max = 8 default auras.buffs.maxDuration = 0 default auras.buffs.offsetX = 0 default auras.buffs.offsetY = 0 default auras.buffs.position = "top" +default auras.buffs.separateHeight = false default auras.buffs.showSwipeEdge = true default auras.buffs.size = 16 default auras.buffs.sort = "expiration" @@ -24170,12 +24272,14 @@ default auras.debuffs.enabled = true default auras.debuffs.filter = "HARMFUL" default auras.debuffs.gap = 2 default auras.debuffs.growth = "forward" +default auras.debuffs.height = 26 default auras.debuffs.lineSize = 0 default auras.debuffs.max = 8 default auras.debuffs.maxDuration = 0 default auras.debuffs.offsetX = 0 default auras.debuffs.offsetY = 0 default auras.debuffs.position = "bottom" +default auras.debuffs.separateHeight = false default auras.debuffs.showSwipeEdge = true default auras.debuffs.size = 18 default auras.debuffs.sort = "expiration" @@ -24883,12 +24987,14 @@ resolved auras.buffs.enabled = true resolved auras.buffs.filter = "HELPFUL" resolved auras.buffs.gap = 2 resolved auras.buffs.growth = "forward" +resolved auras.buffs.height = 20 resolved auras.buffs.lineSize = 0 resolved auras.buffs.max = 8 resolved auras.buffs.maxDuration = 0 resolved auras.buffs.offsetX = 0 resolved auras.buffs.offsetY = 0 resolved auras.buffs.position = "top" +resolved auras.buffs.separateHeight = false resolved auras.buffs.showSwipeEdge = true resolved auras.buffs.size = 16 resolved auras.buffs.sort = "expiration" @@ -24899,12 +25005,14 @@ resolved auras.debuffs.enabled = true resolved auras.debuffs.filter = "HARMFUL" resolved auras.debuffs.gap = 2 resolved auras.debuffs.growth = "forward" +resolved auras.debuffs.height = 26 resolved auras.debuffs.lineSize = 0 resolved auras.debuffs.max = 8 resolved auras.debuffs.maxDuration = 0 resolved auras.debuffs.offsetX = 0 resolved auras.debuffs.offsetY = 0 resolved auras.debuffs.position = "bottom" +resolved auras.debuffs.separateHeight = false resolved auras.debuffs.showSwipeEdge = true resolved auras.debuffs.size = 18 resolved auras.debuffs.sort = "expiration" @@ -26432,7 +26540,9 @@ option auras.buffs.maxDuration type="range" label="Maximum total duration" defau option auras.buffs.sort type="select" label="Order" default="expiration" values=#1cce513e option auras.buffs.swipe type="select" label="Cooldown swipe" default="normal" values=#f0e7db26 option auras.buffs.showSwipeEdge type="toggle" label="Show swipe edge" default=true tooltip=#f5996ae7 -option auras.buffs.size type="range" label="Icon size" default=20 min=10 max=64 step=1 +option auras.buffs.size type="range" label="Icon size" default=20 min=10 max=64 step=1 tooltip=#82819ad4 +option auras.buffs.separateHeight type="toggle" label="Separate icon height" default=false tooltip=#5479568a +option auras.buffs.height type="range" label="Icon height" default=20 min=6 max=64 step=1 hidden option auras.buffs.position type="select" label="Side" default="top" values=#eef25c33 option auras.buffs.alignment type="select" label="Alignment" default="start" values=#1b2acdcf tooltip=#4d70b052 option auras.buffs.growth type="select" label="Grow direction" default="forward" values=#613b9896 tooltip=#a87e8370 @@ -26448,7 +26558,9 @@ option auras.debuffs.maxDuration type="range" label="Maximum total duration" def option auras.debuffs.sort type="select" label="Order" default="expiration" values=#1cce513e option auras.debuffs.swipe type="select" label="Cooldown swipe" default="normal" values=#f0e7db26 option auras.debuffs.showSwipeEdge type="toggle" label="Show swipe edge" default=true tooltip=#f5996ae7 -option auras.debuffs.size type="range" label="Icon size" default=26 min=10 max=64 step=1 +option auras.debuffs.size type="range" label="Icon size" default=26 min=10 max=64 step=1 tooltip=#82819ad4 +option auras.debuffs.separateHeight type="toggle" label="Separate icon height" default=false tooltip=#5479568a +option auras.debuffs.height type="range" label="Icon height" default=26 min=6 max=64 step=1 hidden option auras.debuffs.position type="select" label="Side" default="bottom" values=#eef25c33 option auras.debuffs.alignment type="select" label="Alignment" default="start" values=#1b2acdcf tooltip=#4d70b052 option auras.debuffs.growth type="select" label="Grow direction" default="forward" values=#613b9896 tooltip=#a87e8370 @@ -26628,12 +26740,14 @@ default auras.buffs.enabled = false default auras.buffs.filter = "HELPFUL" default auras.buffs.gap = 2 default auras.buffs.growth = "forward" +default auras.buffs.height = 20 default auras.buffs.lineSize = 0 default auras.buffs.max = 6 default auras.buffs.maxDuration = 0 default auras.buffs.offsetX = 0 default auras.buffs.offsetY = 0 default auras.buffs.position = "top" +default auras.buffs.separateHeight = false default auras.buffs.showSwipeEdge = true default auras.buffs.size = 18 default auras.buffs.sort = "expiration" @@ -26644,12 +26758,14 @@ default auras.debuffs.enabled = false default auras.debuffs.filter = "HARMFUL" default auras.debuffs.gap = 2 default auras.debuffs.growth = "forward" +default auras.debuffs.height = 26 default auras.debuffs.lineSize = 0 default auras.debuffs.max = 6 default auras.debuffs.maxDuration = 0 default auras.debuffs.offsetX = 0 default auras.debuffs.offsetY = 0 default auras.debuffs.position = "bottom" +default auras.debuffs.separateHeight = false default auras.debuffs.showSwipeEdge = true default auras.debuffs.size = 18 default auras.debuffs.sort = "expiration" @@ -27351,12 +27467,14 @@ resolved auras.buffs.enabled = false resolved auras.buffs.filter = "HELPFUL" resolved auras.buffs.gap = 2 resolved auras.buffs.growth = "forward" +resolved auras.buffs.height = 20 resolved auras.buffs.lineSize = 0 resolved auras.buffs.max = 6 resolved auras.buffs.maxDuration = 0 resolved auras.buffs.offsetX = 0 resolved auras.buffs.offsetY = 0 resolved auras.buffs.position = "top" +resolved auras.buffs.separateHeight = false resolved auras.buffs.showSwipeEdge = true resolved auras.buffs.size = 18 resolved auras.buffs.sort = "expiration" @@ -27367,12 +27485,14 @@ resolved auras.debuffs.enabled = false resolved auras.debuffs.filter = "HARMFUL" resolved auras.debuffs.gap = 2 resolved auras.debuffs.growth = "forward" +resolved auras.debuffs.height = 26 resolved auras.debuffs.lineSize = 0 resolved auras.debuffs.max = 6 resolved auras.debuffs.maxDuration = 0 resolved auras.debuffs.offsetX = 0 resolved auras.debuffs.offsetY = 0 resolved auras.debuffs.position = "bottom" +resolved auras.debuffs.separateHeight = false resolved auras.debuffs.showSwipeEdge = true resolved auras.debuffs.size = 18 resolved auras.debuffs.sort = "expiration" diff --git a/tests/proof/units.lua b/tests/proof/units.lua index 337092a..a633575 100644 --- a/tests/proof/units.lua +++ b/tests/proof/units.lua @@ -28,6 +28,18 @@ local function NoBorder(ns) ns.Config:SetUnitValue("player", "border.enabled", false) end +local function ThickAuraBorder(ns) + ns.Config:SetUnitValue("target", "auras.border", { enabled = true, border = "Blizzard Tooltip", size = 10, padding = 2 }) +end + +local function WideAuras(ns) + for _, kind in ipairs({ "buffs", "debuffs" }) do + ns.Config:SetUnitValue("target", "auras." .. kind .. ".size", 32) + ns.Config:SetUnitValue("target", "auras." .. kind .. ".separateHeight", true) + ns.Config:SetUnitValue("target", "auras." .. kind .. ".height", 18) + end +end + return { { name = "player", build = UnitFrame("player") }, { name = "player-idle", build = UnitFrame("player", { showCast = false }) }, @@ -36,6 +48,8 @@ return { { name = "player-overheal", build = UnitFrame("player", { health = 22000, heal = 7000, showCast = false }, EnableOverheal) }, { name = "target", build = UnitFrame("target") }, { name = "target-35pct", build = UnitFrame("target", { health = 8400, showCast = false }) }, + { name = "target-aura-border", build = UnitFrame("target", { showCast = false }, ThickAuraBorder) }, + { name = "target-aura-wide", build = UnitFrame("target", { showCast = false }, WideAuras) }, { name = "targettarget", build = UnitFrame("targettarget") }, { name = "focus", build = UnitFrame("focus") }, { name = "focustarget", build = UnitFrame("focustarget") }, diff --git a/tests/spec/auras/aura_icon_shape_spec.lua b/tests/spec/auras/aura_icon_shape_spec.lua new file mode 100644 index 0000000..a215854 --- /dev/null +++ b/tests/spec/auras/aura_icon_shape_spec.lua @@ -0,0 +1,55 @@ +local Helpers = require("helpers") + +local function Near(expected, actual) + for index, value in ipairs(expected) do + assert.is_true(math.abs(value - actual[index]) < 1e-9, "coordinate " .. index) + end +end + +describe("Aura icon border and shape", function() + local ns, auras, button + + before_each(function() + ns = Helpers.LoadAddon(true, true) + ns.Config:SetUnitValue("player", "auras.border", { enabled = true, border = "UnitFrames Pixel", padding = 1 }) + auras = ns.Units.frames.player.uf:GetPart("auras") + button = auras:GetContainer("buffs"):GetAuraGroupFrame("buffs", 1) + end) + + it("draws the icon frame's border above the artwork and swipe, below the texts", function() + local edge = ns.Components.Backdrop.BorderTextures(button.ufIconFrame)[1] + local layer = edge:GetParent() + assert.is_true(layer ~= button.ufIconFrame, "edges leave the icon frame's own layers") + assert.is_true(layer:GetFrameLevel() > button.ufCooldown:GetFrameLevel()) + assert.is_true(button.ufCover:GetFrameLevel() > layer:GetFrameLevel()) + assert.is_true(button.ufCountHolder:GetFrameLevel() > layer:GetFrameLevel()) + ns.Config:SetUnitValue("player", "auras.border.border", "Blizzard Raid") + local raid = ns.Components.Backdrop.BorderTextures(button.ufIconFrame)[1]:GetParent() + assert.is_true(raid:GetFrameLevel() > button.ufCooldown:GetFrameLevel()) + end) + + it("keeps square icons until a separate height is enabled, then crops the artwork to fit", function() + local layout = auras:GetContainer("buffs").__state.groups.buffs.layout + local textRoom = ns.AuraIcon.TextRoom(auras.resolved) + assert.equals(20, layout.elementWidth) + assert.equals(20 + textRoom, layout.elementHeight) + Near({ 0.08, 0.92, 0.08, 0.92 }, button.ufIcon.__state.texCoords) + + ns.Config:SetUnitValue("player", "auras.buffs.separateHeight", true) + assert.equals(20, auras.resolved.buffs.height, "the height starts from the current size") + ns.Config:SetUnitValue("player", "auras.buffs.height", 11) + layout = auras:GetContainer("buffs").__state.groups.buffs.layout + assert.equals(20, layout.elementWidth) + assert.equals(11 + textRoom, layout.elementHeight) + assert.equals(20, button.ufIconFrame:GetWidth()) + assert.equals(11, button.ufIconFrame:GetHeight()) + Near({ 0.08, 0.92, 0.5 - 0.42 * 9 / 18, 0.5 + 0.42 * 9 / 18 }, button.ufIcon.__state.texCoords) + + ns.Config:SetUnitValue("player", "auras.buffs.separateHeight", false) + assert.equals(20, button.ufIconFrame:GetHeight()) + end) + + it("crops the longer side of tall icons", function() + Near({ 0.5 - 0.42 * 0.5, 0.5 + 0.42 * 0.5, 0.08, 0.92 }, { ns.AuraIcon.TexCoords(10, 20) }) + end) +end) diff --git a/tests/spec/workbench/raid_border_spec.lua b/tests/spec/workbench/raid_border_spec.lua index d286747..272e511 100644 --- a/tests/spec/workbench/raid_border_spec.lua +++ b/tests/spec/workbench/raid_border_spec.lua @@ -77,7 +77,7 @@ describe("Native raid border previews and live frames", function() UF.AuraIcon.Create(sample, "debuffs", true, { harmful = true }) local cfg = UF.Schema.Resolve(UF.AuraIcon.schema, { border = { border = "Blizzard Raid" } }, UF.Config:GetTheme()) local palette = UF.AuraIcon.DispelColors(cfg) - UF.AuraIcon.Apply(sample, cfg, 24, palette) + UF.AuraIcon.Apply(sample, cfg, 24, 24, palette) UF.AuraIcon.DrawSample(sample, { icon = "sample", dispelName = "Magic" }, palette) assert.equals(8, #sample.ufDispelTextures) for _, texture in ipairs(sample.ufDispelTextures) do assert.same(magic, texture.__state.vertexColor) end