Skip to content

Commit 67d1b5b

Browse files
committed
Update TOC and libs
1 parent 4789edb commit 67d1b5b

File tree

4 files changed

+52
-12
lines changed

4 files changed

+52
-12
lines changed

DevTool.toc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Interface: 11506, 40401, 110007
1+
## Interface: 11506, 40402, 110100
22
## Title: DevTool
33
## Notes: A multipurpose tool to assist with addon development
44
## IconTexture: Interface\Icons\inv_misc_gear_08

Libs/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
--- AceConfigDialog-3.0 generates AceGUI-3.0 based windows based on option tables.
22
-- @class file
33
-- @name AceConfigDialog-3.0
4-
-- @release $Id: AceConfigDialog-3.0.lua 1296 2022-11-04 18:50:10Z nevcairiel $
4+
-- @release $Id: AceConfigDialog-3.0.lua 1351 2024-07-24 18:23:24Z funkehdude $
55

66
local LibStub = LibStub
77
local gui = LibStub("AceGUI-3.0")
88
local reg = LibStub("AceConfigRegistry-3.0")
99

10-
local MAJOR, MINOR = "AceConfigDialog-3.0", 86
10+
local MAJOR, MINOR = "AceConfigDialog-3.0", 87
1111
local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
1212

1313
if not AceConfigDialog then return end
@@ -544,6 +544,7 @@ local function GetFuncName(option)
544544
end
545545
end
546546
do
547+
local InCombatLockdown = InCombatLockdown
547548
local frame = AceConfigDialog.popup
548549
if not frame or oldminor < 81 then
549550
frame = CreateFrame("Frame", nil, UIParent)
@@ -556,13 +557,15 @@ do
556557
frame:SetFrameLevel(100) -- Lots of room to draw under it
557558
frame:SetScript("OnKeyDown", function(self, key)
558559
if key == "ESCAPE" then
559-
self:SetPropagateKeyboardInput(false)
560+
if not InCombatLockdown() then
561+
self:SetPropagateKeyboardInput(false)
562+
end
560563
if self.cancel:IsShown() then
561564
self.cancel:Click()
562565
else -- Showing a validation error
563566
self:Hide()
564567
end
565-
else
568+
elseif not InCombatLockdown() then
566569
self:SetPropagateKeyboardInput(true)
567570
end
568571
end)

Libs/AceDB-3.0/AceDB-3.0.lua

Lines changed: 39 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
-- end
4141
-- @class file
4242
-- @name AceDB-3.0.lua
43-
-- @release $Id: AceDB-3.0.lua 1328 2024-03-20 22:36:27Z nevcairiel $
44-
local ACEDB_MAJOR, ACEDB_MINOR = "AceDB-3.0", 29
43+
-- @release $Id: AceDB-3.0.lua 1353 2024-08-27 13:37:35Z nevcairiel $
44+
local ACEDB_MAJOR, ACEDB_MINOR = "AceDB-3.0", 30
4545
local AceDB = LibStub:NewLibrary(ACEDB_MAJOR, ACEDB_MINOR)
4646

4747
if not AceDB then return end -- No upgrade needed
@@ -525,6 +525,17 @@ function DBObjectLib:DeleteProfile(name, silent)
525525
end
526526
end
527527

528+
-- remove from unloaded namespaces
529+
if self.sv.namespaces then
530+
for nsname, data in pairs(self.sv.namespaces) do
531+
if self.children and self.children[nsname] then
532+
-- already a mapped namespace
533+
elseif data.profiles then
534+
data.profiles[name] = nil
535+
end
536+
end
537+
end
538+
528539
-- switch all characters that use this profile back to the default
529540
if self.sv.profileKeys then
530541
for key, profile in pairs(self.sv.profileKeys) do
@@ -570,6 +581,20 @@ function DBObjectLib:CopyProfile(name, silent)
570581
end
571582
end
572583

584+
-- copy unloaded namespaces
585+
if self.sv.namespaces then
586+
for nsname, data in pairs(self.sv.namespaces) do
587+
if self.children and self.children[nsname] then
588+
-- already a mapped namespace
589+
elseif data.profiles then
590+
-- reset the current profile
591+
data.profiles[self.keys.profile] = {}
592+
-- copy data
593+
copyTable(data.profiles[name], data.profiles[self.keys.profile])
594+
end
595+
end
596+
end
597+
573598
-- Callback: OnProfileCopied, database, sourceProfileKey
574599
self.callbacks:Fire("OnProfileCopied", self, name)
575600
end
@@ -596,6 +621,18 @@ function DBObjectLib:ResetProfile(noChildren, noCallbacks)
596621
end
597622
end
598623

624+
-- reset unloaded namespaces
625+
if self.sv.namespaces and not noChildren then
626+
for nsname, data in pairs(self.sv.namespaces) do
627+
if self.children and self.children[nsname] then
628+
-- already a mapped namespace
629+
elseif data.profiles then
630+
-- reset the current profile
631+
data.profiles[self.keys.profile] = nil
632+
end
633+
end
634+
end
635+
599636
-- Callback: OnProfileReset, database
600637
if not noCallbacks then
601638
self.callbacks:Fire("OnProfileReset", self)

Libs/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
TreeGroup Container
33
Container that uses a tree control to switch between groups.
44
-------------------------------------------------------------------------------]]
5-
local Type, Version = "TreeGroup", 47
5+
local Type, Version = "TreeGroup", 48
66
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
77
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
88

@@ -387,10 +387,6 @@ local methods = {
387387
["RefreshTree"] = function(self,scrollToSelection,fromOnUpdate)
388388
local buttons = self.buttons
389389
local lines = self.lines
390-
391-
for i, v in ipairs(buttons) do
392-
v:Hide()
393-
end
394390
while lines[1] do
395391
local t = tremove(lines)
396392
for k in pairs(t) do
@@ -499,6 +495,10 @@ local methods = {
499495
buttonnum = buttonnum + 1
500496
end
501497

498+
-- We hide the remaining buttons after updating others to avoid a blizzard bug that keeps them interactable even if hidden when hidden before updating the buttons.
499+
for i = buttonnum, #buttons do
500+
buttons[i]:Hide()
501+
end
502502
end,
503503

504504
["SetSelected"] = function(self, value)

0 commit comments

Comments
 (0)