From 9da175d29519a3ec04f8d4d44c36d7d4e5e9841c Mon Sep 17 00:00:00 2001
From: Albirew <rad1cal_edward@yahoo.fr>
Date: Thu, 26 Nov 2020 02:31:28 +0100
Subject: [PATCH 1/4] update to 1.0.0

---
 Bar.lua                 |  4 ++--
 ButtonForge.toc         |  4 ++--
 Const.lua               |  6 +++---
 KeyBinder.xml           |  2 +-
 README.md => ReadMe.txt |  8 ++++++-
 UILibLayers.xml         |  2 +-
 UILibLines.lua          |  8 +++----
 UILibToolbar.xml        | 16 ++++----------
 Util.lua                | 48 +++++++++++++++++++++++++----------------
 9 files changed, 54 insertions(+), 44 deletions(-)
 rename README.md => ReadMe.txt (98%)

diff --git a/Bar.lua b/Bar.lua
index 3fbae7a..b0ceb07 100644
--- a/Bar.lua
+++ b/Bar.lua
@@ -141,7 +141,7 @@ function Bar.New(BarSave)
 			NewBar.ButtonFrame = ButtonFrame;
 		
 		--[[Background Layer, this will contain all controls and is used in resizing]]--
-			local Background = CreateFrame("FRAME", nil, ControlFrame);
+			local Background = CreateFrame("FRAME", nil, ControlFrame, "BackdropTemplate");
 			Background:SetSize(1, 1);
 			Background:SetPoint("TOPLEFT", ControlFrame, "TOPLEFT");
 			Background:SetBackdrop({bgFile = Const.ImagesDir.."Backdrop.tga", edgeFile = "Interface/Tooltips/UI-Tooltip-Border", tile = true, tileSize = 16, edgeSize = 16, insets = {left=3, right=3, bottom=3, top=3}});
@@ -182,7 +182,7 @@ function Bar.New(BarSave)
 			NewBar.TileTexture = TileTexture;
 		
 		--[[Label Frame]]--
-			local LabelFrame = CreateFrame("FRAME", nil, ControlFrame);
+			local LabelFrame = CreateFrame("FRAME", nil, ControlFrame, "BackdropTemplate");
 			LabelFrame:SetSize(1, 1);
 			LabelFrame:SetBackdrop({bgFile = "Interface/Tooltips/UI-Tooltip-Background", edgeFile = "Interface/Tooltips/UI-Tooltip-Border", tile = true, tileSize = 16, edgeSize = 8, insets = {left=1.5, right=1.5, bottom=1.5, top=1.5}});
 			LabelFrame:SetBackdropColor(0, 0, 0, 1);
diff --git a/ButtonForge.toc b/ButtonForge.toc
index df91436..e6ee0c4 100644
--- a/ButtonForge.toc
+++ b/ButtonForge.toc
@@ -1,7 +1,7 @@
-## Interface: 80200
+## Interface: 90002
 ## Title: Button Forge
 ## Notes: Add as many or few extra Action Bars and Buttons to your user interface to complement the standard (or other) Action Bars
-## Version: 0.9.50.2
+## Version: 0.9.60
 ## Author: Massiner of Nathrezim
 ## SavedVariables: ButtonForgeGlobalSettings, ButtonForgeGlobalProfiles, ButtonForgeGlobalBackup
 ## SavedVariablesPerCharacter: ButtonForgeSave, BFSave
diff --git a/Const.lua b/Const.lua
index 97484a8..d2eb768 100644
--- a/Const.lua
+++ b/Const.lua
@@ -98,9 +98,9 @@ Const.SlashCommands["-tooltips"] = {params = "bool", group = "bar"};
 Const.SlashCommands["-emptybuttons"] = {params = "bool", group = "bar"};
 Const.SlashCommands["-lockbuttons"] = {params = "bool", group = "bar"};
 Const.SlashCommands["-scale"] = {params = "^%s*(%d*%.?%d+)%s*$", group = "bar"};
-Const.SlashCommands["-rows"] = {params = "^%s*(%d+)%s*$", group = "bar", requires = {"-bar"}};
-Const.SlashCommands["-cols"] = {params = "^%s*(%d+)%s*$", group = "bar", requires = {"-bar"}};
-Const.SlashCommands["-coords"] = {params = "^%s*(%d*%.?%d+)%s*,?%s*(%d*%.?%d+)%s*$", group = "bar", requires = {"-bar"}};
+Const.SlashCommands["-rows"] = {params = "^%s*(%d+)%s*$", group = "bar", requires = {"-createbar", "-bar"}};
+Const.SlashCommands["-cols"] = {params = "^%s*(%d+)%s*$", group = "bar", requires = {"-createbar", "-bar"}};
+Const.SlashCommands["-coords"] = {params = "^%s*(%d*%.?%d+)%s*,?%s*(%d*%.?%d+)%s*$", group = "bar", requires = {"-createbar", "-bar"}};
 Const.SlashCommands["-gap"] = {params = "^%s*(%d*%.?%d+)%s*$", group = "bar"};
 Const.SlashCommands["-enabled"] = {params = "bool", group = "bar"};
 Const.SlashCommands["-info"] = {params = "^()$", group = "bar", requires = {"-bar"}};
diff --git a/KeyBinder.xml b/KeyBinder.xml
index 4842ad9..f072e3d 100644
--- a/KeyBinder.xml
+++ b/KeyBinder.xml
@@ -39,7 +39,7 @@
 		</Scripts>	
 	</Frame>
 
-	<Frame name="BFBindingDialog" parent="UIParent" hidden="true" clampedtoscreen="true" enablemouse="true" movable="true" frameStrata="FULLSCREEN_DIALOG">
+	<Frame name="BFBindingDialog" parent="UIParent" hidden="true" clampedtoscreen="true" enablemouse="true" movable="true" frameStrata="FULLSCREEN_DIALOG" inherits="BackdropTemplate">
 		<!--<FrameSkin skinid="dcb143e1-a4ab-4e7c-b934-1efa40101d21" frameid="2d508883-59c2-4f83-ae10-27aaad48391b" />-->
 		<Size>
 			<AbsDimension x="341" y="137" />
diff --git a/README.md b/ReadMe.txt
similarity index 98%
rename from README.md
rename to ReadMe.txt
index 4c6d1cd..bcddf44 100644
--- a/README.md
+++ b/ReadMe.txt
@@ -1,7 +1,11 @@
 Button Forge
 Mod for World of Warcraft
 
-Author: Alternator (Massiner of Nathrezim)
+Author: Massiner of Nathrezim
+Contributor: xfsbill
+Past Contributors: DT85, DandierSphinx
+
+Version: 1.0.0
 
 Description: Graphically create as many Action Bars and Buttons in the game as you choose
 
@@ -19,6 +23,8 @@ Restrictions:
 
 
 History:
+19-Nov-2020		v1	- Updated for Wow v9.0 - This update is provided by xfsbill , jee_dae (possibly others ?) - thanks for keeping a version of the addon working all this time!
+							
 26-July-2018		v0.9.50 - Updated for Wow v8.0 - this update is provided by DT85 (Zaranias - Aman'thul) & DandierSphinx... A big thanks for this!!!
 							- The below issues all prevented Button Forge functioning correctly or in some cases at all
 								- Corrected issue with removed UPDATE_WORLD_STATES event
diff --git a/UILibLayers.xml b/UILibLayers.xml
index 986856c..123fcd2 100644
--- a/UILibLayers.xml
+++ b/UILibLayers.xml
@@ -2,7 +2,7 @@
 	
 	<Script file="UILibLayers.lua"/>
 	
-	<Frame name="BFOverlay" enablemouse="true" hidden="true" virtual="true">
+	<Frame name="BFOverlay" enablemouse="true" hidden="true" virtual="true" inherits="BackdropTemplate">
 		<Anchors>
 			<Anchor point="TOPLEFT" relativeTo="UIParent" relativePoint="TOPLEFT">
 				<Offset>
diff --git a/UILibLines.lua b/UILibLines.lua
index 00d4a2a..fcb16b0 100644
--- a/UILibLines.lua
+++ b/UILibLines.lua
@@ -9,12 +9,12 @@
 local UILib = BFUILib;
 local Const = BFConst;
 
-local VertLine = CreateFrame("FRAME", nil, UIParent);
-VertLine:SetBackdrop({bgFile = Const.ImagesDir.."VertLine.tga", edgeFile = nil, tile = false, tileSize = 1, edgeSize = 0, insets = {left=0, right=0, bottom=0, top=0}});
+local VertLine = CreateFrame("FRAME", nil, UIParent, "BackdropTemplate");
+VertLine:SetBackdrop({bgFile = Const.ImagesDir.."VertLine.tga", edgeFile = nil, tile = false, tileSize = 1, edgeSize = 1, insets = {left=0, right=0, bottom=0, top=0}});
 VertLine:SetWidth(Const.VLineThickness / UIParent:GetScale());
 
-local HorizLine = CreateFrame("FRAME", nil, UIParent);
-HorizLine:SetBackdrop({bgFile = Const.ImagesDir.."HorizontalLine.tga", edgeFile = nil, tile = false, tileSize = 1, edgeSize = 0, insets = {left=0, right=0, bottom=0, top=0}});
+local HorizLine = CreateFrame("FRAME", nil, UIParent, "BackdropTemplate");
+HorizLine:SetBackdrop({bgFile = Const.ImagesDir.."HorizontalLine.tga", edgeFile = nil, tile = false, tileSize = 1, edgeSize = 1, insets = {left=0, right=0, bottom=0, top=0}});
 HorizLine:SetHeight(Const.HLineThickness / UIParent:GetScale());
 
 
diff --git a/UILibToolbar.xml b/UILibToolbar.xml
index c3662c9..68d035b 100644
--- a/UILibToolbar.xml
+++ b/UILibToolbar.xml
@@ -2,8 +2,11 @@
 	<!--Autogenerated by wowuides, Version=1.0.300.0, Culture=neutral, PublicKeyToken=null-->
 	<Script file="UILibToolbar.lua"/>
 	
-	<Frame name="BFToolbar" parent="BFConfigureLayer" enablemouse="true" movable="true">
+	<Frame name="BFToolbar" parent="BFConfigureLayer" enablemouse="true" movable="true" inherits="BackdropTemplate">
 		<!--<FrameSkin skinid="dcb143e1-a4ab-4e7c-b934-1efa40101d21" frameid="2d508883-59c2-4f83-ae10-27aaad48391b" />-->
+		<KeyValues>
+			<KeyValue key="backdropInfo" value="BACKDROP_DIALOG_32_32" type="global"/>
+		</KeyValues>
 		<Scripts>
 			<OnMouseDown>
 				self:StartMoving();
@@ -22,17 +25,6 @@
 				</Offset>
 			</Anchor>
 		</Anchors>
-		<Backdrop bgFile="Interface\DialogFrame\UI-DialogBox-Background" edgeFile="Interface\DialogFrame\UI-DialogBox-Border" tile="true">
-			<BackgroundInsets>
-				<AbsInset left="11" right="12" top="12" bottom="11" />
-			</BackgroundInsets>
-			<TileSize>
-				<AbsValue val="32" />
-			</TileSize>
-			<EdgeSize>
-				<AbsValue val="32" />
-			</EdgeSize>
-		</Backdrop>
 		<Layers>
 			<Layer>
 				<Texture name="$parentTitleBorder" file="Interface\DialogFrame\UI-DialogBox-Header">
diff --git a/Util.lua b/Util.lua
index 368e467..0d27a76 100644
--- a/Util.lua
+++ b/Util.lua
@@ -1208,6 +1208,7 @@ function Util.SlashShowMessageByLine(Message)
 end
 
 function SlashCmdList.BUTTONFORGE(msg, editbox)
+	local FirstCommand;
 	local PreparedCommands = {};
 	local Command, Params;
 	local Count = 0;
@@ -1215,6 +1216,9 @@ function SlashCmdList.BUTTONFORGE(msg, editbox)
 	for Token, Space in string.gmatch(msg, '([^%s]+)([%s]*)') do
 		if (Const.SlashCommands[strlower(Token)]) then
 			if (Command) then
+				if (FirstCommand == nil) then
+					FirstCommand = Command;
+				end;
 				Count = Count + 1;
 				--PreparedCommands["Count"] = Count;
 				PreparedCommands[Command] = Util.ProcessSlashCommandParams(Command, Params);
@@ -1248,7 +1252,7 @@ function SlashCmdList.BUTTONFORGE(msg, editbox)
 		-- 2. A rules required's must be present
 		-- 3. A rules exclusions must not be present
 		local Group;
-		local FirstCommand;
+
 		for k, v in pairs(Commands) do
 			FirstCommand = FirstCommand or k;
 			if (Group ~= nil and Group ~= Const.SlashCommands[k].group) then
@@ -1260,13 +1264,20 @@ function SlashCmdList.BUTTONFORGE(msg, editbox)
 			
 			local Requires = Const.SlashCommands[k].requires;
 			if (Requires) then
+				local RequiresValid = false;
+				local RequiresInfo = {};
+				-- make sure we have at least one of the requirements
 				for k1, v1 in pairs(Requires) do
-					if (Commands[v1] == nil) then
-						-- Missing a required command
-						DEFAULT_CHAT_FRAME:AddMessage(string.gsub(string.gsub(Util.GetLocaleString("SlashCommandRequired"), "<COMMANDA>", k), "<COMMANDB>", v1), .5, 1, 0, 1);
-						return;
+					table.insert(RequiresInfo,v1);
+					if (Commands[v1] ~= nil) then
+						RequiresValid = true;
 					end
 				end
+				if (RequiresValid == false) then
+					-- Missing a required command
+					DEFAULT_CHAT_FRAME:AddMessage(string.gsub(string.gsub(Util.GetLocaleString("SlashCommandRequired"), "<COMMANDA>", k), "<COMMANDB>", table.concat(RequiresInfo, " or ")), .5, 1, 0, 1);
+					return;
+				end
 			end
 			
 			local Incompat = Const.SlashCommands[k].incompat;
@@ -1536,7 +1547,13 @@ function Util.SetCursor(Command, Data, Subvalue, Subsubvalue)
 	UILib.StopDraggingIcon();
 	SpellFlyout:Hide();
 	if (Command == "spell") then
-		PickupSpell(Subsubvalue);
+		-- pet spell or not
+		local name = GetSpellInfo(Subsubvalue);
+		if ( Util.PetSpellIndex[name] ) then
+			PickupSpellBookItem(Util.PetSpellIndex[name], BOOKTYPE_PET);
+		else
+			PickupSpell(Subsubvalue);
+		end;
 	elseif (Command == "item") then
 		PickupItem(Data);
 	elseif (Command == "macro") then
@@ -1668,7 +1685,7 @@ end
 -------------------------------------------]]
 function Util.GetFullSpellName(Name, Rank)
 --BFA fix: GetSpellInfo now returns a nil for the rank.  That's passed in here
---So we check to make sure ranx exists or only pass back the name itself.
+--So we check to make sure rank exists or only pass back the name itself.
 	if (Rank) then
 		Rank = "("..Rank..")";
 	else
@@ -1759,21 +1776,16 @@ end
 function Util.CachePetSpellIndexes()
 	local i = 1;
 	local NewPSI = {};
-	--Util.NewPetSpellIndex = {};
 	while true do
-		local NameRank = Util.GetFullSpellName(GetSpellInfo(i, BOOKTYPE_PET));
-		if (not NameRank) then
-			break;
+		local spellName, spellSubName = GetSpellBookItemName(i, BOOKTYPE_PET)
+		if not spellName then
+			do break end
 		end
-		--if (not Util.PetSpellIndex[NameRank]) then
-		--	Util.NewPetSpellIndex[NameRanl] = i;
-		--end
-		NewPSI[NameRank] = i;
-		i = i + 1;
+		NewPSI[spellName] = i;
+		i = i + 1
 	end
 
-	Util.PetSpellIndex = NewPSI;
-	
+	Util.PetSpellIndex = NewPSI;	
 end
 
 function Util.LookupSpellIndex(NameRank)

From 58a8ef7de94c0cdfb9edb55aad258e57c26c538d Mon Sep 17 00:00:00 2001
From: Albirew <rad1cal_edward@yahoo.fr>
Date: Thu, 26 Nov 2020 02:32:29 +0100
Subject: [PATCH 2/4] update to 1.0.1

---
 Button.lua      | 20 ++++++++++++++++++--
 ButtonForge.toc |  2 +-
 Const.lua       |  4 ++--
 ReadMe.txt      |  6 ++++--
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/Button.lua b/Button.lua
index ee90438..a687db6 100644
--- a/Button.lua
+++ b/Button.lua
@@ -1149,9 +1149,25 @@ function Button:SetAttributes(Type, Value)
 	
 	--Now if a valid type is passed in set it
 	if (Type == "spell") then
-		-- Patch to fix some spell that doesnt like to be cast with ID (Thrash, Stampeding Roar, ...)
+
+		prof1, prof2 = GetProfessions();
+		if ( prof1 ) then
+			prof1_name, _, _, _, _, _, prof1_skillLine = GetProfessionInfo(prof1);
+		end
+		if ( prof2 ) then
+			prof2_name, _, _, _, _, _, prof2_skillLine = GetProfessionInfo(prof2);
+		end
+
 		local SpellName = GetSpellInfo(Value);
-		if ( SpellName ) then
+		-- Patch to fix tradeskills
+		if ( prof1 and SpellName == prof1_name ) then
+			self.Widget:SetAttribute("type", "macro");
+			self.Widget:SetAttribute("macrotext", "/run RunScript('if (select(6, C_TradeSkillUI.GetTradeSkillLine()) == prof1_skillLine) then C_TradeSkillUI.CloseTradeSkill() else C_TradeSkillUI.OpenTradeSkill("..prof1_skillLine..") end')");
+		elseif ( prof2 and SpellName == prof2_name ) then
+			self.Widget:SetAttribute("type", "macro");
+			self.Widget:SetAttribute("macrotext", "/run RunScript('if (select(6, C_TradeSkillUI.GetTradeSkillLine()) == prof2_skillLine) then C_TradeSkillUI.CloseTradeSkill() else C_TradeSkillUI.OpenTradeSkill("..prof2_skillLine..") end')");
+		-- Patch to fix some spell that doesnt like to be cast with ID (Thrash, Stampeding Roar, ...)
+		elseif ( SpellName ) then
 			self.Widget:SetAttribute("type", Type);
 			self.Widget:SetAttribute(Type, SpellName);
 		else
diff --git a/ButtonForge.toc b/ButtonForge.toc
index e6ee0c4..59e5361 100644
--- a/ButtonForge.toc
+++ b/ButtonForge.toc
@@ -1,7 +1,7 @@
 ## Interface: 90002
 ## Title: Button Forge
 ## Notes: Add as many or few extra Action Bars and Buttons to your user interface to complement the standard (or other) Action Bars
-## Version: 0.9.60
+## Version: 1.0.1
 ## Author: Massiner of Nathrezim
 ## SavedVariables: ButtonForgeGlobalSettings, ButtonForgeGlobalProfiles, ButtonForgeGlobalBackup
 ## SavedVariablesPerCharacter: ButtonForgeSave, BFSave
diff --git a/Const.lua b/Const.lua
index d2eb768..f6d46fc 100644
--- a/Const.lua
+++ b/Const.lua
@@ -11,8 +11,8 @@ Const.SUMMON_RANDOM_FAVORITE_MOUNT_SPELL = 150544;
 Const.SUMMON_RANDOM_FAVORITE_MOUNT_ID = 268435455;
 Const.SUMMON_RANDOM_FAVORITE_BATTLE_PET_ID = "BattlePet-0-FFFFFFFFFFFFFF";
 Const.SUMMON_RANDOM_FAVORITE_BATTLE_PET_TEXTURE = "Interface/Icons/INV_Pet_Achievement_CaptureAPetFromEachFamily_Battle";
-Const.Version				= 0.9;
-Const.VersionMinor			= 50;
+Const.Version				= 1.0;
+Const.VersionMinor			= 0.1;
 Const.MAX_ACCOUNT_MACROS 	= 120;
 Const.ButtonNaming 			= "ButtonForge"
 Const.ButtonSeq 			= 1;					--This value will increment (so not technically a const...)
diff --git a/ReadMe.txt b/ReadMe.txt
index bcddf44..33772c0 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -5,7 +5,7 @@ Author: Massiner of Nathrezim
 Contributor: xfsbill
 Past Contributors: DT85, DandierSphinx
 
-Version: 1.0.0
+Version: 1.0.1
 
 Description: Graphically create as many Action Bars and Buttons in the game as you choose
 
@@ -23,7 +23,9 @@ Restrictions:
 
 
 History:
-19-Nov-2020		v1	- Updated for Wow v9.0 - This update is provided by xfsbill , jee_dae (possibly others ?) - thanks for keeping a version of the addon working all this time!
+23-Nov-2020			v1.0.1	- Fixed an issue opening/closing some tradeskills window
+							
+19-Nov-2020			v1	- Updated for Wow v9.0 - This update is provided by xfsbill , jee_dae (possibly others ?) - thanks for keeping a version of the addon working all this time!
 							
 26-July-2018		v0.9.50 - Updated for Wow v8.0 - this update is provided by DT85 (Zaranias - Aman'thul) & DandierSphinx... A big thanks for this!!!
 							- The below issues all prevented Button Forge functioning correctly or in some cases at all

From fabebbfe1117859e6c103cf82eec78ca779eb214 Mon Sep 17 00:00:00 2001
From: Albirew <rad1cal_edward@yahoo.fr>
Date: Tue, 15 Dec 2020 05:05:07 +0100
Subject: [PATCH 3/4] release 1.0.2

---
 Bar.lua          |  3 +--
 ButtonForge.toc  |  2 +-
 Const.lua        |  3 ++-
 EventManager.lua |  7 +++++++
 KeyBinder.xml    |  3 +++
 Locale-enUS.lua  |  3 +++
 ReadMe.txt       |  7 ++++++-
 Util.lua         | 50 ++++++++++++++++++++++++++++++++++++++++++++----
 8 files changed, 69 insertions(+), 9 deletions(-)

diff --git a/Bar.lua b/Bar.lua
index b0ceb07..2e3841f 100644
--- a/Bar.lua
+++ b/Bar.lua
@@ -534,8 +534,7 @@ function Bar:Configure(BarSave)
 	self:SetAlpha(BarSave["Alpha"]);
 	self:SetGUI(BarSave["GUI"]);
 
-	-- Uncomment this once Clamp insets are working again
-	--self.ControlFrame:SetClampedToScreen(true);
+	self.ControlFrame:SetClampedToScreen(true);
 end
 
 --[[
diff --git a/ButtonForge.toc b/ButtonForge.toc
index 59e5361..dc90712 100644
--- a/ButtonForge.toc
+++ b/ButtonForge.toc
@@ -1,7 +1,7 @@
 ## Interface: 90002
 ## Title: Button Forge
 ## Notes: Add as many or few extra Action Bars and Buttons to your user interface to complement the standard (or other) Action Bars
-## Version: 1.0.1
+## Version: 1.0.2
 ## Author: Massiner of Nathrezim
 ## SavedVariables: ButtonForgeGlobalSettings, ButtonForgeGlobalProfiles, ButtonForgeGlobalBackup
 ## SavedVariablesPerCharacter: ButtonForgeSave, BFSave
diff --git a/Const.lua b/Const.lua
index f6d46fc..e353f56 100644
--- a/Const.lua
+++ b/Const.lua
@@ -12,7 +12,7 @@ Const.SUMMON_RANDOM_FAVORITE_MOUNT_ID = 268435455;
 Const.SUMMON_RANDOM_FAVORITE_BATTLE_PET_ID = "BattlePet-0-FFFFFFFFFFFFFF";
 Const.SUMMON_RANDOM_FAVORITE_BATTLE_PET_TEXTURE = "Interface/Icons/INV_Pet_Achievement_CaptureAPetFromEachFamily_Battle";
 Const.Version				= 1.0;
-Const.VersionMinor			= 0.1;
+Const.VersionMinor			= 0.2;
 Const.MAX_ACCOUNT_MACROS 	= 120;
 Const.ButtonNaming 			= "ButtonForge"
 Const.ButtonSeq 			= 1;					--This value will increment (so not technically a const...)
@@ -92,6 +92,7 @@ Const.DarkOrange = "ffEE5500";
 
 Const.SlashCommands = {};
 Const.SlashCommands["-bar"] = {params = "^%s*(..-)%s*$", group = "bar"};
+Const.SlashCommands["-list"] = {params = "^()$", incompat = {"ALL"}};
 Const.SlashCommands["-macrotext"] = {params = "bool", group = "bar"};
 Const.SlashCommands["-keybindtext"] = {params = "bool", group = "bar"};
 Const.SlashCommands["-tooltips"] = {params = "bool", group = "bar"};
diff --git a/EventManager.lua b/EventManager.lua
index 59190c7..d0d349e 100644
--- a/EventManager.lua
+++ b/EventManager.lua
@@ -96,6 +96,9 @@ Misc:RegisterEvent("SPELL_FLYOUT_UPDATE");			--Refresh the spell_flyouts (mainly
 Misc:RegisterEvent("UI_SCALE_CHANGED");
 Misc:RegisterEvent("MODIFIER_STATE_CHANGED");
 
+Misc:RegisterEvent("ZONE_CHANGED");
+Misc:RegisterEvent("ZONE_CHANGED_INDOORS");
+Misc:RegisterEvent("ZONE_CHANGED_NEW_AREA");
 
 
 
@@ -488,6 +491,10 @@ function Misc:OnEvent(Event, ...)
 	elseif (Event == "EDITBOX_MESSAGE") then
 		self.EditBoxMessage, self.EditBox = ...;
 		self:SetScript("OnUpdate", self.OnUpdate);
+
+	elseif (Event == "ZONE_CHANGED" or Event == "ZONE_CHANGED_INDOORS" or Event == "ZONE_CHANGED_NEW_AREA") then
+		Util.RefreshZoneAbility();
+		
 	end
 end
 function Misc:OnUpdate(Elapsed)
diff --git a/KeyBinder.xml b/KeyBinder.xml
index f072e3d..f62f7b7 100644
--- a/KeyBinder.xml
+++ b/KeyBinder.xml
@@ -36,6 +36,9 @@
 					BFKeyBinder.OnInputBindingOverlay("MOUSEWHEELDOWN");
 				end
 			</OnMouseWheel>
+			<OnGamePadButtonDown>
+				BFKeyBinder.OnInputBindingOverlay(button);
+			</OnGamePadButtonDown>
 		</Scripts>	
 	</Frame>
 
diff --git a/Locale-enUS.lua b/Locale-enUS.lua
index 2d39928..7cc0450 100644
--- a/Locale-enUS.lua
+++ b/Locale-enUS.lua
@@ -88,6 +88,7 @@ Locale["SlashHelpFormatted"]	=
 	"Valid slash commands: |c"..Const.LightBlue.."/buttonforge|r, |c"..Const.LightBlue.."/bufo|r\n"..
 	"Valid switches:\n"..
 	"|c"..Const.LightBlue.."-bar <bar name>|r (the bar to apply changes to, or if not set then all bars)\n"..
+	"|c"..Const.LightBlue.."-list|r\n"..
 	"|c"..Const.LightBlue.."-rename <new name>|r\n"..
 	"|c"..Const.LightBlue.."-rows <number>|r\n"..
 	"|c"..Const.LightBlue.."-cols <number>|r\n"..
@@ -135,6 +136,8 @@ Locale["SlashHelpFormatted"]	=
 Locale["SlashCommandRequired"]		= "<COMMANDA> requires <COMMANDB> to also be specified";
 Locale["SlashCommandIncompatible"]	= "<COMMANDA> is incompatible with <COMMANDB>";
 Locale["SlashCommandAlone"]			= "<COMMANDA> cannot be used with other commands";
+Locale["SlashListBarWithLabel"]		= "- <LABEL> |c"..Const.LightBlue.." Examples: /bufo -bar <LABEL> -info";
+Locale["SlashListBarWithIndex"]		= "- <LABEL> (No label set, use Index) |c"..Const.LightBlue.." Examples: /bufo -bar <LABEL> -info";
 
 Locale["SlashBarNameRequired"]		=
 [[ButtonForge slash command failed:
diff --git a/ReadMe.txt b/ReadMe.txt
index 33772c0..3ad1799 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -5,7 +5,7 @@ Author: Massiner of Nathrezim
 Contributor: xfsbill
 Past Contributors: DT85, DandierSphinx
 
-Version: 1.0.1
+Version: 1.0.2
 
 Description: Graphically create as many Action Bars and Buttons in the game as you choose
 
@@ -23,6 +23,11 @@ Restrictions:
 
 
 History:
+25-Nov-2020			v1.0.2	- Removed Zone Ability frame when placed into a bar
+							- Added slash commands to list bars and allow to interact with bars without a label
+							- Reintroduced clamping bars to the screen (a feature that was disabled all the way back in 2015)
+							- Added keybind support for gamepads
+							
 23-Nov-2020			v1.0.1	- Fixed an issue opening/closing some tradeskills window
 							
 19-Nov-2020			v1	- Updated for Wow v9.0 - This update is provided by xfsbill , jee_dae (possibly others ?) - thanks for keeping a version of the addon working all this time!
diff --git a/Util.lua b/Util.lua
index 0d27a76..99e716c 100644
--- a/Util.lua
+++ b/Util.lua
@@ -448,8 +448,6 @@ function Util.Load()
 	Util.StartMacroCheckDelay();
 	Util.RefreshOnUpdateFunction();
 	
-	SLASH_BUTTONFORGE1 = Util.GetLocaleString("SlashButtonForge1"); -- = "/buttonforge";	--these two identifiers probably shouldn't change, but if need be they can be?!
-	SLASH_BUTTONFORGE2 = Util.GetLocaleString("SlashButtonForge2"); -- = "/bufo";
 	collectgarbage("collect");
 	Util.CallbackEvent("INITIALISED");
 end
@@ -1207,7 +1205,9 @@ function Util.SlashShowMessageByLine(Message)
 	end
 end
 
-function SlashCmdList.BUTTONFORGE(msg, editbox)
+SLASH_BUTTONFORGE1 = Util.GetLocaleString("SlashButtonForge1"); -- = "/buttonforge";	--these two identifiers probably shouldn't change, but if need be they can be?!
+SLASH_BUTTONFORGE2 = Util.GetLocaleString("SlashButtonForge2"); -- = "/bufo";
+SlashCmdList["BUTTONFORGE"] = function(msg, editbox)
 	local FirstCommand;
 	local PreparedCommands = {};
 	local Command, Params;
@@ -1316,10 +1316,21 @@ function SlashCmdList.BUTTONFORGE(msg, editbox)
 					BarName = Commands["-bar"][1];
 				elseif (Commands["-destroybar"]) then
 					BarName = Commands["-destroybar"][1];
-				end		
+				end
+				local barFound = false;
 				for i = 1, #Bars do
 					if ((not BarName) or strlower(BarName) == strlower(Bars[i].BarSave["Label"])) then
 						Util.ApplySlashCommands(Commands, Bars[i]);
+						barFound = true;
+					end
+				end
+				-- bar name not found, check with Index
+				if ( barFound == false ) then
+					for i = 1, #Bars do
+						if ( tonumber(BarName) == i ) then
+							Util.ApplySlashCommands(Commands, Bars[i]);
+							barFound = true;
+						end
 					end
 				end
 			end
@@ -1343,6 +1354,17 @@ function Util.ApplySlashCommands(Commands, Bar)
 		end
 		Commands["-rename"] = Commands["-createbar"];	--this could arguably work by having an empty param to createbar but I think it will feel more natural to require a name with this command
 	end
+
+	if (Commands["-list"]) then
+		local Bars = Util.ActiveBars;
+		for i = 1, #Bars do
+			local label = string.gsub(Util.GetLocaleString("SlashListBarWithLabel"), "<LABEL>", Bars[i].BarSave["Label"]);
+			if (Bars[i].BarSave["Label"] == "") then
+				label = string.gsub(Util.GetLocaleString("SlashListBarWithIndex"), "<LABEL>", i);
+			end
+			DEFAULT_CHAT_FRAME:AddMessage(label, .5, 1, 0, 1);
+		end
+	end
 	
 	if (Commands["-destroybar"]) then
 		Util.DeallocateBar(Bar);
@@ -1857,9 +1879,28 @@ function Util.RefreshBattlePets()
 	end
 end
 
+function Util.RefreshZoneAbility()
+	local zoneAbilities = C_ZoneAbility.GetActiveAbilities();
+	local found = 0;
+	for i, zoneAbility in ipairs(zoneAbilities) do
+		for j, spell in ipairs(Util.ActiveSpells) do
+			if ( zoneAbility.spellID == spell.SpellId ) then
+				found = found + 1;
+				break;
+			end
+		end
+	end
+	if (found == table.getn(zoneAbilities)) then
+		ZoneAbilityFrame:SetShown(false);
+	else
+		ZoneAbilityFrame:SetShown(true);
+	end
+end
+
 function Util.AddSpell(Value)
 	if (not Util.FindInTable(Util.ActiveSpells, Value)) then
 		table.insert(Util.ActiveSpells, Value);
+		Util.RefreshZoneAbility();
 	end
 end
 
@@ -1867,6 +1908,7 @@ function Util.RemoveSpell(Value)
 	local Index = Util.FindInTable(Util.ActiveSpells, Value);
 	if (Index) then
 		table.remove(Util.ActiveSpells, Index);
+		Util.RefreshZoneAbility();
 	end
 end
 

From d42e06d3de557ca9982d59f0265725f81f0662ea Mon Sep 17 00:00:00 2001
From: Albirew <rad1cal_edward@yahoo.fr>
Date: Sat, 30 Jan 2021 15:10:55 +0100
Subject: [PATCH 4/4] release 1.0.3

---
 Bar.lua         | 35 ++++++++++++++++++++++++++++++++++-
 Button.lua      | 44 ++++++++++++++++++++++++++++++++++++--------
 ButtonForge.toc |  2 +-
 Const.lua       |  6 ++++++
 Locale-enUS.lua |  1 +
 ReadMe.txt      |  7 +++++--
 Util.lua        |  4 ++++
 7 files changed, 87 insertions(+), 12 deletions(-)

diff --git a/Bar.lua b/Bar.lua
index 2e3841f..d403144 100644
--- a/Bar.lua
+++ b/Bar.lua
@@ -561,6 +561,27 @@ function Bar:GetPosition()
 	return self.BarSave["Left"], self.BarSave["Top"], self.BarSave["Left"]..", "..self.BarSave["Top"];
 end
 
+function Bar:SetFlyoutDirection(Direction)
+	local flyoutDirection = "UP"; -- default
+	if (Direction == "left" or Direction == "LEFT") then
+		flyoutDirection = "LEFT";
+	elseif (Direction == "right" or Direction == "RIGHT") then
+		flyoutDirection = "RIGHT";
+	elseif (Direction == "down" or Direction == "DOWN") then
+		flyoutDirection = "DOWN";
+	end
+
+	self.BarSave["FlyoutDirection"] = flyoutDirection;
+
+	for r = 1, self.Rows do
+		for c = 1, self.Cols do
+			local i = (r-1) * self.Cols + c;
+			self.Buttons[i].Widget:SetAttribute("flyoutDirection", flyoutDirection);
+			self.Buttons[i]:UpdateFlyout();
+		end
+	end
+end
+
 function Bar:SetScale(Scale, NoCheck)
 	Scale = (Scale or 0) + 0;
 	if (Scale <= 0) then
@@ -604,6 +625,10 @@ function Bar:SetButtonsFromSave()
 			local NewButton = Util.NewButton(self.ButtonFrame, self.BarSave["Buttons"][i], self.BarSave["ButtonsLocked"], self.BarSave["TooltipsOn"], self.BarSave["MacroText"], self.BarSave["KeyBindText"]);
 			table.insert(self.Buttons, i, NewButton);
 			NewButton.Widget:SetPoint("TOPLEFT", self.ButtonFrame, "TOPLEFT", (c-1) * self.BSize, (1-r) * self.BSize);
+			if (self.BarSave["FlyoutDirection"]) then
+				NewButton.Widget:SetAttribute("flyoutDirection", self.BarSave["FlyoutDirection"]);
+				NewButton:UpdateFlyout();
+			end
 		end
 	end
 	
@@ -667,6 +692,10 @@ function Bar:SetNumButtons(Cols, Rows)
 			local NewButton = Util.NewButton(BFrame, ButtonSave, self.BarSave["ButtonsLocked"], self.BarSave["TooltipsOn"], self.BarSave["MacroText"], self.BarSave["KeyBindText"]);
 			table.insert(Buttons, i, NewButton);
 			NewButton.Widget:SetPoint("TOPLEFT", BFrame, "TOPLEFT", (c-1) * self.BSize, (1-r) * self.BSize);
+			if (self.BarSave["FlyoutDirection"]) then
+				NewButton.Widget:SetAttribute("flyoutDirection", self.BarSave["FlyoutDirection"]);
+				NewButton:UpdateFlyout();
+			end
 		end
 	end
 	self.Cols = Cols;
@@ -678,7 +707,11 @@ function Bar:SetNumButtons(Cols, Rows)
 			local ButtonSave = {}; 
 			local NewButton = Util.NewButton(BFrame, ButtonSave, self.BarSave["ButtonsLocked"], self.BarSave["TooltipsOn"], self.BarSave["MacroText"], self.BarSave["KeyBindText"]);
 			table.insert(Buttons, i, NewButton);
-			NewButton.Widget:SetPoint("TOPLEFT", BFrame, "TOPLEFT", (c-1) * self.BSize, (1-r) * self.BSize);			
+			NewButton.Widget:SetPoint("TOPLEFT", BFrame, "TOPLEFT", (c-1) * self.BSize, (1-r) * self.BSize);
+			if (self.BarSave["FlyoutDirection"]) then
+				NewButton.Widget:SetAttribute("flyoutDirection", self.BarSave["FlyoutDirection"]);
+				NewButton:UpdateFlyout();
+			end
 		end
 	end
 	self.Rows = Rows;
diff --git a/Button.lua b/Button.lua
index a687db6..655c6de 100644
--- a/Button.lua
+++ b/Button.lua
@@ -676,7 +676,7 @@ end
 
 --[[ The following functions will configure the button to operate correctly for the specific type of action (these functions must be able to handle the player not knowing spells/macros etc) --]]
 function Button:SetEnvSpell(Id, NameRank, Name, Book, IsTalent)
-	self.UpdateTexture 	= Button.Empty;	
+	self.UpdateTexture 	= Button.UpdateTextureSpell;
 	self.UpdateChecked 	= Button.UpdateCheckedSpell;
 	self.UpdateEquipped = Button.Empty;
 	self.UpdateCooldown	= Button.UpdateCooldownSpell;
@@ -1342,6 +1342,27 @@ function Button:UnitBuffBySpell(unit, spell)
 	return nil;
 end;
 
+function Button:UpdateTextureSpell()
+	local spellHasBuffActive = false;
+	for i=1,40 do
+		local spellId = select(10, UnitBuff("player", i));
+		if spellId then
+			if spellId == self.SpellId then
+				spellHasBuffActive = true;
+				break;
+			end
+		else
+			-- no more buffs
+			break;
+		end;
+	end;
+
+	if (spellHasBuffActive == true and Const.StealthSpellIds[self.SpellId] ~= nil) then
+		self.WIcon:SetTexture("Interface/Icons/Spell_Nature_Invisibilty");
+	else
+		self.WIcon:SetTexture(self.Texture);
+	end
+end
 function Button:UpdateTextureWispSpell()
 --BFA fix: UnitBuff can no longer be called with the spell name as a param
 	if (self.UnitBuffBySpell("player", self.SpellName)) then			--NOTE: This en-US, hopefully it will be fine for other locales as well??
@@ -1663,8 +1684,8 @@ function Button:UpdateTextCountSpell()
 		self.WCount:SetText(count);
 		return;
 	end
-	local charges = GetSpellCharges(self.SpellNameRank);
-	if (charges ~= nil) then
+	local charges, maxCharges = GetSpellCharges(self.SpellNameRank);
+	if (charges ~= nil and maxCharges ~= 1) then
 		self.WCount:SetText(charges);
 		return;
 	end
@@ -2212,13 +2233,20 @@ function Button:UpdateFlyout()
 		-- Update arrow
 		Widget.FlyoutArrow:Show();
 		Widget.FlyoutArrow:ClearAllPoints();
-		--if (self:GetParent() == MultiBarRight or self:GetParent() == MultiBarLeft) then
-			--self.FlyoutArrow:SetPoint("LEFT", self, "LEFT", -arrowDistance, 0);
-			--SetClampedTextureRotation(self.FlyoutArrow, 270);
-		--else
+		local direction = self.Widget:GetAttribute("flyoutDirection");
+		if (direction == "LEFT") then
+			Widget.FlyoutArrow:SetPoint("LEFT", Widget, "LEFT", -arrowDistance, 0);
+			SetClampedTextureRotation(Widget.FlyoutArrow, 270);
+		elseif (direction == "RIGHT") then
+			Widget.FlyoutArrow:SetPoint("RIGHT", Widget, "RIGHT", arrowDistance, 0);
+			SetClampedTextureRotation(Widget.FlyoutArrow, 90);
+		elseif (direction == "DOWN") then
+			Widget.FlyoutArrow:SetPoint("BOTTOM", Widget, "BOTTOM", 0, -arrowDistance);
+			SetClampedTextureRotation(Widget.FlyoutArrow, 180);
+		else
 			Widget.FlyoutArrow:SetPoint("TOP", Widget, "TOP", 0, arrowDistance);
 			SetClampedTextureRotation(Widget.FlyoutArrow, 0);
-		--end
+		end
 	else
 		Widget.FlyoutBorder:Hide();
 		Widget.FlyoutBorderShadow:Hide();
diff --git a/ButtonForge.toc b/ButtonForge.toc
index dc90712..f4de25b 100644
--- a/ButtonForge.toc
+++ b/ButtonForge.toc
@@ -1,7 +1,7 @@
 ## Interface: 90002
 ## Title: Button Forge
 ## Notes: Add as many or few extra Action Bars and Buttons to your user interface to complement the standard (or other) Action Bars
-## Version: 1.0.2
+## Version: 1.0.3
 ## Author: Massiner of Nathrezim
 ## SavedVariables: ButtonForgeGlobalSettings, ButtonForgeGlobalProfiles, ButtonForgeGlobalBackup
 ## SavedVariablesPerCharacter: ButtonForgeSave, BFSave
diff --git a/Const.lua b/Const.lua
index e353f56..c093c11 100644
--- a/Const.lua
+++ b/Const.lua
@@ -56,6 +56,11 @@ Const.ThresholdHSnapSq		= 10 * 10;
 Const.ThresholdHPressureSq	= 20 * 20;
 
 
+Const.StealthSpellIds = {};
+Const.StealthSpellIds[1784] = 1;		-- Stealth
+Const.StealthSpellIds[5215] = 1;		-- Prowl
+
+
 Const.WispSpellIds = {};
 Const.WispSpellIds[19746]	= 1;		--Concentration Aura
 Const.WispSpellIds[32223]	= 1;		--Crusader Aura
@@ -98,6 +103,7 @@ Const.SlashCommands["-keybindtext"] = {params = "bool", group = "bar"};
 Const.SlashCommands["-tooltips"] = {params = "bool", group = "bar"};
 Const.SlashCommands["-emptybuttons"] = {params = "bool", group = "bar"};
 Const.SlashCommands["-lockbuttons"] = {params = "bool", group = "bar"};
+Const.SlashCommands["-flyout"] = {params = "^%s*(..-)%s*$", group = "bar"};
 Const.SlashCommands["-scale"] = {params = "^%s*(%d*%.?%d+)%s*$", group = "bar"};
 Const.SlashCommands["-rows"] = {params = "^%s*(%d+)%s*$", group = "bar", requires = {"-createbar", "-bar"}};
 Const.SlashCommands["-cols"] = {params = "^%s*(%d+)%s*$", group = "bar", requires = {"-createbar", "-bar"}};
diff --git a/Locale-enUS.lua b/Locale-enUS.lua
index 7cc0450..961ee10 100644
--- a/Locale-enUS.lua
+++ b/Locale-enUS.lua
@@ -98,6 +98,7 @@ Locale["SlashHelpFormatted"]	=
 	"|c"..Const.LightBlue.."-tooltips <on/off>|r\n"..
 	"|c"..Const.LightBlue.."-emptybuttons <on/off>|r\n"..
 	"|c"..Const.LightBlue.."-lockbuttons <on/off>|r\n"..
+	"|c"..Const.LightBlue.."-flyout <up/down/left/right>|r\n"..
 	"|c"..Const.LightBlue.."-macrotext <on/off>|r\n"..
 	"|c"..Const.LightBlue.."-keybindtext <on/off>|r\n"..
 	"|c"..Const.LightBlue.."-hidespec1 <on/off>|r\n"..
diff --git a/ReadMe.txt b/ReadMe.txt
index 3ad1799..61ecb81 100644
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -5,7 +5,7 @@ Author: Massiner of Nathrezim
 Contributor: xfsbill
 Past Contributors: DT85, DandierSphinx
 
-Version: 1.0.2
+Version: 1.0.3
 
 Description: Graphically create as many Action Bars and Buttons in the game as you choose
 
@@ -23,7 +23,10 @@ Restrictions:
 
 
 History:
-25-Nov-2020			v1.0.2	- Removed Zone Ability frame when placed into a bar
+28-Jan-2021			v1.0.3	- Replaced Stealth and Prowl with their proper stealth icon
+					- Experimental: Configurable flyout direction through slash commands
+
+02-Dec-2020			v1.0.2	- Removed Zone Ability frame when placed into a bar
 							- Added slash commands to list bars and allow to interact with bars without a label
 							- Reintroduced clamping bars to the screen (a feature that was disabled all the way back in 2015)
 							- Added keybind support for gamepads
diff --git a/Util.lua b/Util.lua
index 99e716c..43b0325 100644
--- a/Util.lua
+++ b/Util.lua
@@ -1389,6 +1389,10 @@ function Util.ApplySlashCommands(Commands, Bar)
 	if (Commands["-lockbuttons"]) then
 		Bar:SetButtonsLocked(Commands["-lockbuttons"][1]);
 	end
+
+	if (Commands["-flyout"]) then
+		Bar:SetFlyoutDirection(Commands["-flyout"][1]);
+	end
 	
 	if (Commands["-scale"]) then
 		Bar:SetScale(tonumber(Commands["-scale"][1]));