From 3e24f8a758665f1bd5156e2a4bf2a2864d02a7f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20H=C3=BCskes?= Date: Thu, 6 Oct 2022 12:34:46 +0200 Subject: [PATCH] Use new Settingssystem in Dragonflight --- Libs/zzLDB/zzLDB.lua | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/Libs/zzLDB/zzLDB.lua b/Libs/zzLDB/zzLDB.lua index 0dbbc16..5d00302 100755 --- a/Libs/zzLDB/zzLDB.lua +++ b/Libs/zzLDB/zzLDB.lua @@ -1,4 +1,4 @@ -local lib = LibStub:NewLibrary("zzLDB", 4) +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") @@ -22,11 +22,19 @@ function lib:DefaultOnClick(_, button, addon, childName) end end else - if(InterfaceOptionsFrame:IsVisible() and not InCombatLockdown()) then - InterfaceOptionsFrame:Hide() + if(not InCombatLockdown()) then + if(SettingsPanel and SettingsPanel.CloseButton:IsVisible()) then + SettingsPanel:Hide() + elseif(InterfaceOptionsFrame and InterfaceOptionsFrame:IsVisible()) then + InterfaceOptionsFrame:Hide() + end else - InterfaceOptionsFrame_OpenToCategory(childName) - InterfaceOptionsFrame_OpenToCategory(childName) -- Twice because of a bug in InterfaceOptionsFrame_OpenToCategory + if(Settings.OpenToCategory) then + Settings.OpenToCategory(childName) + else + InterfaceOptionsFrame_OpenToCategory(childName) + InterfaceOptionsFrame_OpenToCategory(childName) -- Twice because of a bug in InterfaceOptionsFrame_OpenToCategory + end end end end