From d04921a9e298f787ac95abe513693b51c2f47cc4 Mon Sep 17 00:00:00 2001 From: Steven Jackson Date: Fri, 17 Oct 2014 21:17:04 -0500 Subject: [PATCH] 5.0.65 --- Interface/AddOns/SVUI/packages/aura/SVAura.lua | 23 ++++++++++++++--------- Interface/AddOns/SVUI/packages/map/SVMap.lua | 5 +++-- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Interface/AddOns/SVUI/packages/aura/SVAura.lua b/Interface/AddOns/SVUI/packages/aura/SVAura.lua index 849eef4..b92576d 100644 --- a/Interface/AddOns/SVUI/packages/aura/SVAura.lua +++ b/Interface/AddOns/SVUI/packages/aura/SVAura.lua @@ -114,8 +114,6 @@ local AURA_ICONS = { -- [8]={19740,116956}, -- }; local SVUI_ConsolidatedBuffs = CreateFrame('Frame', 'SVUI_ConsolidatedBuffs', UIParent) -local CB_WIDTH = 36; -local CB_HEIGHT = 228; local function CreateHyperBuff(index) local buff = CreateFrame("Button", nil, SVUI_ConsolidatedBuffs) @@ -385,8 +383,10 @@ do function MOD:ToggleConsolidatedBuffs() if SV.db.SVAura.hyperBuffs.enable then - CB_HEIGHT = Minimap:GetHeight() - CB_WIDTH = (CB_HEIGHT / 5) + 4 + local maxShown = #AURA_ICONS - 1 + local CB_HEIGHT = SVUI_MinimapFrame:GetHeight() + local CB_WIDTH = (CB_HEIGHT / maxShown) + 4 + print("ToggleConsolidatedBuffs "..CB_WIDTH) SVUI_AurasAnchor:SetSize(CB_WIDTH, CB_HEIGHT) SVUI_ConsolidatedBuffs:Show() BuffFrame:RegisterUnitEvent("UNIT_AURA", "player") @@ -437,7 +437,8 @@ do end local lastGoodFrame local maxShown = #AURA_ICONS - 1 - local buffSize = (Minimap:GetHeight() / maxShown) + 4 + local CB_HEIGHT = SVUI_MinimapFrame:GetHeight() - 50 + local buffSize = (CB_HEIGHT / maxShown) + 4 for i=1, NUM_LE_RAID_BUFF_TYPES do local buff = SVUI_ConsolidatedBuffs[i] @@ -554,8 +555,10 @@ local function CreateAuraHeader(filter) end function MOD:ReLoad() - CB_HEIGHT = Minimap:GetHeight() - CB_WIDTH = (CB_HEIGHT / 5) + 4 + local maxShown = #AURA_ICONS - 1 + local CB_HEIGHT = SVUI_MinimapFrame:GetHeight() - 50 + local CB_WIDTH = (CB_HEIGHT / maxShown) + 4 + print("Reload "..CB_WIDTH) SVUI_AurasAnchor:SetSize(CB_WIDTH, CB_HEIGHT) AURA_FADE_TIME = SV.db.SVAura.fadeBy MOD:UpdateAuraHeader(SVUI_PlayerBuffs, "buffs"); @@ -563,8 +566,10 @@ function MOD:ReLoad() end function MOD:Load() - CB_HEIGHT = Minimap:GetHeight() - CB_WIDTH = (CB_HEIGHT / 5) + 4 + local maxShown = #AURA_ICONS - 1 + local CB_HEIGHT = SVUI_MinimapFrame:GetHeight() - 50 + local CB_WIDTH = (CB_HEIGHT / maxShown) + 4 + print("Load "..CB_WIDTH) if not SV.db.SVAura.enable then return end if SV.db.SVAura.disableBlizzard then BuffFrame:Die() diff --git a/Interface/AddOns/SVUI/packages/map/SVMap.lua b/Interface/AddOns/SVUI/packages/map/SVMap.lua index 70e6cb3..5ca4139 100644 --- a/Interface/AddOns/SVUI/packages/map/SVMap.lua +++ b/Interface/AddOns/SVUI/packages/map/SVMap.lua @@ -76,7 +76,8 @@ local MM_OFFSET_TOP = (MM_SIZE * 0.07) local MM_OFFSET_BOTTOM = (MM_SIZE * 0.11) local MM_WIDTH = MM_SIZE + (MM_BRDR * 2) local MM_HEIGHT = (MM_SIZE - (MM_OFFSET_TOP + MM_OFFSET_BOTTOM) + (MM_BRDR * 2)) ---local +local SVUI_MinimapFrame = CreateFrame("Frame", "SVUI_MinimapFrame", UIParent) +SVUI_MinimapFrame:Size(MM_WIDTH, MM_HEIGHT) --[[ /$$$$$$$ /$$ /$$ /$$$$$$$$/$$$$$$$$/$$$$$$ /$$ /$$ /$$$$$$ | $$__ $$| $$ | $$|__ $$__/__ $$__/$$__ $$| $$$ | $$ /$$__ $$ @@ -704,7 +705,7 @@ function MOD:Load() Minimap:SetBlipTexture("Interface\\AddOns\\SVUI\\assets\\artwork\\Minimap\\MINIMAP_ICONS") Minimap:SetClampedToScreen(false) - local mapHolder = CreateFrame("Frame", "SVUI_MinimapFrame", UIParent) + local mapHolder = SVUI_MinimapFrame mapHolder:SetFrameStrata("BACKGROUND") mapHolder.backdrop = mapHolder:CreateTexture(nil, "BACKGROUND", nil, -2) mapHolder:Point("TOPRIGHT", SV.UIParent, "TOPRIGHT", -10, -10) -- 1.7.9.5