From 25d8e8e7bf4f37426d84dcf336d0069594a06ee7 Mon Sep 17 00:00:00 2001
From: Repooc <tjcooper1982@gmail.com>
Date: Mon, 25 Mar 2013 19:45:18 -0400
Subject: [PATCH] Added button for clearmarkers, added if flare is already
 down and u press button again, flare is cleared.

---
 ElvUI_SLE/media/textures/clearmarker.blp |  Bin 0 -> 6660 bytes
 ElvUI_SLE/modules/marks/flares.lua       |   30 +++++++++++++++++++-----------
 2 files changed, 19 insertions(+), 11 deletions(-)
 create mode 100644 ElvUI_SLE/media/textures/clearmarker.blp

diff --git a/ElvUI_SLE/media/textures/clearmarker.blp b/ElvUI_SLE/media/textures/clearmarker.blp
new file mode 100644
index 0000000000000000000000000000000000000000..e5448cd93d88fc970f45e0cb35ea0395ac8bee11
GIT binary patch
literal 6660
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
PX_hS%5kdqvK|cCF`Hd@F

literal 0
HcmV?d00001

diff --git a/ElvUI_SLE/modules/marks/flares.lua b/ElvUI_SLE/modules/marks/flares.lua
index 8b7c152..6705b95 100644
--- a/ElvUI_SLE/modules/marks/flares.lua
+++ b/ElvUI_SLE/modules/marks/flares.lua
@@ -14,8 +14,9 @@ local f2 = CreateFrame("Button", "TriangleFlareMarker", Main_Flares, "SecureActi
 local f3 = CreateFrame("Button", "DiamondFlareMarker", Main_Flares, "SecureActionButtonTemplate")
 local f4 = CreateFrame("Button", "CrossFlareMarker", Main_Flares, "SecureActionButtonTemplate")
 local f5 = CreateFrame("Button", "StarFlareMarker", Main_Flares, "SecureActionButtonTemplate")
+local f6 = CreateFrame("Button", "ClearFlaresMarker", Main_Flares, "SecureActionButtonTemplate")
 
-local FlareB = {f1,f2,f3,f4,f5}
+local FlareB = {f1,f2,f3,f4,f5,f6}
 
 function RF:CreateFrame()
 	mainFlares:Point("CENTER", E.UIParent, "CENTER", 0, 40);
@@ -29,11 +30,11 @@ function RF:SetupButton(button, flare)
 	button:CreateBackdrop()
 	button.backdrop:SetAllPoints()
 	button:SetAttribute("type", "macro")
-	button:SetAttribute("macrotext",  '/wm '..flare..'')   
+	button:SetAttribute("macrotext", flare)
+	button:RegisterForClicks("AnyDown")
+
 	button.tex = button:CreateTexture(nil, 'OVERLAY')
-	--button.tex:Point('TOPLEFT', button, 'TOPLEFT', 2, -2)
 	button.tex:Point('TOPLEFT', button, 'TOPLEFT', 0, -1)
-	--button.tex:Point('BOTTOMRIGHT', button, 'BOTTOMRIGHT', -2, 2)
 	button.tex:Point('BOTTOMRIGHT', button, 'BOTTOMRIGHT', -2, 1)
 	if button == f1 then     
 		button.tex:SetTexture("INTERFACE/TARGETINGFRAME/UI-RaidTargetingIcon_6")
@@ -55,17 +56,24 @@ function RF:SetupButton(button, flare)
 		button.tex:SetTexture("INTERFACE/TARGETINGFRAME/UI-RaidTargetingIcon_1")
 		button:SetScript("OnEnter", function(self) if (E.db.sle.flares.tooltips==true) then GameTooltip:SetOwner(self, "ANCHOR_CURSOR"); GameTooltip:ClearLines(); GameTooltip:AddLine("Star World Marker"); GameTooltip:Show() end end)
 		button:SetScript("OnLeave", function(self) GameTooltip:Hide() end)
+	elseif button == f6 then
+		button.tex:SetTexture("Interface\\AddOns\\ElvUI_SLE\\media\\textures\\clearmarker.blp")
+		button:SetScript("OnEnter", function(self) if (E.db.sle.flares.tooltips==true) then GameTooltip:SetOwner(self, "ANCHOR_CURSOR"); GameTooltip:ClearLines(); GameTooltip:AddLine("Clear World Markers"); GameTooltip:Show() end end)
+		button:SetScript("OnLeave", function(self) GameTooltip:Hide() end)
 	end
 end
 
 function RF:CreateButtons()
-	for i = 1, 5 do
-		RF:SetupButton(FlareB[i], i)
-	end
+	RF:SetupButton(f1, "/clearworldmarker 1\n/worldmarker 1")
+	RF:SetupButton(f2, "/clearworldmarker 2\n/worldmarker 2")
+	RF:SetupButton(f3, "/clearworldmarker 3\n/worldmarker 3")
+	RF:SetupButton(f4, "/clearworldmarker 4\n/worldmarker 4")
+	RF:SetupButton(f5, "/clearworldmarker 5\n/worldmarker 5")
+	RF:SetupButton(f6, "/clearworldmarker all")
 end
 
 function RF:FrameButtonsSize()
-	for i = 1, 5 do
+	for i = 1, 6 do
 		FlareB[i]:Size(E.db.sle.flares.size)
 	end
 end
@@ -74,8 +82,8 @@ function RF:FrameButtonsGrowth()
 	local db = E.db.sle.flares
 	local size = db.size
 	local width, height, x, y, anchor, point
-	local t = {5*size+8,size+4,"LEFT","RIGHT","TOP","BOTTOM",1,0,-1}
-	for i = 1, 5 do
+	local t = {6*size+9,size+4,"LEFT","RIGHT","TOP","BOTTOM",1,0,-1}
+	for i = 1, 6 do
 		FlareB[i]:ClearAllPoints()
 	end
 
@@ -92,7 +100,7 @@ function RF:FrameButtonsGrowth()
 	mainFlares:SetWidth(width)
 	mainFlares:SetHeight(height)
 
-	for i = 1, 5 do
+	for i = 1, 6 do
 		if i == 1 then
 			FlareB[i]:Point(anchor, Main_Flares, anchor, 2 * x, 2 * y)
 		else
-- 
1.7.9.5