From 0bf37d7ebaa1c0af04af088d415265527e26edf1 Mon Sep 17 00:00:00 2001
From: Eric Mauser <ericmauser@googlemail.com>
Date: Sat, 21 May 2016 12:40:59 +0200
Subject: [PATCH] minimap panel is now a configurable panel

---
 modules/minimap.lua | 30 +-----------------------------
 modules/panel.lua   | 24 +++++++++++++++++++++++-
 pfUI.lua            |  3 +++
 3 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/modules/minimap.lua b/modules/minimap.lua
index 0d6ee017..75143f5e 100644
--- a/modules/minimap.lua
+++ b/modules/minimap.lua
@@ -39,31 +39,6 @@ pfUI:RegisterModule("minimap", function ()
 
   MiniMapTrackingFrame:SetFrameStrata("LOW")
 
-  -- Current location
-  -- Create location text frame under minimap
-  pfUI.minimapLocation = CreateFrame("Frame", nil, UIParent)
-  pfUI.minimapLocation:SetBackdrop(pfUI.backdrop)
-  pfUI.minimapLocation:SetBackdropColor(0,0,0,0)
-  pfUI.minimapLocation:SetPoint("TOPRIGHT",UIParent, -5, -7 - Minimap:GetHeight())
-  pfUI.minimapLocation:SetHeight(20)
-  pfUI.minimapLocation:SetWidth(Minimap:GetWidth())
-  pfUI.minimapLocation:SetFrameStrata("BACKGROUND")
-  pfUI.minimapLocation.background = pfUI.minimapLocation:CreateTexture(nil,"BACKGROUND")
-  pfUI.minimapLocation.background:SetTexture(0,0,0,1)
-  pfUI.minimapLocation.background:SetAllPoints(pfUI.minimapLocation)
-  -- Create text
-  pfUI.minimapLocation.text = pfUI.minimapLocation:CreateFontString("MinimapZoneText", "LOW", "GameFontNormal")
-  pfUI.minimapLocation.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\arial.ttf", 9, "OUTLINE")
-  pfUI.minimapLocation.text:SetPoint("CENTER", 0, 0)
-  pfUI.minimapLocation.text:SetFontObject(GameFontWhite)
-  -- Initiate zone text
-  pfUI.minimapLocation.text:SetText(GetMinimapZoneText())
-  -- Register zone change event
-  pfUI.minimapLocation:RegisterEvent("MINIMAP_ZONE_CHANGED")
-  local function zoneChangeEventHandler(self, event, ...)
-    pfUI.minimapLocation.text:SetText(GetMinimapZoneText())
-  end
-  pfUI.minimapLocation:SetScript("OnEvent", zoneChangeEventHandler)
 
   -- Coordinates in minimap
   -- Create location text frame in bottom left corner of minimap
@@ -72,13 +47,10 @@ pfUI:RegisterModule("minimap", function ()
   pfUI.minimapCoordinates:SetHeight(20)
   pfUI.minimapCoordinates:SetWidth(40)
   pfUI.minimapCoordinates:SetFrameStrata("BACKGROUND")
-  pfUI.minimapCoordinates.background = pfUI.minimapCoordinates:CreateTexture(nil,"BACKGROUND")
-  pfUI.minimapCoordinates.background:SetTexture(0,0,0,1)
-  pfUI.minimapCoordinates.background:SetAllPoints(pfUI.minimapCoordinates)
   -- Create text
   pfUI.minimapCoordinates.text = pfUI.minimapCoordinates:CreateFontString("MinimapCoordinatesText", "LOW", "GameFontNormal")
   pfUI.minimapCoordinates.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\arial.ttf", 11, "OUTLINE")
-  pfUI.minimapCoordinates.text:SetPoint("LEFT", 0, 0)
+  pfUI.minimapCoordinates.text:SetPoint("LEFT", 4, 0)
   pfUI.minimapCoordinates.text:SetFontObject(GameFontWhite)
   pfUI.minimapCoordinates.text:SetText("X, Y")
   pfUI.minimapCoordinates:Hide()
diff --git a/modules/panel.lua b/modules/panel.lua
index ec34da87..e23fea77 100644
--- a/modules/panel.lua
+++ b/modules/panel.lua
@@ -17,6 +17,7 @@ pfUI:RegisterModule("panel", function ()
       pfUI.panel:UpdateFriend()
       pfUI.panel:UpdateGuild();
       pfUI.panel:UpdateRepair();
+      pfUI.panel:UpdateZone();
     elseif event == "PLAYER_MONEY" then
       pfUI.panel:UpdateGold()
       pfUI.panel:UpdateRepair();
@@ -28,9 +29,10 @@ pfUI:RegisterModule("panel", function ()
       pfUI.panel:UpdateGuild();
     elseif event == "PLAYER_REGEN_ENABLED" or event == "PLAYER_DEAD" then
       pfUI.panel:UpdateRepair();
+    elseif event == "MINIMAP_ZONE_CHANGED" then
+      pfUI.panel:UpdateZone()
     end
   end)
-
   -- Update "exp"
   function pfUI.panel:UpdateExp ()
     if UnitLevel("player") ~= 60 then
@@ -125,6 +127,10 @@ pfUI:RegisterModule("panel", function ()
     pfUI.panel:OutputPanel("durability", lowestPercent .. "% Armor")
   end
 
+  function pfUI.panel:UpdateZone ()
+    pfUI.panel:OutputPanel("zone", GetMinimapZoneText())
+  end
+
   function pfUI.panel:OutputPanel(entry, value)
     if pfUI_config.panel.left.left == entry then
       pfUI.panel.left.left.text:SetText(value)
@@ -144,6 +150,9 @@ pfUI:RegisterModule("panel", function ()
     if pfUI_config.panel.right.right == entry then
       pfUI.panel.right.right.text:SetText(value)
     end
+    if pfUI_config.panel.other.minimap == entry then
+      pfUI.panel.minimap.text:SetText(value)
+    end
   end
 
   pfUI.panel.left = CreateFrame("Frame", "leftChatPanelBottom", pfUI.panel)
@@ -273,6 +282,19 @@ pfUI:RegisterModule("panel", function ()
   pfUI.panel.right.right.text:SetPoint("CENTER", 0, 0)
   pfUI.panel.right.right.text:SetFontObject(GameFontWhite)
   pfUI.panel.right.right.text:SetText("[DUMMY]")
+
+  pfUI.panel.minimap = CreateFrame("Frame", nil, UIParent)
+  pfUI.panel.minimap:SetBackdrop(pfUI.backdrop)
+  pfUI.panel.minimap:SetPoint("TOPRIGHT",UIParent, -5, -7 - Minimap:GetHeight())
+  pfUI.panel.minimap:SetHeight(20)
+  pfUI.panel.minimap:SetWidth(Minimap:GetWidth())
+  pfUI.panel.minimap:SetFrameStrata("BACKGROUND")
+  pfUI.panel.minimap.text = pfUI.panel.minimap:CreateFontString("MinimapZoneText", "LOW", "GameFontNormal")
+  pfUI.panel.minimap.text:SetFont("Interface\\AddOns\\pfUI\\fonts\\arial.ttf", 9, "OUTLINE")
+  pfUI.panel.minimap.text:SetPoint("CENTER", 0, 0)
+  pfUI.panel.minimap.text:SetFontObject(GameFontWhite)
+  pfUI.panel.minimap.text:SetText("[DUMMY]")
+
 end)
 
 
diff --git a/pfUI.lua b/pfUI.lua
index 60978b31..7d118071 100644
--- a/pfUI.lua
+++ b/pfUI.lua
@@ -96,6 +96,9 @@ pfUI_config = {
       center = "gold",
       right = "gold",
     },
+    ["other"] = {
+      minimap = "zone",
+    },
   }
 }