9 changed files with 45 additions and 104 deletions
--- a/Libs/CallbackHandler-1.0/CallbackHandler-1.0.lua
+++ b/Libs/CallbackHandler-1.0/CallbackHandler-1.0.lua
@ -1,5 +1,5 @@
--[[ $Id: CallbackHandler-1.0.lua 26 2022-12-12 15:09:39Z nevcairiel $ ]]
-local MAJOR, MINOR = "CallbackHandler-1.0", 8
+--[[ $Id: CallbackHandler-1.0.lua 1284 2022-09-25 09:15:30Z nevcairiel $ ]]
+local MAJOR, MINOR = "CallbackHandler-1.0", 7
 local CallbackHandler = LibStub:NewLibrary(MAJOR, MINOR)

 if not CallbackHandler then return end -- No upgrade needed
@ -7,16 +7,21 @@ if not CallbackHandler then return end -- No upgrade needed
 local meta = {__index = function(tbl, key) tbl[key] = {} return tbl[key] end}

 -- Lua APIs
-local securecallfunction, error = securecallfunction, error
+local error = error
 local setmetatable, rawget = setmetatable, rawget
 local next, select, pairs, type, tostring = next, select, pairs, type, tostring

+local xpcall = xpcall
+
+local function errorhandler(err)
+	return geterrorhandler()(err)
+end

 local function Dispatch(handlers, ...)
 	local index, method = next(handlers)
 	if not method then return end
 	repeat
-		securecallfunction(method, ...)
+		xpcall(method, errorhandler, ...)
 		index, method = next(handlers, index)
 	until not method
 end
--- a/Libs/LibDBIcon-1.0/LibDBIcon-1.0.lua
+++ b/Libs/LibDBIcon-1.0/LibDBIcon-1.0.lua
@ -1,4 +1,4 @@
--@curseforge-project-slug: libdbicon-1-0@
+
 -----------------------------------------------------------------------
 -- LibDBIcon-1.0
 --
@ -6,7 +6,7 @@
 --

 local DBICON10 = "LibDBIcon-1.0"
-local DBICON10_MINOR = 45 -- Bump on changes
+local DBICON10_MINOR = 44 -- Bump on changes
 if not LibStub then error(DBICON10 .. " requires LibStub.") end
 local ldb = LibStub("LibDataBroker-1.1", true)
 if not ldb then error(DBICON10 .. " requires LibDataBroker-1.1.") end
@ -218,49 +218,37 @@ local function createButton(name, object, db)
 	button.dataObject = object
 	button.db = db
 	button:SetFrameStrata("MEDIUM")
-	button:SetFixedFrameStrata(true)
+	if button.SetFixedFrameStrata then -- Classic support
+		button:SetFixedFrameStrata(true)
+	end
 	button:SetFrameLevel(8)
-	button:SetFixedFrameLevel(true)
+	if button.SetFixedFrameLevel then -- Classic support
+		button:SetFixedFrameLevel(true)
+	end
 	button:SetSize(31, 31)
 	button:RegisterForClicks("anyUp")
 	button:RegisterForDrag("LeftButton")
 	button:SetHighlightTexture(136477) --"Interface\\Minimap\\UI-Minimap-ZoomButton-Highlight"
-	if WOW_PROJECT_ID == WOW_PROJECT_MAINLINE then
-		local overlay = button:CreateTexture(nil, "OVERLAY")
-		overlay:SetSize(50, 50)
-		overlay:SetTexture(136430) --"Interface\\Minimap\\MiniMap-TrackingBorder"
-		overlay:SetPoint("TOPLEFT", button, "TOPLEFT", 0, 0)
-		local background = button:CreateTexture(nil, "BACKGROUND")
-		background:SetSize(24, 24)
-		background:SetTexture(136467) --"Interface\\Minimap\\UI-Minimap-Background"
-		background:SetPoint("CENTER", button, "CENTER", 0, 1)
-		local icon = button:CreateTexture(nil, "ARTWORK")
-		icon:SetSize(18, 18)
-		icon:SetTexture(object.icon)
-		icon:SetPoint("CENTER", button, "CENTER", 0, 1)
-		button.icon = icon
-	else
-		local overlay = button:CreateTexture(nil, "OVERLAY")
-		overlay:SetSize(53, 53)
-		overlay:SetTexture(136430) --"Interface\\Minimap\\MiniMap-TrackingBorder"
-		overlay:SetPoint("TOPLEFT")
-		local background = button:CreateTexture(nil, "BACKGROUND")
-		background:SetSize(20, 20)
-		background:SetTexture(136467) --"Interface\\Minimap\\UI-Minimap-Background"
-		background:SetPoint("TOPLEFT", 7, -5)
-		local icon = button:CreateTexture(nil, "ARTWORK")
-		icon:SetSize(17, 17)
-		icon:SetTexture(object.icon)
-		icon:SetPoint("TOPLEFT", 7, -6)
-		button.icon = icon
-	end
-
+	local overlay = button:CreateTexture(nil, "OVERLAY")
+	overlay:SetSize(53, 53)
+	overlay:SetTexture(136430) --"Interface\\Minimap\\MiniMap-TrackingBorder"
+	overlay:SetPoint("TOPLEFT")
+	local background = button:CreateTexture(nil, "BACKGROUND")
+	background:SetSize(20, 20)
+	background:SetTexture(136467) --"Interface\\Minimap\\UI-Minimap-Background"
+	background:SetPoint("TOPLEFT", 7, -5)
+	local icon = button:CreateTexture(nil, "ARTWORK")
+	icon:SetSize(17, 17)
+	icon:SetTexture(object.icon)
+	icon:SetPoint("TOPLEFT", 7, -6)
+	button.icon = icon
 	button.isMouseDown = false
-	local r, g, b = button.icon:GetVertexColor()
-	button.icon:SetVertexColor(object.iconR or r, object.iconG or g, object.iconB or b)

-	button.icon.UpdateCoord = updateCoord
-	button.icon:UpdateCoord()
+	local r, g, b = icon:GetVertexColor()
+	icon:SetVertexColor(object.iconR or r, object.iconG or g, object.iconB or b)
+
+	icon.UpdateCoord = updateCoord
+	icon:UpdateCoord()

 	button:SetScript("OnEnter", onEnter)
 	button:SetScript("OnLeave", onLeave)
--- a/Libs/zzAddOn/zzAddOn.lua
+++ b/Libs/zzAddOn/zzAddOn.lua
@ -1,14 +1,13 @@
-local lib = LibStub:NewLibrary("zzAddOn", 12)
+local lib = LibStub:NewLibrary("zzAddOn", 10)
 if not lib then return end
 local config = LibStub:GetLibrary("zzConfig")
 lib['callbacks'] = lib['callbacks'] or LibStub:GetLibrary("CallbackHandler-1.0"):New(lib)
 lib['addons'] = lib['addons'] or {}
-lib['managerframe'] = lib['managerframe'] or CreateFrame("FRAME")
 lib['events'] = lib['events'] or CreateFrame("FRAME")
 local function errormsg(err)
 	print(format("|cffff0000Error:|r %s",err))
 end
-local mixins = {'NewAddOn', 'GetAddOn', 'AddChild', 'HasChild', 'IsChild', 'HasParent', 'GetParent', 'GetOptions', 'RegisterEvent','UnregisterEvent','IsClassic','IsBCC','IsRetail', 'GetSpecs', 'Fire', 'RegisterOpen', 'RegisterClose'}
+local mixins = {'NewAddOn', 'GetAddOn', 'AddChild', 'HasChild', 'IsChild', 'HasParent', 'GetParent', 'GetOptions', 'RegisterEvent','UnregisterEvent','IsClassic','IsBCC','IsRetail', 'GetSpecs', 'Fire'}
 function lib:Fire(...)
 	lib['callbacks']:Fire(...)
 end
@ -104,44 +103,6 @@ end
 function lib:IsRetail()
 	return WOW_PROJECT_ID == WOW_PROJECT_MAINLINE
 end
-local function handleManagerFrame(self, event, num)
-	if(event == "PLAYER_INTERACTION_MANAGER_FRAME_SHOW") then
-		lib['callbacks']:Fire(format("show-%i", num))
-	else
-		lib['callbacks']:Fire(format("hide-%i", num))
-	end
-end
-local function addManagerFrame(self, mode, num, globalfunc)
-	if(type(num) == 'table') then
-		for k, v in pairs(num) do
-			local n = k
-			local func = v
-			if(type(v) == 'number') then
-				n = v
-				func = globalfunc
-			end
-			addManagerFrame(self, mode, n, func)
-		end
-	elseif(type(num) == 'number') then
-		lib.RegisterCallback(self, format("%s-%i", mode, num), globalfunc)
-	end
-end
-function lib:RegisterOpen(num, func)
-	if(not num) then return end
-	if(not lib['managerframe']:IsEventRegistered("PLAYER_INTERACTION_MANAGER_FRAME_SHOW")) then
-		lib['managerframe']:RegisterEvent("PLAYER_INTERACTION_MANAGER_FRAME_SHOW")
-		lib['managerframe']:SetScript("OnEvent", handleManagerFrame)
-	end
-	addManagerFrame(self, 'show', num, func)
-end
-function lib:RegisterClose(num, func)
-	if(not num) then return end
-	if(not lib['managerframe']:IsEventRegistered("PLAYER_INTERACTION_MANAGER_FRAME_HIDE")) then
-		lib['managerframe']:RegisterEvent("PLAYER_INTERACTION_MANAGER_FRAME_HIDE")
-		lib['managerframe']:SetScript("OnEvent", handleManagerFrame)
-	end
-	addManagerFrame(self, 'hide', num, func)
-end
 function lib:NewAddOn(addonName, addonTable)
 	local specs = self['specs']
 	local childName = specs['name']
--- a/Libs/zzHelper/zzHelper.lua
+++ b/Libs/zzHelper/zzHelper.lua
@ -1,4 +1,4 @@
-local lib = LibStub:NewLibrary("zzHelper", 4)
+local lib = LibStub:NewLibrary("zzHelper", 3)
 if not lib then return end
 lib['targets'] = lib['targets'] or {}
 local mixins = {'colorize', 'round', 'sortArray', 'IsTwink', 'classcolor', 'MoneyString', 'MoneyStringSetString', 'MoneyStringSetSize'}
@ -34,7 +34,7 @@ function lib:MoneyStringSetSize(size)
 		iconSize = size
 	end
 end
-function lib:MoneyString(money, color, abrevK, abrevM, noicon, noiconcolor, size, seperate)
+function lib:MoneyString(money, color, abrevK, abrevM, noicon, noiconcolor, size)
 	local iconSize =  size or iconSize
 	local goldicon = noicon and (noiconcolor and moneyText['goldColor'] or moneyText['gold']) or format(iconbase, 'Gold', iconSize, iconSize)
 	local silvericon = noicon and (noiconcolor and moneyText['silverColor'] or moneyText['silver']) or format(iconbase, 'Silver', iconSize, iconSize)
@ -66,9 +66,6 @@ function lib:MoneyString(money, color, abrevK, abrevM, noicon, noiconcolor, size
 	end
 	if(money > 0) then
 		if(g>0) then
-			if(seperate) then
-				g = BreakUpLargeNumbers(g)
-			end
 			moneystring = format("%s%s%s", color and lib:colorize(g, neg and "ff0000" or "44dd44") or g,abrev, goldicon)
 		end
 		if(s>0) then
--- a/Libs/zzLDB/zzLDB.lua
+++ b/Libs/zzLDB/zzLDB.lua
@ -1,4 +1,4 @@
-local lib = LibStub:NewLibrary("zzLDB", 6)
+local lib = LibStub:NewLibrary("zzLDB", 5)
 if not lib then return end
 local ldb = LibStub:GetLibrary("LibDataBroker-1.1")
 local ldbicon = LibStub:GetLibrary("LibDBIcon-1.0")
@ -25,8 +25,7 @@ function lib:DefaultOnClick(_, button, addon, childName)
 		if(not InCombatLockdown()) then
 			if(SettingsPanel) then
 				if(SettingsPanel:IsVisible()) then
-					HideUIPanel(SettingsPanel)
-					HideUIPanel(GameMenuFrame)
+					SettingsPanel:Hide()
 				else
 					Settings.OpenToCategory(childName)
 				end
--- a/broker.lua
+++ b/broker.lua
@ -8,7 +8,6 @@ local function bclick(swap)
 	if(not InCombatLockdown() and GarrisonLandingPage) then
 		if(GarrisonLandingPage:IsShown()) then
 			GarrisonLandingPage_Toggle()
-			GameMenuFrame:Hide()
 			if(not swap) then
 				return
 			end
@ -20,7 +19,6 @@ local function bclick(swap)
 			if(not GarrisonLandingPage.garrTypeID) then
 --				print("still no garrType")
 					GarrisonLandingPage_Toggle()
-					GameMenuFrame:Hide()
 					return
 			end
 		end
@ -76,8 +74,7 @@ local function OnClick(_, button)
 		if(not InCombatLockdown()) then
 			if(SettingsPanel) then
 				if(SettingsPanel:IsVisible()) then
-					HideUIPanel(SettingsPanel)
-					HideUIPanel(GameMenuFrame)
+					SettingsPanel:Hide()
 				else
 					Settings.OpenToCategory(childName)
 				end
@ -90,8 +87,6 @@ local function OnClick(_, button)
 				end
 			end
 		end
-	else
-		ExpansionLandingPageMinimapButton:Click()
 	end
 end
 local function tooltipsort(a, b)
@ -166,7 +161,6 @@ local function OnTooltipShow(tip)
 		tip:AddLine(L["No garrison found!"])
 	end
 	tip:AddLine(child:colorize(L["SHIFT LEFTCLICK toggles Garrison"], "00ff00"))
-	tip:AddLine(child:colorize(L["WHEEL toggles Dragonflight Info"], "00ff00"))
 	tip:AddLine(child:colorize(L["Press SHIFT for other characters info"], "00ff00"))
 end
 child['ldb'] = { -- https://github.com/tekkub/libdatabroker-1-1/wiki/Data-Specifications
--- a/core.lua
+++ b/core.lua
@ -95,10 +95,9 @@ function events:PLAYER_ENTERING_WORLD()
 	if(not IsAddOnLoaded("Blizzard_GarrisonUI")) then
 		UIParentLoadAddOn("Blizzard_GarrisonUI")
 	end
-	if(db['hideStandard'] and ExpansionLandingPageMinimapButton) then
-		ExpansionLandingPageMinimapButton:UnregisterAllEvents()
-		ExpansionLandingPageMinimapButton:Hide()
-		ExpansionLandingPageMinimapButton:HookScript("OnShow", ExpansionLandingPageMinimapButton.Hide)
+	if(db['hideStandard'] and GarrisonLandingPageMinimapButton) then
+		GarrisonLandingPageMinimapButton:UnregisterAllEvents()
+		GarrisonLandingPageMinimapButton:Hide()
 	end
 	child:switchDisplay(db['garrisonHideCombat'])
 end
--- a/locale_deDE.lua
+++ b/locale_deDE.lua
@ -15,5 +15,4 @@ if L then
 	L["Hide Blizzards default garrison button"] = "Versteckt den Garnisonsknopf an der Minimap"
 	L["Display Text"] = "Anzeigetext"
 	L["Display Text description"] = "Text, der neben dem Icon angezeigt wird."
-	L["WHEEL toggles Dragonflight Info"] = "MAUSRAD wechselt Zusammenfassung der Dracheninseln"
 end
--- a/locale_enUS.lua
+++ b/locale_enUS.lua
@ -14,6 +14,5 @@ if L then
 	L["Hide Blizzard"] = true
 	L["Hide Blizzards default garrison button"] = true
 	L["Display Text"] = true
-	L["WHEEL toggles Dragonflight Info"] = true
 	L["Display Text description"] = "Default text displayed next to icon"
 end