From 397c5b0938804a67df3bd2ed78071d8f9e07b38d Mon Sep 17 00:00:00 2001 From: Steven Jackson Date: Sat, 15 Nov 2014 13:21:40 -0600 Subject: [PATCH] 5.2.01 --- Interface/AddOns/SVUI/packages/map/SVMap.lua | 5 +++-- Interface/AddOns/SVUI/packages/tip/SVTip.lua | 14 +++++++------- Interface/AddOns/SVUI/system/screen.lua | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Interface/AddOns/SVUI/packages/map/SVMap.lua b/Interface/AddOns/SVUI/packages/map/SVMap.lua index ad048e7..7c558bf 100644 --- a/Interface/AddOns/SVUI/packages/map/SVMap.lua +++ b/Interface/AddOns/SVUI/packages/map/SVMap.lua @@ -773,9 +773,10 @@ function MOD:Load() QueueStatusMinimapButton:Point("BOTTOMLEFT", mapHolder, "BOTTOMLEFT", 6, 5) QueueStatusMinimapButton:SetPanelTemplate("Button", false, 1, -2, -2) + GarrisonLandingPageMinimapButton:RemoveTextures() GarrisonLandingPageMinimapButton:ClearAllPoints() - GarrisonLandingPageMinimapButton:Point("BOTTOMLEFT", mapHolder, "BOTTOMLEFT", 6, 5) - GarrisonLandingPageMinimapButton:SetPanelTemplate("Button", false, 1, -2, -2) + GarrisonLandingPageMinimapButton:Size(40,40) + GarrisonLandingPageMinimapButton:Point("BOTTOMLEFT", mapHolder, "BOTTOMLEFT", 0, 0) QueueStatusFrame:SetClampedToScreen(true) QueueStatusMinimapButtonBorder:Hide() diff --git a/Interface/AddOns/SVUI/packages/tip/SVTip.lua b/Interface/AddOns/SVUI/packages/tip/SVTip.lua index 3190b81..b782781 100644 --- a/Interface/AddOns/SVUI/packages/tip/SVTip.lua +++ b/Interface/AddOns/SVUI/packages/tip/SVTip.lua @@ -275,7 +275,7 @@ end local _hook_GameTooltip_OnTooltipSetUnit = function(self) self.SuperBorder:ClearMaskColors() local unit = select(2, self:GetUnit()) - local TamablePet; + -- local TamablePet; if self:GetOwner() ~= UIParent and SV.db.SVTip.visibility.unitFrames ~= "NONE" then local vis = SV.db.SVTip.visibility.unitFrames; if vis == "ALL" or not (vis == "SHIFT" and IsShiftKeyDown() or vis == "CTRL" and IsControlKeyDown() or vis == "ALT" and IsAltKeyDown()) then @@ -390,9 +390,9 @@ local _hook_GameTooltip_OnTooltipSetUnit = function(self) local family = UnitCreatureFamily(unit) or creatureType if(SV.class == "HUNTER" and creatureType == PET_TYPE_SUFFIX[8] and (family and TAMABLE_FAMILIES[family])) then local hunterLevel = UnitLevel("player") - if(unitLevel <= hunterLevel) then - TamablePet = true - end + -- if(unitLevel <= hunterLevel) then + -- TamablePet = true + -- end end creatureType = family else @@ -402,9 +402,9 @@ local _hook_GameTooltip_OnTooltipSetUnit = function(self) lvlLine:SetFormattedText("|cff%02x%02x%02x%s|r%s %s%s", qColor.r * 255, qColor.g * 255, qColor.b * 255, unitLevel > 0 and unitLevel or "??", classification[creatureClassification] or "", creatureType, temp) end end - if(TamablePet) then - GameTooltip:AddLine(TAMABLE_INDICATOR) - end + -- if(TamablePet) then + -- GameTooltip:AddLine(TAMABLE_INDICATOR) + -- end if SV.db.SVTip.targetInfo then local unitTarget = unit.."target" if(unit ~= "player" and UnitExists(unitTarget)) then diff --git a/Interface/AddOns/SVUI/system/screen.lua b/Interface/AddOns/SVUI/system/screen.lua index ab8a0fd..8828c60 100644 --- a/Interface/AddOns/SVUI/system/screen.lua +++ b/Interface/AddOns/SVUI/system/screen.lua @@ -143,7 +143,7 @@ function SV.Screen:Update() if(IsMacClient()) then if(not self.MacDisplay) then - self.MacDisplay = SVLib:NewGlobal("Display"); + self.MacDisplay = LibSuperVillain("Registry"):NewGlobal("Display"); if(not self.MacDisplay.Y or (self.MacDisplay.Y and type(self.MacDisplay.Y) ~= "number")) then self.MacDisplay.Y = gxHeight; end -- 1.7.9.5