From 685b06193aa075986135d18d42bd1005e59adffb Mon Sep 17 00:00:00 2001 From: Tercio Jose Date: Sun, 4 Sep 2022 14:12:21 -0300 Subject: [PATCH] Framework update --- Libs/DF/colors.lua | 1 + Libs/DF/fw.lua | 39 ++++++++++++++++++++++++++++++++++----- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/Libs/DF/colors.lua b/Libs/DF/colors.lua index ccde379e..c434481b 100644 --- a/Libs/DF/colors.lua +++ b/Libs/DF/colors.lua @@ -21,6 +21,7 @@ do ["DEATHKNIGHT"] = {0.77, 0.12, 0.23}, ["MONK"] = {0.0, 1.00, 0.59}, ["DEMONHUNTER"] = {0.64, 0.19, 0.79}, + ["EVOKER"] = {0.20, 0.58, 0.50}, ["aliceblue"] = {0.941176, 0.972549, 1, 1}, ["antiquewhite"] = {0.980392, 0.921569, 0.843137, 1}, diff --git a/Libs/DF/fw.lua b/Libs/DF/fw.lua index 107ad038..05b637ae 100644 --- a/Libs/DF/fw.lua +++ b/Libs/DF/fw.lua @@ -1,6 +1,6 @@ -local dversion = 345 +local dversion = 347 local major, minor = "DetailsFramework-1.0", dversion local DF, oldminor = LibStub:NewLibrary (major, minor) @@ -2833,11 +2833,29 @@ end function DF:OpenInterfaceProfile() -- OptionsFrame1/2 should be registered if created with DF:CreateAddOn, so open to them directly if self.OptionsFrame1 then - InterfaceOptionsFrame_OpenToCategory (self.OptionsFrame1) - if self.OptionsFrame2 then - InterfaceOptionsFrame_OpenToCategory (self.OptionsFrame2) + if SettingsPanel then + --SettingsPanel:OpenToCategory(self.OptionsFrame1.name) + local category = SettingsPanel:GetCategoryList():GetCategory(self.OptionsFrame1.name) + if category then + SettingsPanel:Open() + SettingsPanel:SelectCategory(category) + if self.OptionsFrame2 and category:HasSubcategories() then + for _, subcategory in pairs(category:GetSubcategories()) do + if subcategory:GetName() == self.OptionsFrame2.name then + SettingsPanel:SelectCategory(subcategory) + break + end + end + end + end + return + elseif InterfaceOptionsFrame_OpenToCategory then + InterfaceOptionsFrame_OpenToCategory (self.OptionsFrame1) + if self.OptionsFrame2 then + InterfaceOptionsFrame_OpenToCategory (self.OptionsFrame2) + end + return end - return end -- fallback (broken as of ElvUI Skins in version 12.18+... maybe fix/change will come) @@ -3877,6 +3895,7 @@ local specs_per_class = { ["WARLOCK"] = {265, 266, 267}, ["PALADIN"] = {65, 66, 70}, ["MONK"] = {268, 269, 270}, + ["EVOKER"] = {1467, 1468}, } function DF:GetClassSpecIDs (class) @@ -3976,6 +3995,7 @@ DF.ClassIndexToFileName = { [11] = "DRUID", [10] = "MONK", [2] = "PALADIN", + [13] = "EVOKER", } @@ -3992,6 +4012,7 @@ DF.ClassFileNameToIndex = { ["DRUID"] = 11, ["MONK"] = 10, ["PALADIN"] = 2, + ["EVOKER"] = 13, } DF.ClassCache = {} @@ -4313,6 +4334,10 @@ DF.ClassSpecs = { [269] = true, [270] = true, }, + ["EVOKER"] = { + [1467] = true, + [1468] = true, + }, } DF.SpecListByClass = { @@ -4376,6 +4401,10 @@ DF.SpecListByClass = { 269, 270, }, + ["EVOKER"] = { + 1467, + 1468, + }, } --given a class and a specId, return if the specId is a spec from the class passed