Increased the Key bind only macro cap from 120 to 1000 (closes #46)

NumyAddon · Apr 20, 2024 · ede1076 · ede1076
1 parent b1a2f75
commit ede1076
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 13 deletions.
diff --git a/MacroToolkit/MacroToolkit.lua b/MacroToolkit/MacroToolkit.lua
@@ -1,3 +1,4 @@
+--- @class MacroToolkit
 local MT = MacroToolkit
 local MTF
 local L, _G = MT.L, _G
@@ -463,9 +464,13 @@ function MT:SetMacros(account, extra, copy)
 	MTF.macroBase = account and 0 or _G.MAX_ACCOUNT_MACROS
 	MTF.macroMax = account and _G.MAX_ACCOUNT_MACROS or _G.MAX_CHARACTER_MACROS
 	if extra then
-		if MT:CountExtra() > 0 then MTF.selectedMacro = 1001
-		else MTF.selectedMacro = nil end
+		if MT:CountExtra() > 0 then
+		    MTF.selectedMacro = 1001
+		else
+		    MTF.selectedMacro = nil
+        end
 		MTF.macroBase = 1000
+		MTF.macroMax = MT.MAX_EXTRA_MACROS
 	elseif copy then
 		MTF.selectedMacro = 1
 		MTF.macroBase = 1
@@ -520,7 +525,7 @@ function MT:GetNextIndex()
 	if tab == 3 then
 		index = 1001
 		mstart = 1001
-		mend = 1000 + _G.MAX_ACCOUNT_MACROS
+		mend = 1000 + MT.MAX_EXTRA_MACROS
 	end
 	for m = mstart, mend do
 		local var = (m > _G.MAX_ACCOUNT_MACROS) and "char" or "global"
@@ -718,16 +723,16 @@ function MT:SelOnClick(this)
 end
 
 function MT:MacroFrameUpdate()
-	local numMacros, tab
+	local numMacros
 	local numAccountMacros, numCharacterMacros = GetNumMacros()
 	local macroButtonName, macroButton, macroIcon, macroName, macroUnbound
 	local name, texture, body
-	local selectedName, selectedBody, selectedIcon
 	local tab = PanelTemplates_GetSelectedTab(MTF)
 	local exmacros = {}
 
 	numMacros = (MTF.macroBase == 0) and numAccountMacros or numCharacterMacros
 	if MT.MTCF then if MT.MTCF:IsShown() then tab = 4 end end
+	local maxMacroButtons = max(_G.MAX_ACCOUNT_MACROS, _G.MAX_CHARACTER_MACROS, MT.MAX_EXTRA_MACROS)
 	if tab == 3 then
 		numMacros = MT:CountExtra()
 		for i, exm in pairs(MT.db.global.extra) do table.insert(exmacros, {name = exm.name, texture = exm.texture, body = exm.body, index = i}) end
@@ -736,6 +741,7 @@ function MT:MacroFrameUpdate()
 		if numMacros == _G.MAX_CHARACTER_MACROS then MacroToolkitCopyButton:Disable()
 		else MacroToolkitCopyButton:Enable() end
 	elseif tab == 4 then
+	    maxMacroButtons = _G.MAX_CHARACTER_MACROS
 		numMacros = 0
 		if MT.charcopy then
 			if MacroToolkitDB.char[MT.charcopy].extended then
@@ -759,7 +765,6 @@ function MT:MacroFrameUpdate()
 			table.sort(exmacros, function(a, b) return a.name < b.name end)
 		end
 	end
-	local maxMacroButtons = (tab == 4) and _G.MAX_CHARACTER_MACROS or max(_G.MAX_ACCOUNT_MACROS, _G.MAX_CHARACTER_MACROS)
 	--local fsize = select(2, MacroToolkitButton1Name:GetFont())
 	local font = LSM:Fetch(LSM.MediaType.FONT, MT.db.profile.fonts.mifont)
 	local k1, k2
@@ -888,7 +893,7 @@ function MT:MacroFrameUpdate()
 				if tab == 4 then macroButton.extended = exmacros[i].extended end
 			else
 				macroButton:SetChecked(false)
-				if tab == 3 then macroButton.extra = 1001 end
+				if tab == 3 then macroButton.extra = 1000 + i end
 				macroIcon:SetTexture("")
 				macroName:SetText("")
 				macroUnbound:Hide()
@@ -969,7 +974,7 @@ function MT:ContainerOnLoad(container)
 	container:SetSelectedIndex(1)
 	container.initialized = true
 
-	local maxMacroButtons = (container:GetName() == "MacroToolkitCButtonContainer") and _G.MAX_CHARACTER_MACROS or max(_G.MAX_ACCOUNT_MACROS, _G.MAX_CHARACTER_MACROS)
+	local maxMacroButtons = (container:GetName() == "MacroToolkitCButtonContainer") and _G.MAX_CHARACTER_MACROS or max(_G.MAX_ACCOUNT_MACROS, _G.MAX_CHARACTER_MACROS, MT.MAX_EXTRA_MACROS)
 	local bname = (container:GetName() == "MacroToolkitCButtonContainer") and "MacroToolkitCButton" or "MacroToolkitButton"
 	local OnDragStart = function(button) if not InCombatLockdown() then PickupMacro(MTF.macroBase + button:GetID()) end end
 	local OnClick = function(button, btn) self:MacroButtonOnClick(button, btn) end
@@ -985,7 +990,7 @@ function MT:ContainerOnLoad(container)
 end
 
 function MT:RepositionContainerButtons(container)
-	local maxMacroButtons = (container:GetName() == "MacroToolkitCButtonContainer") and _G.MAX_CHARACTER_MACROS or max(_G.MAX_ACCOUNT_MACROS, _G.MAX_CHARACTER_MACROS)
+	local maxMacroButtons = (container:GetName() == "MacroToolkitCButtonContainer") and _G.MAX_CHARACTER_MACROS or max(_G.MAX_ACCOUNT_MACROS, _G.MAX_CHARACTER_MACROS, MT.MAX_EXTRA_MACROS)
 	local bname = (container:GetName() == "MacroToolkitCButtonContainer") and "MacroToolkitCButton" or "MacroToolkitButton"
 	local buttonWidth = 49
 	local oldButtonsPerRow = container.buttonsPerRow

diff --git a/MacroToolkit/modules/bindingframe.lua b/MacroToolkit/modules/bindingframe.lua
@@ -1,3 +1,4 @@
+--- @class MacroToolkit
 local MT = MacroToolkit
 local MTB
 local GetBindingText, LoadBindings, SetBinding, GetBindingKey = GetBindingText, LoadBindings, SetBinding, GetBindingKey

diff --git a/MacroToolkit/modules/builderframe.lua b/MacroToolkit/modules/builderframe.lua
@@ -1,4 +1,4 @@
---- @type MacroToolkit
+--- @class MacroToolkit
 local MT = MacroToolkit
 local L = MT.L
 local AceGUI = MT.LS("AceGUI-3.0")

diff --git a/MacroToolkit/modules/copyframe.lua b/MacroToolkit/modules/copyframe.lua
@@ -1,4 +1,5 @@
 local _G = _G
+--- @class MacroToolkit
 local MT = MacroToolkit
 local L = MT.L
 local AceGUI = MT.LS("AceGUI-3.0")

diff --git a/MacroToolkit/modules/elvskin.lua b/MacroToolkit/modules/elvskin.lua
@@ -1,5 +1,6 @@
 local _G = _G
 local format, unpack, string = format, unpack, string
+--- @class MacroToolkit
 local MT = MacroToolkit
 MT.skinned = {}
 
@@ -217,7 +218,7 @@ function MT:LoadElvSkin(frame)
 	end
 
 	if frame == MacroToolkitFrame or frame == MacroToolkitCopyFrame or frame == MacroToolkitPopup then
-		for i = 1, _G.MAX_ACCOUNT_MACROS do
+		for i = 1, MT.MAX_EXTRA_MACROS do
 			local b = _G[format("MacroToolkitButton%d", i)]
 			local c = _G[format("MacroToolkitCButton%d", i)]
 			local t = _G[format("MacroToolkitButton%dIcon", i)]

diff --git a/MacroToolkit/modules/initialise.lua b/MacroToolkit/modules/initialise.lua
@@ -1,5 +1,5 @@
 local _G = _G
---- @type MacroToolkit
+--- @class MacroToolkit
 local MT = MacroToolkit
 MT.LS = LibStub
 MT.L = MT.LS("AceLocale-3.0"):GetLocale("MacroToolkit")
@@ -8,6 +8,7 @@ MT.LDB = MT.LS("LibDataBroker-1.1")
 MT.slash = string.sub(_G.SLASH_CAST1, 1, 1)
 MT.click = _G.SLASH_CLICK1
 MT.target = _G.SLASH_TARGET1
+MT.MAX_EXTRA_MACROS = 1000 -- I'd like to see you try to hit this limit :P
 local L = MT.L
 local SendChatMessage, format = SendChatMessage, format
 

diff --git a/MacroToolkit/modules/macrobroker.lua b/MacroToolkit/modules/macrobroker.lua
@@ -2,6 +2,7 @@
 --* Code based on the abandoned addon -- Macro Broker by Tuhljin *
 --****************************************************************
 
+--- @class MacroToolkit
 local MT = MacroToolkit
 local assert, type, strlower, select, strmatch, format, tonumber, strsub, strlen, strtrim = assert, type, strlower, select, strmatch, format, tonumber, strsub, strlen, strtrim
 local ipairs, error, pcall, loadstring, tinsert = ipairs, error, pcall, loadstring, tinsert

diff --git a/MacroToolkit/modules/mainframe.lua b/MacroToolkit/modules/mainframe.lua
@@ -1,4 +1,5 @@
 local _G = _G
+--- @class MacroToolkit
 local MT = MacroToolkit
 local CreateFrame, PlaySound, GameTooltip, GameTooltip_Hide, UnitName = CreateFrame, PlaySound, GameTooltip, GameTooltip_Hide, UnitName
 local UIParent = UIParent
@@ -1087,7 +1088,7 @@ function MT:CreateSecureFrames()
 	end
 
 	--extra macros
-	for b = 1001, 1000 + _G.MAX_ACCOUNT_MACROS do
+	for b = 1001, 1000 + MT.MAX_EXTRA_MACROS do
 		self:CreateSecureActionButton(b)
 	end
 end

diff --git a/MacroToolkit/modules/options.lua b/MacroToolkit/modules/options.lua
@@ -1,4 +1,5 @@
 local _G = _G
+--- @class MacroToolkit
 local MT = MacroToolkit
 local AceConfig = MT.LS("AceConfig-3.0")
 local AceConfigDialog = MT.LS("AceConfigDialog-3.0")

diff --git a/MacroToolkit/modules/parser.lua b/MacroToolkit/modules/parser.lua
@@ -1,3 +1,4 @@
+--- @class MacroToolkit
 local MT = MacroToolkit
 local string, table, ipairs, pairs, type, math = string, table, ipairs, pairs, type, math
 local strsplit, select, wipe, tonumber = strsplit, select, wipe, tonumber

diff --git a/MacroToolkit/modules/popupframe.lua b/MacroToolkit/modules/popupframe.lua
@@ -1,3 +1,4 @@
+--- @class MacroToolkit
 local MT = MacroToolkit
 local mtpf
 local L = MT.L

diff --git a/MacroToolkit/modules/restoreframe.lua b/MacroToolkit/modules/restoreframe.lua
@@ -1,3 +1,4 @@
+--- @class MacroToolkit
 local MT = MacroToolkit
 local L = MT.L
 local AceGUI = MT.LS("AceGUI-3.0")

diff --git a/MacroToolkit/modules/scriptframe.lua b/MacroToolkit/modules/scriptframe.lua
@@ -1,3 +1,4 @@
+--- @class MacroToolkit
 local MT = MacroToolkit
 local L = MT.L
 local string, format = string, format

diff --git a/MacroToolkit/modules/shareframe.lua b/MacroToolkit/modules/shareframe.lua
@@ -1,3 +1,4 @@
+--- @class MacroToolkit
 local MT = MacroToolkit
 local L = MT.L
 local string, format, strsplit = string, format, strsplit

diff --git a/MacroToolkit/modules/showtooltipMock.lua b/MacroToolkit/modules/showtooltipMock.lua
@@ -1,3 +1,4 @@
+--- @class MacroToolkit
 local MT = MacroToolkit
 
 -- copied the update timing concept from SecureStateDriverManager