diff --git a/Interface/AddOns/SVUI/packages/actionbar/SVBar.lua b/Interface/AddOns/SVUI/packages/actionbar/SVBar.lua index e679f54..8da8b8f 100644 --- a/Interface/AddOns/SVUI/packages/actionbar/SVBar.lua +++ b/Interface/AddOns/SVUI/packages/actionbar/SVBar.lua @@ -956,7 +956,7 @@ local CreateExtraBar = function(self) local exitButton = CreateFrame("Button", "SVUI_BailOut", SuperVillain.UIParent, "SecureHandlerClickTemplate") exitButton:Size(64, 64) - exitButton:Point("TOPLEFT", SVUI_MinimapFrame, "BOTTOMLEFT", 2, -2) + exitButton:Point("TOPLEFT", SVUI_MinimapFrame, "BOTTOMLEFT", 2, -30) exitButton:SetNormalTexture("Interface\\AddOns\\SVUI\\assets\\artwork\\Icons\\EXIT") exitButton:SetPushedTexture("Interface\\AddOns\\SVUI\\assets\\artwork\\Icons\\EXIT") exitButton:SetHighlightTexture("Interface\\AddOns\\SVUI\\assets\\artwork\\Icons\\EXIT") diff --git a/Interface/AddOns/SVUI/packages/aura/SVAura.lua b/Interface/AddOns/SVUI/packages/aura/SVAura.lua index 01de0ee..99dbd24 100644 --- a/Interface/AddOns/SVUI/packages/aura/SVAura.lua +++ b/Interface/AddOns/SVUI/packages/aura/SVAura.lua @@ -79,75 +79,6 @@ local SVUI_ConsolidatedBuffs = CreateFrame('Frame', 'SVUI_ConsolidatedBuffs', UI local CB_WIDTH = 36; local CB_HEIGHT = 228; -local function UpdateAuraHeader(auraHeader) - if not auraHeader then return end; - local db = MOD.db.debuffs; - local font=LSM:Fetch("font",MOD.db.font) - if auraHeader:GetAttribute('filter') == 'HELPFUL' then - db = MOD.db.buffs; - auraHeader:SetAttribute("consolidateTo",MOD.db.hyperBuffs.enable==true and 1 or 0) - auraHeader:SetAttribute('weaponTemplate',("SVUI_AuraTemplate%d"):format(db.size)) - end; - auraHeader:SetAttribute("separateOwn",db.isolate) - auraHeader:SetAttribute("sortMethod",db.sortMethod) - auraHeader:SetAttribute("sortDir",db.sortDir) - auraHeader:SetAttribute("maxWraps",db.maxWraps) - auraHeader:SetAttribute("wrapAfter",db.wrapAfter) - auraHeader:SetAttribute("point",invertMap1[db.showBy]) - if toggleMap[db.showBy]then - auraHeader:SetAttribute("minWidth", ((db.wrapAfter==1 and 0 or db.wrapXOffset) + db.size) * db.wrapAfter) - auraHeader:SetAttribute("minHeight", (db.wrapYOffset + db.size) * db.maxWraps) - auraHeader:SetAttribute("xOffset", showMap1[db.showBy] * (db.wrapXOffset + db.size)) - auraHeader:SetAttribute("yOffset", 0) - auraHeader:SetAttribute("wrapOffsetH", 0) - auraHeader:SetAttribute("wrapOffsetV", showMap2[db.showBy] * (db.wrapYOffset + db.size)) - else - auraHeader:SetAttribute("minWidth", (db.wrapXOffset + db.size)*db.maxWraps) - auraHeader:SetAttribute("minHeight", ((db.wrapAfter==1 and 0 or db.wrapYOffset) + db.size) * db.wrapAfter) - auraHeader:SetAttribute("xOffset", 0) - auraHeader:SetAttribute("yOffset", showMap2[db.showBy] * (db.wrapYOffset + db.size)) - auraHeader:SetAttribute("wrapOffsetH", showMap1[db.showBy] * (db.wrapXOffset + db.size)) - auraHeader:SetAttribute("wrapOffsetV", 0) - end; - auraHeader:SetAttribute("template",("SVUI_AuraTemplate%d"):format(db.size)) - local i=1; - local auraChild=select(i,auraHeader:GetChildren()) - while(auraChild) do - if ((floor(auraChild:GetWidth() * 100 + 0.5) / 100) ~= db.size) then - auraChild:SetSize(db.size,db.size) - end; - if(auraChild.time) then - auraChild.time:ClearAllPoints() - auraChild.time:SetPoint("TOP", auraChild, 'BOTTOM', 1 + MOD.db.timeOffsetH, MOD.db.timeOffsetV) - auraChild.count:ClearAllPoints() - auraChild.count:SetPoint("BOTTOMRIGHT", -1 + MOD.db.countOffsetH, MOD.db.countOffsetV) - end; - if (i > (db.maxWraps * db.wrapAfter) and auraChild:IsShown()) then - auraChild:Hide() - end; - i = i + 1; - auraChild = select(i, auraHeader:GetChildren()) - end -end; - -local function CreateAuraHeader(filter) - local frameName="SVUI_PlayerDebuffs" - if filter=="HELPFUL" then frameName="SVUI_PlayerBuffs" end; - local auraHeader=CreateFrame("Frame", frameName, SVUI_AurasAnchor, "SecureAuraHeaderTemplate") - auraHeader:SetClampedToScreen(true) - auraHeader:SetAttribute("unit","player") - auraHeader:SetAttribute("filter",filter) - RegisterStateDriver(auraHeader,"visibility","[petbattle] hide; show") - RegisterAttributeDriver(auraHeader,"unit","[vehicleui] vehicle; player") - if filter=="HELPFUL" then - auraHeader:SetAttribute('consolidateDuration',-1) - auraHeader:SetAttribute("includeWeapons",1) - end; - UpdateAuraHeader(auraHeader) - auraHeader:Show() - return auraHeader -end; - local function CreateHyperBuff(index) local buff = CreateFrame("Button", nil, SVUI_ConsolidatedBuffs) local texture = AURA_ICONS[index] @@ -504,13 +435,82 @@ do end end; +function MOD:UpdateAuraHeader(auraHeader) + if not auraHeader then return end; + local db = MOD.db.debuffs; + local font=LSM:Fetch("font",MOD.db.font) + if auraHeader:GetAttribute('filter') == 'HELPFUL' then + db = MOD.db.buffs; + auraHeader:SetAttribute("consolidateTo",MOD.db.hyperBuffs.enable==true and 1 or 0) + auraHeader:SetAttribute('weaponTemplate',("SVUI_AuraTemplate%d"):format(db.size)) + end; + auraHeader:SetAttribute("separateOwn",db.isolate) + auraHeader:SetAttribute("sortMethod",db.sortMethod) + auraHeader:SetAttribute("sortDir",db.sortDir) + auraHeader:SetAttribute("maxWraps",db.maxWraps) + auraHeader:SetAttribute("wrapAfter",db.wrapAfter) + auraHeader:SetAttribute("point",invertMap1[db.showBy]) + if toggleMap[db.showBy]then + auraHeader:SetAttribute("minWidth", ((db.wrapAfter==1 and 0 or db.wrapXOffset) + db.size) * db.wrapAfter) + auraHeader:SetAttribute("minHeight", (db.wrapYOffset + db.size) * db.maxWraps) + auraHeader:SetAttribute("xOffset", showMap1[db.showBy] * (db.wrapXOffset + db.size)) + auraHeader:SetAttribute("yOffset", 0) + auraHeader:SetAttribute("wrapOffsetH", 0) + auraHeader:SetAttribute("wrapOffsetV", showMap2[db.showBy] * (db.wrapYOffset + db.size)) + else + auraHeader:SetAttribute("minWidth", (db.wrapXOffset + db.size)*db.maxWraps) + auraHeader:SetAttribute("minHeight", ((db.wrapAfter==1 and 0 or db.wrapYOffset) + db.size) * db.wrapAfter) + auraHeader:SetAttribute("xOffset", 0) + auraHeader:SetAttribute("yOffset", showMap2[db.showBy] * (db.wrapYOffset + db.size)) + auraHeader:SetAttribute("wrapOffsetH", showMap1[db.showBy] * (db.wrapXOffset + db.size)) + auraHeader:SetAttribute("wrapOffsetV", 0) + end; + auraHeader:SetAttribute("template",("SVUI_AuraTemplate%d"):format(db.size)) + local i=1; + local auraChild=select(i,auraHeader:GetChildren()) + while(auraChild) do + if ((floor(auraChild:GetWidth() * 100 + 0.5) / 100) ~= db.size) then + auraChild:SetSize(db.size,db.size) + end; + if(auraChild.time) then + auraChild.time:ClearAllPoints() + auraChild.time:SetPoint("TOP", auraChild, 'BOTTOM', 1 + MOD.db.timeOffsetH, MOD.db.timeOffsetV) + auraChild.count:ClearAllPoints() + auraChild.count:SetPoint("BOTTOMRIGHT", -1 + MOD.db.countOffsetH, MOD.db.countOffsetV) + end; + if (i > (db.maxWraps * db.wrapAfter) and auraChild:IsShown()) then + auraChild:Hide() + end; + i = i + 1; + auraChild = select(i, auraHeader:GetChildren()) + end +end; + +local function CreateAuraHeader(filter) + local frameName="SVUI_PlayerDebuffs" + if filter=="HELPFUL" then frameName="SVUI_PlayerBuffs" end; + local auraHeader=CreateFrame("Frame", frameName, SVUI_AurasAnchor, "SecureAuraHeaderTemplate") + auraHeader:SetClampedToScreen(true) + auraHeader:SetAttribute("unit","player") + auraHeader:SetAttribute("filter",filter) + RegisterStateDriver(auraHeader,"visibility","[petbattle] hide; show") + RegisterAttributeDriver(auraHeader,"unit","[vehicleui] vehicle; player") + if filter=="HELPFUL" then + auraHeader:SetAttribute('consolidateDuration',-1) + auraHeader:SetAttribute("includeWeapons",1) + end; + MOD:UpdateAuraHeader(auraHeader) + auraHeader:Show() + return auraHeader +end; + function MOD:UpdateThisPackage() CB_HEIGHT = Minimap:GetHeight() CB_WIDTH = (CB_HEIGHT / 5) + 4 SVUI_AurasAnchor:SetSize(CB_WIDTH, CB_HEIGHT) AURA_FADE_TIME = MOD.db.fadeBy - UpdateAuraHeader(SVUI_PlayerBuffs); - UpdateAuraHeader(SVUI_PlayerDebuffs); + MOD:UpdateAuraHeader(SVUI_PlayerBuffs); + MOD:UpdateAuraHeader(SVUI_PlayerDebuffs); end; function MOD:ConstructThisPackage() diff --git a/Interface/AddOns/SVUI/packages/override/common/mirror.lua b/Interface/AddOns/SVUI/packages/override/common/mirror.lua index 8172656..21ea30b 100644 --- a/Interface/AddOns/SVUI/packages/override/common/mirror.lua +++ b/Interface/AddOns/SVUI/packages/override/common/mirror.lua @@ -104,7 +104,7 @@ local function MirrorBarRegistry(barType) bg:SetVertexColor(r, g, b) bg:SetAlpha(0.2) local border = CreateFrame("Frame", nil, bar) - border:WrapOuter(bar,2,2) + border:WrapOuter(bar,3,3) border:SetFrameLevel(0) border:SetBackdrop({ bgFile = [[Interface\BUTTONS\WHITE8X8]], @@ -120,10 +120,10 @@ local function MirrorBarRegistry(barType) bottom = 0, }, }) - border:SetBackdropColor(0,0,0) - border:SetBackdropBorderColor(0,0,0) + border:SetBackdropColor(0,0,0,0.5) + border:SetBackdropBorderColor(0,0,0,0.5) bar.text = bar:CreateFontString(nil, 'OVERLAY') - bar.text:SetFontTemplate(nil, nil, 'OUTLINE') + bar.text:SetFontTemplate(SuperVillain.Media.font.roboto, 12, 'OUTLINE') bar.text:SetJustifyH('CENTER') bar.text:SetTextColor(1, 1, 1) bar.text:SetPoint('LEFT', bar) @@ -147,9 +147,28 @@ local function SetTimerStyle(bar) if child:GetObjectType() == "Texture"then child:SetTexture(nil) elseif child:GetObjectType() == "FontString" then - child:SetFontTemplate(nil, 12, 'OUTLINE') + child:SetFontTemplate(SuperVillain.Media.font.roboto, 12, 'OUTLINE') end end; + local border = CreateFrame("Frame", nil, bar) + border:WrapOuter(bar,3,3) + border:SetFrameLevel(0) + border:SetBackdrop({ + bgFile = [[Interface\BUTTONS\WHITE8X8]], + edgeFile = [[Interface\BUTTONS\WHITE8X8]], + tile = false, + tileSize = 0, + edgeSize = 1, + insets = + { + left = 0, + right = 0, + top = 0, + bottom = 0, + }, + }) + border:SetBackdropColor(0,0,0,0.5) + border:SetBackdropBorderColor(0,0,0,0.5) bar:SetStatusBarTexture([[Interface\AddOns\SVUI\assets\artwork\Template\DEFAULT]]) bar:SetStatusBarColor(unpack(SuperVillain.Media.color.highlight)) local tempBG = CreateFrame("Frame", nil, bar) diff --git a/Interface/AddOns/SVUI/packages/tip/SVTip.lua b/Interface/AddOns/SVUI/packages/tip/SVTip.lua index 3db9865..f8e9561 100644 --- a/Interface/AddOns/SVUI/packages/tip/SVTip.lua +++ b/Interface/AddOns/SVUI/packages/tip/SVTip.lua @@ -341,10 +341,7 @@ local _hook_GameTooltip_OnTooltipSetUnit = function(self) GameTooltipTextLeft1:SetFormattedText("|c%s%s|r", colors.colorStr, unitName) if guildName then - if guildRankIndex and IsShiftKeyDown() then - guildName = guildName.."-"..guildRankIndex - end - if MOD.db.guildRanks then + if guildRankIndex and IsShiftKeyDown() and MOD.db.guildRanks then GameTooltipTextLeft2:SetText(("<|cff00ff10%s|r> [|cff00ff10%s|r]"):format(guildName, guildRankName)) else GameTooltipTextLeft2:SetText(("<|cff00ff10%s|r>"):format(guildName))