Skip to content

Commit

Permalink
Update Ace3 Release - Revision r1252 (May 17th, 2021)
Browse files Browse the repository at this point in the history
  • Loading branch information
Ludovicus-Maior committed May 18, 2021
1 parent fb947fe commit cfc0826
Show file tree
Hide file tree
Showing 7 changed files with 55 additions and 70 deletions.
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
--- AceConfigDialog-3.0 generates AceGUI-3.0 based windows based on option tables.
-- @class file
-- @name AceConfigDialog-3.0
-- @release $Id: AceConfigDialog-3.0.lua 1232 2020-04-14 22:21:22Z nevcairiel $
-- @release $Id: AceConfigDialog-3.0.lua 1248 2021-02-05 14:27:49Z funkehdude $

local LibStub = LibStub
local gui = LibStub("AceGUI-3.0")
local reg = LibStub("AceConfigRegistry-3.0")

local MAJOR, MINOR = "AceConfigDialog-3.0", 79
local MAJOR, MINOR = "AceConfigDialog-3.0", 81
local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR)

if not AceConfigDialog then return end
Expand All @@ -22,10 +22,10 @@ AceConfigDialog.frame.closing = AceConfigDialog.frame.closing or {}
AceConfigDialog.frame.closeAllOverride = AceConfigDialog.frame.closeAllOverride or {}

-- Lua APIs
local tinsert, tsort, tremove = table.insert, table.sort, table.remove
local tinsert, tsort, tremove, wipe = table.insert, table.sort, table.remove, table.wipe
local strmatch, format = string.match, string.format
local error = error
local pairs, next, select, type, unpack, wipe, ipairs = pairs, next, select, type, unpack, wipe, ipairs
local pairs, next, select, type, unpack, ipairs = pairs, next, select, type, unpack, ipairs
local tostring, tonumber = tostring, tonumber
local math_min, math_max, math_floor = math.min, math.max, math.floor

Expand Down Expand Up @@ -544,13 +544,15 @@ local function GetFuncName(option)
end
do
local frame = AceConfigDialog.popup
if not frame then
if not frame or oldminor < 81 then
frame = CreateFrame("Frame", nil, UIParent)
AceConfigDialog.popup = frame
frame:Hide()
frame:SetPoint("CENTER", UIParent, "CENTER")
frame:SetSize(320, 72)
frame:EnableMouse(true) -- Do not allow click-through on the frame
frame:SetFrameStrata("TOOLTIP")
frame:SetFrameLevel(100) -- Lots of room to draw under it
frame:SetScript("OnKeyDown", function(self, key)
if key == "ESCAPE" then
self:SetPropagateKeyboardInput(false)
Expand All @@ -564,7 +566,7 @@ do
end
end)

if WOW_PROJECT_ID == WOW_PROJECT_CLASSIC then
if not frame.SetFixedFrameStrata then -- API capability check (classic check)
frame:SetBackdrop({
bgFile = [[Interface\DialogFrame\UI-DialogBox-Background-Dark]],
edgeFile = [[Interface\DialogFrame\UI-DialogBox-Border]],
Expand All @@ -574,8 +576,10 @@ do
insets = { left = 11, right = 11, top = 11, bottom = 11 },
})
else
local border = CreateFrame("Frame", nil, frame, "DialogBorderDarkTemplate")
local border = CreateFrame("Frame", nil, frame, "DialogBorderOpaqueTemplate")
border:SetAllPoints(frame)
frame:SetFixedFrameStrata(true)
frame:SetFixedFrameLevel(true)
end

local text = frame:CreateFontString(nil, "ARTWORK", "GameFontHighlight")
Expand Down
4 changes: 2 additions & 2 deletions WoWPro/Libraries/AceGUI-3.0/AceGUI-3.0.lua
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
-- f:AddChild(btn)
-- @class file
-- @name AceGUI-3.0
-- @release $Id: AceGUI-3.0.lua 1231 2020-04-14 22:20:36Z nevcairiel $
-- @release $Id: AceGUI-3.0.lua 1247 2021-01-23 23:16:39Z funkehdude $
local ACEGUI_MAJOR, ACEGUI_MINOR = "AceGUI-3.0", 41
local AceGUI, oldminor = LibStub:NewLibrary(ACEGUI_MAJOR, ACEGUI_MINOR)

if not AceGUI then return end -- No upgrade needed

-- Lua APIs
local tinsert = table.insert
local tinsert, wipe = table.insert, table.wipe
local select, pairs, next, type = select, pairs, next, type
local error, assert = error, assert
local setmetatable, rawget = setmetatable, rawget
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
BlizOptionsGroup Container
Simple container widget for the integration of AceGUI into the Blizzard Interface Options
-------------------------------------------------------------------------------]]
local Type, Version = "BlizOptionsGroup", 21
local Type, Version = "BlizOptionsGroup", 22
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end

Expand Down Expand Up @@ -99,7 +99,7 @@ local methods = {
Constructor
-------------------------------------------------------------------------------]]
local function Constructor()
local frame = CreateFrame("Frame")
local frame = CreateFrame("Frame", nil, InterfaceOptionsFramePanelContainer)
frame:Hide()

-- support functions for the Blizzard Interface Options
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
--[[-----------------------------------------------------------------------------
Frame Container
-------------------------------------------------------------------------------]]
local Type, Version = "Frame", 27
local Type, Version = "Frame", 28
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end

Expand Down Expand Up @@ -83,6 +83,7 @@ local methods = {
["OnAcquire"] = function(self)
self.frame:SetParent(UIParent)
self.frame:SetFrameStrata("FULLSCREEN_DIALOG")
self.frame:SetFrameLevel(100) -- Lots of room to draw under it
self:SetTitle()
self:SetStatusText()
self:ApplyStatus()
Expand Down Expand Up @@ -186,6 +187,7 @@ local function Constructor()
frame:SetMovable(true)
frame:SetResizable(true)
frame:SetFrameStrata("FULLSCREEN_DIALOG")
frame:SetFrameLevel(100) -- Lots of room to draw under it
frame:SetBackdrop(FrameBackdrop)
frame:SetBackdropColor(0, 0, 0, 1)
frame:SetMinResize(400, 200)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end

-- Lua APIs
local pairs, ipairs, assert, type, wipe = pairs, ipairs, assert, type, wipe
local pairs, ipairs, assert, type, wipe = pairs, ipairs, assert, type, table.wipe

-- WoW APIs
local PlaySound = PlaySound
Expand Down
87 changes: 30 additions & 57 deletions WoWPro/Libraries/CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,93 +1,66 @@
------------------------------------------------------------------------
r1240 | nevcairiel | 2020-10-13 07:59:32 +0000 (Tue, 13 Oct 2020) | 1 line
r1251 | nevcairiel | 2021-05-17 09:28:32 +0000 (Mon, 17 May 2021) | 1 line
Changed paths:
M /trunk/Ace3.toc
M /trunk/changelog.txt

Update changelog and TOC
------------------------------------------------------------------------
r1239 | nevcairiel | 2020-09-20 10:22:02 +0000 (Sun, 20 Sep 2020) | 1 line
Changed paths:
M /trunk/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua

AceGUI-3.0: DropDown: Anchor all items to the dropdown frame instead of chaining anchors, fixes anchoring on WoW 9.0 with many items
------------------------------------------------------------------------
r1238 | nevcairiel | 2020-08-28 16:18:42 +0000 (Fri, 28 Aug 2020) | 3 lines
Changed paths:
M /trunk/AceAddon-3.0/AceAddon-3.0.lua

AceAddon-3.0: Blacklist more Blizzard addons from triggering Ace3 load events

These addons can be loaded very early by UIParent, which causes issues with loading certain addons
Update changelog
------------------------------------------------------------------------
r1237 | nevcairiel | 2020-07-17 22:50:38 +0000 (Fri, 17 Jul 2020) | 1 line
r1250 | nevcairiel | 2021-04-13 16:35:48 +0000 (Tue, 13 Apr 2021) | 1 line
Changed paths:
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua
M /trunk/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua
M /trunk/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua
M /trunk/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua
M /trunk/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua

Use BackdropTemplate in WoW 9.0
AceGUI-3.0: BlizOptionsGroup: Make sure the container frame is parented to InterfaceOptionsFramePanelContainer
------------------------------------------------------------------------
r1236 | nevcairiel | 2020-04-16 07:36:45 +0000 (Thu, 16 Apr 2020) | 1 line
r1249 | funkehdude | 2021-03-09 20:18:52 +0000 (Tue, 09 Mar 2021) | 1 line
Changed paths:
M /trunk/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua

AceGUI-3.0: DropDown: Initialize the widget with an empty item list (instead of nil), this allows AddItem to be used right away (Fixes #542)
------------------------------------------------------------------------
r1235 | nevcairiel | 2020-04-15 10:27:55 +0000 (Wed, 15 Apr 2020) | 1 line
Changed paths:
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua
M /trunk/Ace3.toc

Cleanup debug
bump toc
------------------------------------------------------------------------
r1234 | nevcairiel | 2020-04-15 10:14:35 +0000 (Wed, 15 Apr 2020) | 1 line
r1248 | funkehdude | 2021-02-05 14:27:49 +0000 (Fri, 05 Feb 2021) | 1 line
Changed paths:
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua
M /trunk/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua

AceGUI-3.0: TreeGroup: Remove pre-8.0 compat
AceConfigDialog: Make the popup opaque and no longer click-through
------------------------------------------------------------------------
r1233 | nevcairiel | 2020-04-15 10:09:47 +0000 (Wed, 15 Apr 2020) | 1 line
r1247 | funkehdude | 2021-01-23 23:16:39 +0000 (Sat, 23 Jan 2021) | 1 line
Changed paths:
M /trunk/AceGUI-3.0/widgets/AceGUIWidget-Label.lua
M /trunk/AceComm-3.0/ChatThrottleLib.lua
M /trunk/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
M /trunk/AceGUI-3.0/AceGUI-3.0.lua
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua

AceGUI-3.0: Label: Refresh anchoring after changing the font (Fixes #540)
Use table.wipe instead of wipe where appropriate.
------------------------------------------------------------------------
r1232 | nevcairiel | 2020-04-14 22:21:22 +0000 (Tue, 14 Apr 2020) | 1 line
r1246 | funkehdude | 2021-01-03 02:43:27 +0000 (Sun, 03 Jan 2021) | 1 line
Changed paths:
M /trunk/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
M /trunk/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua

AceConfigDialog-3.0: Prevent a dialog refresh when a multiselect control is closed during release (Fixes #539)
Allow more room for other addons to draw under our widgets by setting the base frame level to 100.
------------------------------------------------------------------------
r1231 | nevcairiel | 2020-04-14 22:20:36 +0000 (Tue, 14 Apr 2020) | 1 line
r1245 | nevcairiel | 2020-12-10 16:58:19 +0000 (Thu, 10 Dec 2020) | 1 line
Changed paths:
M /trunk/AceGUI-3.0/AceGUI-3.0.lua
M /trunk/changelog.txt

AceGUI-3.0: Add a getter to allow callers to check if a widget is currently being released, which can be used as part of some callbacks to alter behavior
Add recent changes to the changelog
------------------------------------------------------------------------
r1230 | funkydude | 2020-01-14 17:01:25 +0000 (Tue, 14 Jan 2020) | 1 line
r1244 | funkehdude | 2020-11-18 03:10:25 +0000 (Wed, 18 Nov 2020) | 1 line
Changed paths:
M /trunk/Ace3.toc

bump toc
------------------------------------------------------------------------
r1229 | funkydude | 2019-10-11 20:48:50 +0000 (Fri, 11 Oct 2019) | 1 line
r1243 | nevcairiel | 2020-10-18 00:00:19 +0000 (Sun, 18 Oct 2020) | 1 line
Changed paths:
M /trunk/Ace3.toc
M /trunk/AceHook-3.0/AceHook-3.0.lua

bump toc
AceHook-3.0: Allow UnhookAll to be used without embedding (Fixes #558)
------------------------------------------------------------------------
r1228 | nevcairiel | 2019-09-06 08:51:17 +0000 (Fri, 06 Sep 2019) | 3 lines
r1242 | nevcairiel | 2020-10-17 07:10:47 +0000 (Sat, 17 Oct 2020) | 1 line
Changed paths:
M /trunk/AceGUI-3.0/AceGUI-3.0.lua

AceGUI-3.0: Avoid re-entrance into the Release function
M /trunk/Ace3.toc

This can happen if a frame is released in a callback fired in the release process, and may in some cases throw errors.
Include the project version in the main TOC to identify packages more easily
------------------------------------------------------------------------

6 changes: 6 additions & 0 deletions WoWPro/Libraries/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
Ace3 Release - Revision r1252 (May 17th, 2021)
--------------------------------------------------
- AceConfigDialog-3.0: Increased the frame level of dialogs to allow other addons to draw below them.
- AceConfigDialog-3.0: The validation/confirmation popup is now opaque and not click-through, to avoid accidentally activating options below it.
- AceHook-3.0: Allow UnhookAll to be used without embedding (Fixes #558)

Ace3 Release - Revision r1241 (October 13th, 2020)
--------------------------------------------------
- AceAddon-3.0: Suppress more Blizzard addon load events from activating Ace3 addons "too early", causing loading issues.
Expand Down

0 comments on commit cfc0826

Please sign in to comment.