From e7714145ee7da8157cd2aa5c0ca0896f459521f4 Mon Sep 17 00:00:00 2001
From: p3lim-52096 <p3lim-52096@ae24c21f-2f0c-4c94-9256-0092abe71e0d>
Date: Sun, 9 Nov 2008 13:24:18 +0000
Subject: [PATCH] Removed zone text Added zone tooltip Fixed multiple loads

git-svn-id: svn://svn.wowinterface.com/pMinimap-54/trunk@55 ae24c21f-2f0c-4c94-9256-0092abe71e0d
---
 pMinimap/pMinimap.lua |   37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/pMinimap/pMinimap.lua b/pMinimap/pMinimap.lua
index 35a0265..dc12ecb 100644
--- a/pMinimap/pMinimap.lua
+++ b/pMinimap/pMinimap.lua
@@ -14,24 +14,22 @@ for _, check in pairs{InterfaceOptionsDisplayPanelShowClock} do
 	check.Enable = function() end
 end
 
-local orig = Minimap_Update
-function Minimap_Update(...) orig(...) MinimapZoneText:SetAlpha(0) end
-
 function pMinimap:ADDON_LOADED(event)
-	pMinimapDB2 = pMinimapDB2 or {unlocked = false, scale = 0.9, offset = 1, dura = true, coords = false, clock = true, subzone = false, level = 2, strata = 'BACKGROUND', font = 'Interface\\AddOns\\pMinimap\\font.ttf', fontsize = 13, fontflag = 'OUTLINE', colors = {0, 0, 0, 1}}
+	pMinimapDB2 = pMinimapDB2 or {unlocked = false, scale = 0.9, offset = 1, dura = true, coords = false, clock = true, mail = true, subzone = true, level = 2, strata = 'BACKGROUND', font = 'Interface\\AddOns\\pMinimap\\font.ttf', fontsize = 13, fontflag = 'OUTLINE', colors = {0, 0, 0, 1}}
 	pMinimapDB2.unlocked = false
-
-	MinimapZoneText:ClearAllPoints()
-	MinimapZoneText:SetPoint('TOP', Minimap, 0, 15)
-	MinimapZoneText:SetFont(pMinimapDB2.font, pMinimapDB2.fontsize, pMinimapDB2.fontflag)
-	MinimapZoneText:SetDrawLayer('OVERLAY')
-	MinimapZoneText:SetParent(Minimap)
-	MinimapZoneText:SetAlpha(0)
-	MinimapZoneText:SetWidth(220)
-	MinimapZoneTextButton:Hide()
-
-	Minimap:SetScript('OnEnter', function() if(pMinimapDB2.subzone) then MinimapZoneText:SetAlpha(1) end end)
-	Minimap:SetScript('OnLeave', function() if(pMinimapDB2.subzone) then UIFrameFadeOut(MinimapZoneText, 1.5) end end)	
+	self:UnregisterEvent(event)
+
+	Minimap:SetScript('OnLeave', function() GameTooltip:Hide() end)
+	Minimap:SetScript('OnEnter', function(self)
+		if(pMinimapDB2.subzone) then
+			GameTooltip:SetOwner(self, 'ANCHOR_BOTTOMLEFT')
+			local typ, sub, name, o1, o2 = GetZonePVPInfo(), GameTooltip.IsOwned, GameTooltip.SetOwner
+			GameTooltip.IsOwned, GameTooltip.SetOwner = function() return true end, function() end
+			Minimap_SetTooltip(typ, name)
+			GameTooltip.IsOwned, GameTooltip.SetOwner = o1, o2
+			GameTooltip:Show()
+		end
+	end)
 
 	MinimapZoomIn:Hide()
 	MinimapZoomOut:Hide()
@@ -77,6 +75,7 @@ function pMinimap:ADDON_LOADED(event)
 	MinimapToggleButton:Hide()
 
 	GameTimeFrame:Hide()
+	MinimapZoneTextButton:Hide()
 	MiniMapWorldMapButton:Hide()
 	MiniMapMeetingStoneFrame:SetAlpha(0)
 	MiniMapVoiceChatFrame:Hide()
@@ -104,8 +103,10 @@ function pMinimap:ADDON_LOADED(event)
 	if(pMinimapDB2.coords and not IsAddOnLoaded('pMinimap_Coords')) then LoadAddOn('pMinimap_Coords') end
 	if(pMinimapDB2.clock and not IsAddOnLoaded('pMinimap_Clock')) then LoadAddOn('pMinimap_Clock') end
 	if(not pMinimapDB2.clock) then TimeManagerClockButton:Hide() end
-
-	pMinimap:UnregisterEvent(event)
+	if(not pMinimapDB2.mail) then
+		MiniMapMailFrame:UnregisterEvent('UPDATE_PENDING_MAIL')
+		MiniMapMailFrame:Hide()
+	end
 end
 
 SlashCmdList['PMMC'] = function(str)
-- 
1.7.9.5