Skip to content

Commit 4eb9ee0

Browse files
committed
Fix "Open Options" button in Auctionator tab
1 parent 44b526b commit 4eb9ee0

File tree

4 files changed

+9
-19
lines changed

4 files changed

+9
-19
lines changed

Source/Config/InitializeFrames.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ function Auctionator.Config.InternalInitializeFrames(templateNames)
33
CreateFrame(
44
"FRAME",
55
"AuctionatorConfig" .. name .. "Frame",
6-
SettingsPanel or InterfaceOptionsFrame,
6+
SettingsPanel,
77
"AuctionatorConfig" .. name .. "FrameTemplate")
88
end
99
end

Source/Config/Mixins/Configuration.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ function AuctionatorConfigFrameMixin:OnLoad()
44
Auctionator.Debug.Message("AuctionatorConfigFrameMixin:OnLoad()")
55

66
self.name = "Auctionator"
7-
self:SetParent(SettingsPanel or InterfaceOptionsFrame)
7+
self:SetParent(SettingsPanel)
88

99
self:SetupPanel()
1010
end

Source/Config/Mixins/PanelConfig.lua

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,13 @@ function AuctionatorPanelConfigMixin:SetupPanel()
1717
self.OnDefault = function() end
1818
self.OnRefresh = function() end
1919

20-
if Settings and SettingsPanel then
21-
if self.parent == nil then
22-
local category = Settings.RegisterCanvasLayoutCategory(self, self.name)
23-
category.ID = self.name
24-
Settings.RegisterAddOnCategory(category)
25-
else
26-
local category = Settings.GetCategory(self.parent)
27-
local subcategory = Settings.RegisterCanvasLayoutSubcategory(category, self, self.name)
28-
Settings.RegisterAddOnCategory(subcategory)
29-
end
20+
if self.parent == nil then
21+
local category = Settings.RegisterCanvasLayoutCategory(self, self.name)
22+
Settings.RegisterAddOnCategory(category)
23+
Auctionator.State.OptionsCategory = category
3024
else
31-
InterfaceOptions_AddCategory(self, "Auctionator")
25+
local subcategory = Settings.RegisterCanvasLayoutSubcategory(Auctionator.State.OptionsCategory, self, self.name)
26+
Settings.RegisterAddOnCategory(subcategory)
3227
end
3328
end
3429

Source/Tabs/Auctionator/Mixins/Main.lua

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,5 @@ function AuctionatorConfigTabMixin:OnLoad()
1414
end
1515

1616
function AuctionatorConfigTabMixin:OpenOptions()
17-
if Settings and SettingsPanel then
18-
Settings.OpenToCategory(AUCTIONATOR_L_AUCTIONATOR)
19-
else
20-
InterfaceOptionsFrame:Show()
21-
InterfaceOptionsFrame_OpenToCategory(AUCTIONATOR_L_CONFIG_BASIC_OPTIONS_CATEGORY)
22-
end
17+
Settings.OpenToCategory(Auctionator.State.OptionsCategory:GetID())
2318
end

0 commit comments

Comments
 (0)