fix(libs): restore ElvUI-namespaced Ace3 stack clobbered by sweep

The coa-ace3 sweep (commits 0c130e0..5ea6e44, before coa-elvui was added to
EXCLUDED_FORKS in coa-ace3 tools/sweep.py) overwrote ElvUI's customized,
-ElvUI-namespaced Ace3 libs with plain canonical ones. ElvUI registers libs
as AceLocale-3.0-ElvUI and the AceConfig-3.0-ElvUI family (plus -ElvUI
widgets that don't exist in canonical), so the clobber left them
unregistered: ElvUI failed to init (16 locale 'L' errors) and /ec would not
open. Restores ElvUI/Libraries/Ace3/AceLocale-3.0 and the
ElvUI_OptionsUI/Libraries/Ace3 stack to their pre-sweep state (5021fd1).
coa-elvui is now in EXCLUDED_FORKS, so this won't be re-clobbered.

ElvUI/Libraries/Ace3/AceLocale-3.0/AceLocale-3.0.lua

@@ -2,7 +2,7 @@
 -- @class file
 -- @name AceLocale-3.0
 -- @release $Id$
-local MAJOR,MINOR = "AceLocale-3.0", 6
+local MAJOR,MINOR = "AceLocale-3.0-ElvUI", 6
 
 local AceLocale, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
 
@@ -12,6 +12,10 @@ if not AceLocale then return end -- no upgrade needed
 local assert, tostring, error = assert, tostring, error
 local getmetatable, setmetatable, rawset, rawget = getmetatable, setmetatable, rawset, rawget
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: GAME_LOCALE, geterrorhandler
+
 local gameLocale = GetLocale()
 if gameLocale == "enGB" then
 	gameLocale = "enUS"
@@ -87,10 +91,6 @@ local writedefaultproxy = setmetatable({}, {
 -- L["string1"] = "Zeichenkette1"
 -- @return Locale Table to add localizations to, or nil if the current locale is not required.
 function AceLocale:NewLocale(application, locale, isDefault, silent)
-
-	-- GAME_LOCALE allows translators to test translations of addons without having that wow client installed
-	local activeGameLocale = GAME_LOCALE or gameLocale
-
 	local app = AceLocale.apps[application]
 
 	if silent and app and getmetatable(app) ~= readmetasilent then
@@ -107,11 +107,14 @@ function AceLocale:NewLocale(application, locale, isDefault, silent)
 		AceLocale.appnames[app] = application
 	end
 
-	if locale ~= activeGameLocale and not isDefault then
+	-- ElvUI block
-		return -- nop, we don't need these translations
+	if (not app[locale]) or (app[locale] and type(app[locale]) ~= 'table') then
+		--	app[locale] = setmetatable({}, silent and readmetasilent or readmeta) -- To find missing keys
+		app[locale] = setmetatable({}, readmetasilent)
 	end
 
-	registering = app -- remember globally for writeproxy and writedefaultproxy
+	registering = app[locale] -- remember globally for writeproxy and writedefaultproxy
+	-- end block
 
 	if isDefault then
 		return writedefaultproxy
@@ -125,9 +128,16 @@ end
 -- @param application Unique name of addon / module
 -- @param silent If true, the locale is optional, silently return nil if it's not found (defaults to false, optional)
 -- @return The locale table for the current language.
-function AceLocale:GetLocale(application, silent)
+--- Modified by ElvUI to add `locale` as second arg
-	if not silent and not AceLocale.apps[application] then
+function AceLocale:GetLocale(application, locale, silent)
-		error("Usage: GetLocale(application[, silent]): 'application' - No locales registered for '"..tostring(application).."'", 2)
+	if type(locale) == "boolean" then
+		silent = locale
+		locale = gameLocale
 	end
-	return AceLocale.apps[application]
+
+	if not silent and not AceLocale.apps[application] then
+		error("Usage: GetLocale(application[,locale[, silent]]): 'application' - No locales registered for '"..tostring(application).."'", 2)
+	end
+
+	return AceLocale.apps[application][locale] or AceLocale.apps[application][gameLocale] -- Just in case the table doesn't exist it reverts to default
 end

ElvUI_OptionsUI/Libraries/Ace3/AceConfig-3.0/AceConfig-3.0.lua

@@ -12,10 +12,10 @@ Very light wrapper library that combines all the AceConfig subcomponents into on
 
 ]]
 
-local cfgreg = LibStub("AceConfigRegistry-3.0")
+local cfgreg = LibStub("AceConfigRegistry-3.0-ElvUI")
-local cfgcmd = LibStub("AceConfigCmd-3.0")
+local cfgcmd = LibStub("AceConfigCmd-3.0-ElvUI")
 
-local MAJOR, MINOR = "AceConfig-3.0", 3
+local MAJOR, MINOR = "AceConfig-3.0-ElvUI", 3
 local AceConfig = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not AceConfig then return end
@@ -27,7 +27,7 @@ if not AceConfig then return end
 local pcall, error, type, pairs = pcall, error, type, pairs
 
 -- -------------------------------------------------------------------
--- :RegisterOptionsTable(appName, options, slashcmd)
+-- :RegisterOptionsTable(appName, options, slashcmd, persist)
 --
 -- - appName - (string) application name
 -- - options - table or function ref, see AceConfigRegistry

ElvUI_OptionsUI/Libraries/Ace3/AceConfig-3.0/AceConfigCmd-3.0/AceConfigCmd-3.0.lua

@@ -14,9 +14,9 @@ REQUIRES: AceConsole-3.0 for command registration (loaded on demand)
 
 -- TODO: plugin args
 
-local cfgreg = LibStub("AceConfigRegistry-3.0")
+local cfgreg = LibStub("AceConfigRegistry-3.0-ElvUI")
 
-local MAJOR, MINOR = "AceConfigCmd-3.0", 14
+local MAJOR, MINOR = "AceConfigCmd-3.0-ElvUI", 14
 local AceConfigCmd = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not AceConfigCmd then return end
@@ -37,10 +37,17 @@ local error, assert = error, assert
 -- WoW APIs
 local _G = _G
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: LibStub, SELECTED_CHAT_FRAME, DEFAULT_CHAT_FRAME
+
+
 local L = setmetatable({}, {	-- TODO: replace with proper locale
 	__index = function(self,k) return k end
 })
 
+
+
 local function print(msg)
 	(SELECTED_CHAT_FRAME or DEFAULT_CHAT_FRAME):AddMessage(msg)
 end
@@ -394,7 +401,7 @@ local function handle(info, inputpos, tab, depth, retfalse)
 		return
 	end
 
-	local strInput = strsub(info.input,inputpos);
+	local str = strsub(info.input,inputpos);
 
 	if tab.type=="execute" then
 		------------ execute --------------------------------------------
@@ -407,21 +414,21 @@ local function handle(info, inputpos, tab, depth, retfalse)
 
 		local res = true
 		if tab.pattern then
-			if type(tab.pattern)~="string" then err(info, inputpos, "'pattern' - expected a string") end
+			if not(type(tab.pattern)=="string") then err(info, inputpos, "'pattern' - expected a string") end
-			if not strmatch(strInput, tab.pattern) then
+			if not strmatch(str, tab.pattern) then
-				usererr(info, inputpos, "'"..strInput.."' - " .. L["invalid input"])
+				usererr(info, inputpos, "'"..str.."' - " .. L["invalid input"])
 				return
 			end
 		end
 
-		do_final(info, inputpos, tab, "set", strInput)
+		do_final(info, inputpos, tab, "set", str)
 
 
 
 	elseif tab.type=="toggle" then
 		------------ toggle --------------------------------------------
 		local b
-		local str = strtrim(strlower(strInput))
+		local str = strtrim(strlower(str))
 		if str=="" then
 			b = callmethod(info, inputpos, tab, "get")
 
@@ -458,9 +465,9 @@ local function handle(info, inputpos, tab, depth, retfalse)
 
 	elseif tab.type=="range" then
 		------------ range --------------------------------------------
-		local val = tonumber(strInput)
+		local val = tonumber(str)
 		if not val then
-			usererr(info, inputpos, "'"..strInput.."' - "..L["expected number"])
+			usererr(info, inputpos, "'"..str.."' - "..L["expected number"])
 			return
 		end
 		if type(info.step)=="number" then
@@ -480,7 +487,7 @@ local function handle(info, inputpos, tab, depth, retfalse)
 
 	elseif tab.type=="select" then
 		------------ select ------------------------------------
-		local str = strtrim(strlower(strInput))
+		local str = strtrim(strlower(str))
 
 		local values = tab.values
 		if type(values) == "function" or type(values) == "string" then
@@ -521,7 +528,7 @@ local function handle(info, inputpos, tab, depth, retfalse)
 
 	elseif tab.type=="multiselect" then
 		------------ multiselect -------------------------------------------
-		local str = strtrim(strlower(strInput))
+		local str = strtrim(strlower(str))
 
 		local values = tab.values
 		if type(values) == "function" or type(values) == "string" then
@@ -558,7 +565,7 @@ local function handle(info, inputpos, tab, depth, retfalse)
 
 			--check that the opt is valid
 			local ok
-			for k in pairs(values) do
+			for k,v in pairs(values) do
 				if strlower(k)==opt then
 					opt = k	-- overwrite with key (in case of case mismatches)
 					ok = true
@@ -627,7 +634,7 @@ local function handle(info, inputpos, tab, depth, retfalse)
 
 	elseif tab.type=="color" then
 		------------ color --------------------------------------------
-		local str = strtrim(strlower(strInput))
+		local str = strtrim(strlower(str))
 		if str == "" then
 			--TODO: Show current value
 			return
@@ -699,7 +706,7 @@ local function handle(info, inputpos, tab, depth, retfalse)
 
 	elseif tab.type=="keybinding" then
 		------------ keybinding --------------------------------------------
-		local str = strtrim(strlower(strInput))
+		local str = strtrim(strlower(str))
 		if str == "" then
 			--TODO: Show current value
 			return

ElvUI_OptionsUI/Libraries/Ace3/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua

@@ -5,9 +5,9 @@
 
 local LibStub = LibStub
 local gui = LibStub("AceGUI-3.0")
-local reg = LibStub("AceConfigRegistry-3.0")
+local reg = LibStub("AceConfigRegistry-3.0-ElvUI")
 
-local MAJOR, MINOR = "AceConfigDialog-3.0", 92
+local MAJOR, MINOR = "AceConfigDialog-3.0-ElvUI", 79
 local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not AceConfigDialog then return end
@@ -15,20 +15,25 @@ if not AceConfigDialog then return end
 AceConfigDialog.OpenFrames = AceConfigDialog.OpenFrames or {}
 AceConfigDialog.Status = AceConfigDialog.Status or {}
 AceConfigDialog.frame = AceConfigDialog.frame or CreateFrame("Frame")
-AceConfigDialog.tooltip = AceConfigDialog.tooltip or CreateFrame("GameTooltip", "AceConfigDialogTooltip", UIParent, "GameTooltipTemplate")
 
 AceConfigDialog.frame.apps = AceConfigDialog.frame.apps or {}
 AceConfigDialog.frame.closing = AceConfigDialog.frame.closing or {}
 AceConfigDialog.frame.closeAllOverride = AceConfigDialog.frame.closeAllOverride or {}
 
 -- Lua APIs
-local tinsert, tsort, tremove, wipe = table.insert, table.sort, table.remove, table.wipe
+local tconcat, tinsert, tsort, tremove = table.concat, table.insert, table.sort, table.remove
 local strmatch, format = string.match, string.format
-local error = error
+local assert, loadstring, error = assert, loadstring, error
-local pairs, next, select, type, unpack, ipairs = pairs, next, select, type, unpack, ipairs
+local pairs, next, select, type, unpack, wipe, ipairs = pairs, next, select, type, unpack, wipe, ipairs
-local tostring, tonumber = tostring, tonumber
+local rawset, tostring, tonumber = rawset, tostring, tonumber
 local math_min, math_max, math_floor = math.min, math.max, math.floor
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: NORMAL_FONT_COLOR, GameTooltip, StaticPopupDialogs, ACCEPT, CANCEL, StaticPopup_Show
+-- GLOBALS: PlaySound, GameFontHighlight, GameFontHighlightSmall, GameFontHighlightLarge
+-- GLOBALS: CloseSpecialWindows, InterfaceOptions_AddCategory, geterrorhandler
+
 local emptyTbl = {}
 
 --[[
@@ -40,10 +45,39 @@ local function errorhandler(err)
 	return geterrorhandler()(err)
 end
 
+local function CreateDispatcher(argCount)
+	local code = [[
+		local xpcall, eh = ...
+		local method, ARGS
+		local function call() return method(ARGS) end
+
+		local function dispatch(func, ...)
+			 method = func
+			 if not method then return end
+			 ARGS = ...
+			 return xpcall(call, eh)
+		end
+
+		return dispatch
+	]]
+
+	local ARGS = {}
+	for i = 1, argCount do ARGS[i] = "arg"..i end
+	code = code:gsub("ARGS", tconcat(ARGS, ", "))
+	return assert(loadstring(code, "safecall Dispatcher["..argCount.."]"))(xpcall, errorhandler)
+end
+
+local Dispatchers = setmetatable({}, {__index=function(self, argCount)
+	local dispatcher = CreateDispatcher(argCount)
+	rawset(self, argCount, dispatcher)
+	return dispatcher
+end})
+Dispatchers[0] = function(func)
+	return xpcall(func, errorhandler)
+end
+
 local function safecall(func, ...)
-	if func then
+	return Dispatchers[select("#", ...)](func, ...)
-		return xpcall(func, errorhandler, ...)
-	end
 end
 
 local width_multiplier = 170
@@ -147,7 +181,6 @@ local stringIsLiteral = {
 	width = true,
 	image = true,
 	fontSize = true,
-	tooltipHyperlink = true
 }
 
 --Is Never a function or method
@@ -189,8 +222,9 @@ local function GetOptionsMemberValue(membername, option, options, path, appName,
 		--We have a function to call
 		local info = new()
 		--traverse the options table, picking up the handler and filling the info with the path
+		local handler
 		local group = options
-		local handler = group.handler
+		handler = group.handler or handler
 
 		for i = 1, #path do
 			group = GetSubOption(group, path[i])
@@ -208,21 +242,21 @@ local function GetOptionsMemberValue(membername, option, options, path, appName,
 		info.uiType = "dialog"
 		info.uiName = MAJOR
 
-		local a, b, c ,d
+		local a, b, c, d, e, f, g, h -- ElvUI adds e,f,g,h for default color
 		--using 4 returns for the get of a color type, increase if a type needs more
 		if type(member) == "function" then
 			--Call the function
-			a,b,c,d = member(info, ...)
+			a,b,c,d,e,f,g,h = member(info, ...)
 		else
 			--Call the method
 			if handler and handler[member] then
-				a,b,c,d = handler[member](handler, info, ...)
+				a,b,c,d,e,f,g,h = handler[member](handler, info, ...)
 			else
 				error(format("Method %s doesn't exist in handler for type %s", member, membername))
 			end
 		end
 		del(info)
-		return a,b,c,d
+		return a,b,c,d,e,f,g,h
 	else
 		--The value isnt a function to call, return it
 		return member
@@ -499,163 +533,137 @@ local function OptionOnMouseOver(widget, event)
 	local options = user.options
 	local path = user.path
 	local appName = user.appName
-	local tooltip = AceConfigDialog.tooltip
 
-	tooltip:SetOwner(widget.frame, "ANCHOR_TOPRIGHT")
+	-- modified by ElvUI
-
+	if opt.descStyle and opt.descStyle ~= "tooltip" then return end
-	local tooltipHyperlink = GetOptionsMemberValue("tooltipHyperlink", opt, options, path, appName)
-	if tooltipHyperlink then
-		tooltip:SetHyperlink(tooltipHyperlink)
-		tooltip:Show()
-		return
-	end
 
 	local name = GetOptionsMemberValue("name", opt, options, path, appName)
 	local desc = GetOptionsMemberValue("desc", opt, options, path, appName)
 	local usage = GetOptionsMemberValue("usage", opt, options, path, appName)
-	local descStyle = opt.descStyle
 
-	if descStyle and descStyle ~= "tooltip" then return end
+	local descText = type(desc) == "string"
+	local usageText = type(usage) == "string"
+	local userText = opt.type == "multiselect"
+	local softText = opt.softMin or opt.softMax
+	local bigText = opt.bigStep
+	local Min, Max, Step
 
-	tooltip:SetText(name, 1, .82, 0, 1, true)
+	if softText then
-
+		Min = (opt.min and "|cFFCCCCCCMin:|r "..(opt.isPercent and (opt.min*100).."%" or opt.min)) or ""
-	if opt.type == "multiselect" then
+		Max = (opt.max and "|cFFCCCCCCMax:|r "..(opt.isPercent and (opt.max*100).."%" or opt.max)) or ""
-		tooltip:AddLine(user.text, 0.5, 0.5, 0.8, true)
+		softText = Min ~= "" or Max ~= ""
 	end
-	if type(desc) == "string" then
+	if bigText then
-		tooltip:AddLine(desc, 1, 1, 1, true)
+		local dec = opt.step and format("%f", opt.step):gsub('%.?0-$','')
-	end
+		local num = dec and tonumber(dec)
-	if type(usage) == "string" then
+		Step = (num and num > 0 and "|cFFCCCCCCStep:|r "..dec) or ""
-		tooltip:AddLine(usage, NORMAL_FONT_COLOR.r, NORMAL_FONT_COLOR.g, NORMAL_FONT_COLOR.b, true)
+		bigText = Step ~= ""
 	end
 
-	tooltip:Show()
+	if descText or usageText or userText or softText or bigText then
+		GameTooltip:SetOwner(widget.frame, "ANCHOR_TOPRIGHT")
+		GameTooltip:SetText(name, 1, .82, 0, true)
+
+		if userText then
+			GameTooltip:AddLine(user.text, 0.5, 0.5, 0.8, true)
+		end
+		if descText then
+			GameTooltip:AddLine(desc, 1, 1, 1, true)
+		end
+		if usageText then
+			GameTooltip:AddLine("Usage: "..usage, NORMAL_FONT_COLOR.r, NORMAL_FONT_COLOR.g, NORMAL_FONT_COLOR.b, true)
+		end
+		if bigText or softText then
+			GameTooltip:AddLine(" ")
+		end
+		if bigText then
+			GameTooltip:AddLine(Step, NORMAL_FONT_COLOR.r, NORMAL_FONT_COLOR.g, NORMAL_FONT_COLOR.b, true)
+		end
+		if softText then
+			GameTooltip:AddDoubleLine(Min, Max)
+		end
+
+		GameTooltip:Show()
+	end
 end
 
 local function OptionOnMouseLeave(widget, event)
-	AceConfigDialog.tooltip:Hide()
+	GameTooltip:Hide()
 end
 
 local function GetFuncName(option)
-	if option.type == "execute" then
+	local type = option.type
+	if type == "execute" then
 		return "func"
 	else
 		return "set"
 	end
 end
-do
-	local InCombatLockdown = InCombatLockdown
-	local frame = AceConfigDialog.popup
-	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
-				if not InCombatLockdown() then
-					self:SetPropagateKeyboardInput(false)
-				end
-				if self.cancel:IsShown() then
-					self.cancel:Click()
-				else -- Showing a validation error
-					self:Hide()
-				end
-			elseif not InCombatLockdown() then
-				self:SetPropagateKeyboardInput(true)
-			end
-		end)
-
-		local border = CreateFrame("Frame", nil, frame, "DialogBorderOpaqueTemplate")
-		border:SetAllPoints(frame)
-		frame:SetFixedFrameStrata(true)
-		frame:SetFixedFrameLevel(true)
-
-		local text = frame:CreateFontString(nil, "ARTWORK", "GameFontHighlight")
-		text:SetSize(290, 0)
-		text:SetPoint("TOP", 0, -16)
-		frame.text = text
-
-		local function newButton(newText)
-			local button = CreateFrame("Button", nil, frame)
-			button:SetSize(128, 21)
-			button:SetNormalFontObject(GameFontNormal)
-			button:SetHighlightFontObject(GameFontHighlight)
-			button:SetNormalTexture("Interface\\Buttons\\UI-DialogBox-Button-Up")
-			button:GetNormalTexture():SetTexCoord(0.0, 1.0, 0.0, 0.71875)
-			button:SetPushedTexture("Interface\\Buttons\\UI-DialogBox-Button-Down")
-			button:GetPushedTexture():SetTexCoord(0.0, 1.0, 0.0, 0.71875)
-			button:SetHighlightTexture("Interface\\Buttons\\UI-DialogBox-Button-Highlight")
-			button:GetHighlightTexture():SetTexCoord(0.0, 1.0, 0.0, 0.71875)
-			button:SetText(newText)
-			return button
-		end
-
-		local accept = newButton(ACCEPT)
-		accept:SetPoint("BOTTOMRIGHT", frame, "BOTTOM", -6, 16)
-		frame.accept = accept
-
-		local cancel = newButton(CANCEL)
-		cancel:SetPoint("LEFT", accept, "RIGHT", 13, 0)
-		frame.cancel = cancel
-	end
-end
 local function confirmPopup(appName, rootframe, basepath, info, message, func, ...)
-	local frame = AceConfigDialog.popup
+	if not StaticPopupDialogs["ACECONFIGDIALOG30_CONFIRM_DIALOG"] then
-	frame:Show()
+		StaticPopupDialogs["ACECONFIGDIALOG30_CONFIRM_DIALOG"] = {}
-	frame.text:SetText(message)
+	end
-	-- From StaticPopup.lua
+	local t = StaticPopupDialogs["ACECONFIGDIALOG30_CONFIRM_DIALOG"]
-	-- local height = 32 + text:GetHeight() + 2;
+	for k in pairs(t) do
-	-- height = height + 6 + accept:GetHeight()
+		t[k] = nil
-	-- We add 32 + 2 + 6 + 21 (button height) == 61
+	end
-	local height = 61 + frame.text:GetHeight()
+	t.text = message
-	frame:SetHeight(height)
+	t.button1 = ACCEPT
-
+	t.button2 = CANCEL
-	frame.accept:ClearAllPoints()
+	t.preferredIndex = STATICPOPUP_NUMDIALOGS
-	frame.accept:SetPoint("BOTTOMRIGHT", frame, "BOTTOM", -6, 16)
+	local dialog, oldstrata
-	frame.cancel:Show()
+	t.OnAccept = function()
-
+		safecall(func, unpack(t))
-	local t = {...}
+		if dialog and oldstrata then
-	local tCount = select("#", ...)
+			dialog:SetFrameStrata(oldstrata)
-	frame.accept:SetScript("OnClick", function(self)
+		end
-		safecall(func, unpack(t, 1, tCount)) -- Manually set count as unpack() stops on nil (bug with #table)
 		AceConfigDialog:Open(appName, rootframe, unpack(basepath or emptyTbl))
-		frame:Hide()
-		self:SetScript("OnClick", nil)
-		frame.cancel:SetScript("OnClick", nil)
 		del(info)
-	end)
+	end
-	frame.cancel:SetScript("OnClick", function(self)
+	t.OnCancel = function()
+		if dialog and oldstrata then
+			dialog:SetFrameStrata(oldstrata)
+		end
 		AceConfigDialog:Open(appName, rootframe, unpack(basepath or emptyTbl))
-		frame:Hide()
-		self:SetScript("OnClick", nil)
-		frame.accept:SetScript("OnClick", nil)
 		del(info)
-	end)
+	end
+	for i = 1, select("#", ...) do
+		t[i] = select(i, ...) or false
+	end
+	t.timeout = 0
+	t.whileDead = 1
+	t.hideOnEscape = 1
+
+	dialog = StaticPopup_Show("ACECONFIGDIALOG30_CONFIRM_DIALOG")
+	if dialog then
+		oldstrata = dialog:GetFrameStrata()
+		dialog:SetFrameStrata("TOOLTIP")
+	end
 end
 
 local function validationErrorPopup(message)
-	local frame = AceConfigDialog.popup
+	if not StaticPopupDialogs["ACECONFIGDIALOG30_VALIDATION_ERROR_DIALOG"] then
-	frame:Show()
+		StaticPopupDialogs["ACECONFIGDIALOG30_VALIDATION_ERROR_DIALOG"] = {}
-	frame.text:SetText(message)
+	end
-	-- From StaticPopup.lua
+	local t = StaticPopupDialogs["ACECONFIGDIALOG30_VALIDATION_ERROR_DIALOG"]
-	-- local height = 32 + text:GetHeight() + 2;
+	t.text = message
-	-- height = height + 6 + accept:GetHeight()
+	t.button1 = OKAY
-	-- We add 32 + 2 + 6 + 21 (button height) == 61
+	t.preferredIndex = STATICPOPUP_NUMDIALOGS
-	local height = 61 + frame.text:GetHeight()
+	local dialog, oldstrata
-	frame:SetHeight(height)
+	t.OnAccept = function()
+		if dialog and oldstrata then
+			dialog:SetFrameStrata(oldstrata)
+		end
+	end
+	t.timeout = 0
+	t.whileDead = 1
+	t.hideOnEscape = 1
 
-	frame.accept:ClearAllPoints()
+	dialog = StaticPopup_Show("ACECONFIGDIALOG30_VALIDATION_ERROR_DIALOG")
-	frame.accept:SetPoint("BOTTOM", frame, "BOTTOM", 0, 16)
+	if dialog then
-	frame.cancel:Hide()
+		oldstrata = dialog:GetFrameStrata()
-
+		dialog:SetFrameStrata("TOOLTIP")
-	frame.accept:SetScript("OnClick", function()
+	end
-		frame:Hide()
-	end)
 end
 
 local function ActivateControl(widget, event, ...)
@@ -678,7 +686,7 @@ local function ActivateControl(widget, event, ...)
 	if group[funcname] ~= nil then
 		func =  group[funcname]
 	end
-	handler = group.handler
+	handler = group.handler or handler
 	confirm = group.confirm
 	validate = group.validate
 	for i = 1, #path do
@@ -742,6 +750,7 @@ local function ActivateControl(widget, event, ...)
 		end
 	end
 
+	local rootframe = user.rootframe
 	if not validated or type(validated) == "string" then
 		if not validated then
 			if usage then
@@ -756,12 +765,12 @@ local function ActivateControl(widget, event, ...)
 		end
 
 		-- show validate message
-		if user.rootframe.SetStatusText then
+		if not group.validatePopup and rootframe.SetStatusText then
-			user.rootframe:SetStatusText(validated)
+			rootframe:SetStatusText(validated)
 		else
 			validationErrorPopup(validated)
 		end
-		PlaySound(882) -- SOUNDKIT.IG_PLAYER_INVITE_DECLINE || _DECLINE is actually missing from the table
+		PlaySound("igPlayerInviteDecline")
 		del(info)
 		return true
 	else
@@ -794,14 +803,14 @@ local function ActivateControl(widget, event, ...)
 		if type(confirm) == "boolean" then
 			if confirm then
 				if not confirmText then
-					local option_name, desc = option.name, option.desc
+					local name, desc = option.name, option.desc
-					if type(option_name) == "function" then
+					if type(name) == "function" then
-						option_name = option_name(info)
+						name = name(info)
 					end
 					if type(desc) == "function" then
 						desc = desc(info)
 					end
-					confirmText = option_name
+					confirmText = name
 					if desc then
 						confirmText = confirmText.." - "..desc
 					end
@@ -879,6 +888,11 @@ end
 local function ActivateSlider(widget, event, value)
 	local option = widget:GetUserData("option")
 	local min, max, step = option.min or (not option.softMin and 0 or nil), option.max or (not option.softMax and 100 or nil), option.step
+
+	-- checks added by elvui
+	if type(min) == 'function' then min = min() end
+	if type(max) == 'function' then max = max() end
+
 	if min then
 		if step then
 			value = math_floor((value - min) / step + 0.5) * step + min
@@ -1083,11 +1097,6 @@ local function InjectInfo(control, options, option, path, rootframe, appName)
 	control:SetCallback("OnRelease", CleanUserData)
 	control:SetCallback("OnLeave", OptionOnMouseLeave)
 	control:SetCallback("OnEnter", OptionOnMouseOver)
-
-	-- forward custom arg data directly
-	if control.SetCustomData and option.arg then
-		safecall(control.SetCustomData, control, option.arg)
-	end
 end
 
 local function CreateControl(userControlType, fallbackControlType)
@@ -1108,6 +1117,11 @@ local function sortTblAsStrings(x,y)
 	return tostring(x) < tostring(y) -- Support numbers as keys
 end
 
+-- added by ElvUI
+local function sortTblByValue(x,y)
+	return x[2] < y[2]
+end
+
 --[[
 	options - root of the options table being fed
 	container - widget that controls will be placed in
@@ -1148,13 +1162,15 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 				--Control to feed
 				local control
 
+				local name = GetOptionsMemberValue("name", v, options, path, appName)
+
 				if v.type == "execute" then
 
 					local imageCoords = GetOptionsMemberValue("imageCoords",v, options, path, appName)
 					local image, width, height = GetOptionsMemberValue("image",v, options, path, appName)
 
 					local iconControl = type(image) == "string" or type(image) == "number"
-					control = CreateControl(v.dialogControl or v.control, iconControl and "Icon" or "Button")
+					control = CreateControl(v.dialogControl or v.control, iconControl and "Icon" or "Button-ElvUI")
 					if iconControl then
 						if not width then
 							width = GetOptionsMemberValue("imageWidth",v, options, path, appName)
@@ -1197,6 +1213,11 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 				elseif v.type == "toggle" then
 					control = CreateControl(v.dialogControl or v.control, "CheckBox")
 					control:SetLabel(name)
+					control.textWidth = GetOptionsMemberValue("textWidth",v,options,path,appName)
+					if control.textWidth and control.frame and control.text then
+						local textWidth = control.text:GetWidth()+30
+						control.customWidth = (textWidth>=width_multiplier and textWidth<=width_multiplier*1.5) and textWidth
+					end
 					control:SetTriState(v.tristate)
 					local value = GetOptionsMemberValue("get",v, options, path, appName)
 					control:SetValue(value)
@@ -1210,7 +1231,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 					local image = GetOptionsMemberValue("image", v, options, path, appName)
 					local imageCoords = GetOptionsMemberValue("imageCoords", v, options, path, appName)
 
-					if type(image) == "string" or type(image) == "number" then
+					if type(image) == "string" then
 						if type(imageCoords) == "table" then
 							control:SetImage(image, unpack(imageCoords))
 						else
@@ -1250,7 +1271,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 							end
 							tsort(sorting, sortTblAsStrings)
 						end
-						for _, value in ipairs(sorting) do
+						for k, value in ipairs(sorting) do
 							local text = values[value]
 							local radio = gui:Create("CheckBox")
 							radio:SetLabel(text)
@@ -1278,13 +1299,15 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 						control:DoLayout()
 					else
 						control = CreateControl(v.dialogControl or v.control, "Dropdown")
+						local sortByValue = GetOptionsMemberValue("sortByValue",v,options,path,appName)
+
 						local itemType = v.itemControl
 						if itemType and not gui:GetWidgetVersion(itemType) then
 							geterrorhandler()(("Invalid Custom Item Type - %s"):format(tostring(itemType)))
 							itemType = nil
 						end
 						control:SetLabel(name)
-						control:SetList(values, sorting, itemType)
+						control:SetList(values, sorting, itemType, sortByValue)
 						local value = GetOptionsMemberValue("get",v, options, path, appName)
 						if not values[value] then
 							value = nil
@@ -1296,14 +1319,20 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 				elseif v.type == "multiselect" then
 					local values = GetOptionsMemberValue("values", v, options, path, appName)
 					local disabled = CheckOptionDisabled(v, options, path, appName)
+					local sortByValue = GetOptionsMemberValue("sortByValue", v, options, path, appName)
 
 					local valuesort = new()
 					if values then
 						for value, text in pairs(values) do
-							tinsert(valuesort, value)
+							tinsert(valuesort, (sortByValue and {value, text}) or value)
 						end
 					end
-					tsort(valuesort)
+
+					if sortByValue then
+						tsort(valuesort, sortTblByValue)
+					else
+						tsort(valuesort)
+					end
 
 					local controlType = v.dialogControl or v.control
 					if controlType then
@@ -1332,42 +1361,76 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 							control:SetWidth(width_multiplier)
 						end
 						--check:SetTriState(v.tristate)
-						for s = 1, #valuesort do
+						for i = 1, #valuesort do
-							local key = valuesort[s]
+							local key = (sortByValue and valuesort[i][1]) or valuesort[i]
 							local value = GetOptionsMemberValue("get",v, options, path, appName, key)
 							control:SetItemValue(key,value)
 						end
 					else
+						local width = GetOptionsMemberValue("width",v,options,path,appName)
+						local dragdrop = GetOptionsMemberValue("dragdrop",v,options,path,appName)
+
 						control = gui:Create("InlineGroup")
 						control:SetLayout("Flow")
 						control:SetTitle(name)
 						control.width = "fill"
 
 						control:PauseLayout()
-						local width = GetOptionsMemberValue("width",v,options,path,appName)
+
-						for s = 1, #valuesort do
+						for i = 1, #valuesort do
-							local value = valuesort[s]
+							local value = (sortByValue and valuesort[i][1]) or valuesort[i]
 							local text = values[value]
-							local check = gui:Create("CheckBox")
+							if dragdrop then
-							check:SetLabel(text)
+								local button = gui:Create("Button-ElvUI")
-							check:SetUserData("value", value)
+								button:SetDisabled(disabled)
-							check:SetUserData("text", text)
+								button:SetUserData("value", value)
-							check:SetDisabled(disabled)
+								button:SetUserData("text", text)
-							check:SetTriState(v.tristate)
+								local state = v.stateSwitchGetText and v.stateSwitchGetText(button, text, value)
-							check:SetValue(GetOptionsMemberValue("get",v, options, path, appName, value))
+								button:SetText(format("|cFF888888%d|r %s", i, state or text))
-							check:SetCallback("OnValueChanged",ActivateMultiControl)
+								button.stateSwitchOnClick = v.stateSwitchOnClick
-							InjectInfo(check, options, v, path, rootframe, appName)
+								button.dragOnMouseDown = v.dragOnMouseDown
-							control:AddChild(check)
+								button.dragOnMouseUp = v.dragOnMouseUp
-							if width == "double" then
+								button.dragOnEnter = v.dragOnEnter
-								check:SetWidth(width_multiplier * 2)
+								button.dragOnLeave = v.dragOnLeave
-							elseif width == "half" then
+								button.dragOnClick = v.dragOnClick
-								check:SetWidth(width_multiplier / 2)
+								button.dragdrop = true
-							elseif (type(width) == "number") then
+								button.ActivateMultiControl = ActivateMultiControl
-								check:SetWidth(width_multiplier * width)
+								button.value = GetOptionsMemberValue("get",v, options, path, appName, value)
-							elseif width == "full" then
+								InjectInfo(button, options, v, path, rootframe, appName)
-								check.width = "fill"
+								control:AddChild(button)
+								if width == "double" then
+									button:SetWidth(width_multiplier * 2)
+								elseif width == "half" then
+									button:SetWidth(width_multiplier / 2)
+								elseif (type(width) == "number") then
+									control:SetWidth(width_multiplier * width)
+								elseif width == "full" then
+									button.width = "fill"
+								else
+									button:SetWidth(width_multiplier)
+								end
 							else
-								check:SetWidth(width_multiplier)
+								local check = gui:Create("CheckBox")
+								check:SetLabel(text)
+								check:SetUserData("value", value)
+								check:SetUserData("text", text)
+								check:SetDisabled(disabled)
+								check:SetTriState(v.tristate)
+								check:SetValue(GetOptionsMemberValue("get",v, options, path, appName, value))
+								check:SetCallback("OnValueChanged",ActivateMultiControl)
+								InjectInfo(check, options, v, path, rootframe, appName)
+								control:AddChild(check)
+								if width == "double" then
+									check:SetWidth(width_multiplier * 2)
+								elseif width == "half" then
+									check:SetWidth(width_multiplier / 2)
+								elseif (type(width) == "number") then
+									control:SetWidth(width_multiplier * width)
+								elseif width == "full" then
+									check.width = "fill"
+								else
+									check:SetWidth(width_multiplier)
+								end
 							end
 						end
 						control:ResumeLayout()
@@ -1379,7 +1442,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 					del(valuesort)
 
 				elseif v.type == "color" then
-					control = CreateControl(v.dialogControl or v.control, "ColorPicker")
+					control = CreateControl(v.dialogControl or v.control, "ColorPicker-ElvUI")
 					control:SetLabel(name)
 					control:SetHasAlpha(GetOptionsMemberValue("hasAlpha",v, options, path, appName))
 					control:SetColor(GetOptionsMemberValue("get",v, options, path, appName))
@@ -1413,7 +1476,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 					local imageCoords = GetOptionsMemberValue("imageCoords",v, options, path, appName)
 					local image, width, height = GetOptionsMemberValue("image",v, options, path, appName)
 
-					if type(image) == "string" or type(image) == "number" then
+					if type(image) == "string" then
 						if not width then
 							width = GetOptionsMemberValue("imageWidth",v, options, path, appName)
 						end
@@ -1433,27 +1496,29 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
 						end
 						control:SetImageSize(width, height)
 					end
-					local controlWidth = GetOptionsMemberValue("width",v,options,path,appName)
+					local width = GetOptionsMemberValue("width",v,options,path,appName)
-					control.width = not controlWidth and "fill"
+					control.width = not width and "fill"
 				end
 
 				--Common Init
 				if control then
-					if control.width ~= "fill" then
+					local customWidth = control.customWidth or GetOptionsMemberValue("customWidth",v,options,path,appName)
-						local width = GetOptionsMemberValue("width",v,options,path,appName)
+					if control.width ~= "fill" or customWidth then
-						local relWidth = GetOptionsMemberValue("relWidth",v,options,path,appName)
+						if customWidth then
-						if width == "double" then
+							control:SetWidth(customWidth)
-							control:SetWidth(width_multiplier * 2)
-						elseif width == "half" then
-							control:SetWidth(width_multiplier / 2)
-						elseif (type(width) == "number") then
-							control:SetWidth(width_multiplier * width)
-						elseif width == "relative" and relWidth then
-							control:SetRelativeWidth(relWidth)
-						elseif width == "full" then
-							control.width = "fill"
 						else
-							control:SetWidth(width_multiplier)
+							local width = GetOptionsMemberValue("width",v,options,path,appName)
+							if width == "double" then
+								control:SetWidth(width_multiplier * 2)
+							elseif width == "half" then
+								control:SetWidth(width_multiplier / 2)
+							elseif (type(width) == "number") then
+								control:SetWidth(width_multiplier * width)
+							elseif width == "full" then
+								control.width = "fill"
+							else
+								control:SetWidth(width_multiplier)
+							end
 						end
 					end
 					if control.SetDisabled then
@@ -1489,7 +1554,6 @@ local function TreeOnButtonEnter(widget, event, uniquevalue, button)
 	local option = user.option
 	local path = user.path
 	local appName = user.appName
-	local tooltip = AceConfigDialog.tooltip
 
 	local feedpath = new()
 	for i = 1, #path do
@@ -1506,25 +1570,24 @@ local function TreeOnButtonEnter(widget, event, uniquevalue, button)
 	local name = GetOptionsMemberValue("name", group, options, feedpath, appName)
 	local desc = GetOptionsMemberValue("desc", group, options, feedpath, appName)
 
-	tooltip:SetOwner(button, "ANCHOR_NONE")
-	tooltip:ClearAllPoints()
-	if widget.type == "TabGroup" then
-		tooltip:SetPoint("BOTTOM",button,"TOP")
-	else
-		tooltip:SetPoint("LEFT",button,"RIGHT")
-	end
-
-	tooltip:SetText(name, 1, .82, 0, 1, true)
-
 	if type(desc) == "string" then
-		tooltip:AddLine(desc, 1, 1, 1, true)
+		GameTooltip:SetOwner(button, "ANCHOR_CURSOR")
-	end
+		if widget.type == "TabGroup" then
+			GameTooltip:SetPoint("BOTTOM",button,"TOP")
+		else
+			GameTooltip:SetPoint("LEFT",button,"RIGHT")
+		end
 
-	tooltip:Show()
+		GameTooltip:SetText(name, 1, .82, 0, 1)
+
+		GameTooltip:AddLine(desc, 1, 1, 1, 1)
+
+		GameTooltip:Show()
+	end
 end
 
 local function TreeOnButtonLeave(widget, event, value, button)
-	AceConfigDialog.tooltip:Hide()
+	GameTooltip:Hide()
 end
 
 
@@ -1692,29 +1755,29 @@ function AceConfigDialog:FeedGroup(appName,options,container,rootframe,path, isR
 
 		elseif grouptype == "select" then
 
-			local selectGroup = gui:Create("DropdownGroup")
+			local select = gui:Create("DropdownGroup")
-			selectGroup:SetTitle(name)
+			select:SetTitle(name)
-			InjectInfo(selectGroup, options, group, path, rootframe, appName)
+			InjectInfo(select, options, group, path, rootframe, appName)
-			selectGroup:SetCallback("OnGroupSelected", GroupSelected)
+			select:SetCallback("OnGroupSelected", GroupSelected)
 			local status = AceConfigDialog:GetStatusTable(appName, path)
 			if not status.groups then
 				status.groups = {}
 			end
-			selectGroup:SetStatusTable(status.groups)
+			select:SetStatusTable(status.groups)
 			local grouplist, orderlist = BuildSelect(group, options, path, appName)
-			selectGroup:SetGroupList(grouplist, orderlist)
+			select:SetGroupList(grouplist, orderlist)
-			selectGroup:SetUserData("grouplist", grouplist)
+			select:SetUserData("grouplist", grouplist)
-			selectGroup:SetUserData("orderlist", orderlist)
+			select:SetUserData("orderlist", orderlist)
 
 			local firstgroup = orderlist[1]
 			if firstgroup then
-				selectGroup:SetGroup((GroupExists(appName, options, path,status.groups.selected) and status.groups.selected) or firstgroup)
+				select:SetGroup((GroupExists(appName, options, path,status.groups.selected) and status.groups.selected) or firstgroup)
 			end
 
-			selectGroup.width = "fill"
+			select.width = "fill"
-			selectGroup.height = "fill"
+			select.height = "fill"
 
-			container:AddChild(selectGroup)
+			container:AddChild(select)
 
 		--assume tree group by default
 		--if parenttype is tree then this group is already a node on that tree
@@ -1942,19 +2005,17 @@ end
 -- convert pre-39 BlizOptions structure to the new format
 if oldminor and oldminor < 39 and AceConfigDialog.BlizOptions then
 	local old = AceConfigDialog.BlizOptions
-	local newOpt = {}
+	local new = {}
 	for key, widget in pairs(old) do
 		local appName = widget:GetUserData("appName")
-		if not newOpt[appName] then newOpt[appName] = {} end
+		if not new[appName] then new[appName] = {} end
-		newOpt[appName][key] = widget
+		new[appName][key] = widget
 	end
-	AceConfigDialog.BlizOptions = newOpt
+	AceConfigDialog.BlizOptions = new
 else
 	AceConfigDialog.BlizOptions = AceConfigDialog.BlizOptions or {}
 end
 
-AceConfigDialog.BlizOptionsIDMap = AceConfigDialog.BlizOptionsIDMap or {}
-
 local function FeedToBlizPanel(widget, event)
 	local path = widget:GetUserData("path")
 	AceConfigDialog:Open(widget:GetUserData("appName"), widget, unpack(path or emptyTbl))
@@ -1976,17 +2037,15 @@ end
 -- has to be a head-level note.
 --
 -- This function returns a reference to the container frame registered with the Interface
--- Options, as well as the registered ID. You can use the ID to open the options with
+-- Options. You can use this reference to open the options with the API function
--- the API function `Settings.OpenToCategory`.
+-- `InterfaceOptionsFrame_OpenToCategory`.
 -- @param appName The application name as given to `:RegisterOptionsTable()`
 -- @param name A descriptive name to display in the options tree (defaults to appName)
 -- @param parent The parent to use in the interface options tree.
 -- @param ... The path in the options table to feed into the interface options panel.
 -- @return The reference to the frame registered into the Interface Options.
--- @return The category ID to pass to Settings.OpenToCategory
 function AceConfigDialog:AddToBlizOptions(appName, name, parent, ...)
 	local BlizOptions = AceConfigDialog.BlizOptions
-	local BlizOptionsIDMap = AceConfigDialog.BlizOptionsIDMap
 
 	local key = appName
 	for n = 1, select("#", ...) do
@@ -2000,6 +2059,7 @@ function AceConfigDialog:AddToBlizOptions(appName, name, parent, ...)
 	if not BlizOptions[appName][key] then
 		local group = gui:Create("BlizOptionsGroup")
 		BlizOptions[appName][key] = group
+		group:SetName(name or appName, parent)
 
 		group:SetTitle(name or appName)
 		group:SetUserData("appName", appName)
@@ -2012,42 +2072,8 @@ function AceConfigDialog:AddToBlizOptions(appName, name, parent, ...)
 		end
 		group:SetCallback("OnShow", FeedToBlizPanel)
 		group:SetCallback("OnHide", ClearBlizPanel)
-
+		InterfaceOptions_AddCategory(group.frame)
-		local categoryName = name or appName
+		return group.frame
-		-- CoA-compat: the Settings.* API (GetCategory / RegisterCanvasLayoutCategory /
-		-- RegisterCanvasLayoutSubcategory / RegisterAddOnCategory) is a retail-only
-		-- (Dragonflight+) replacement for the WotLK-era InterfaceOptions_AddCategory.
-		-- On the 3.3.5-based CoA client Settings is nil, so fall back to the legacy API.
-		if Settings and Settings.GetCategory then
-			if parent then
-				local parentID = BlizOptionsIDMap[parent] or parent
-				local category = Settings.GetCategory(parentID)
-				if not category then
-					error(("The parent category '%s' was not found"):format(parent), 2)
-				end
-				local subcategory = Settings.RegisterCanvasLayoutSubcategory(category, group.frame, categoryName)
-				group:SetName(subcategory.ID, parentID)
-			else
-				if BlizOptionsIDMap[categoryName] then
-					error(("%s has already been added to the Blizzard Options Window with the given name: %s"):format(appName, categoryName), 2)
-				end
-
-				local category = Settings.RegisterCanvasLayoutCategory(group.frame, categoryName)
-				if not (C_SettingsUtil and C_SettingsUtil.OpenSettingsPanel) then
-					-- override the ID so the name can be used in Settings.OpenToCategory
-					-- unfortunately with incoming API changes in 12.0 (and likely classic at some point) this override is no longer possible
-					category.ID = categoryName
-				end
-				group:SetName(category.ID)
-				BlizOptionsIDMap[categoryName] = category.ID
-				Settings.RegisterAddOnCategory(category)
-			end
-		else
-			group:SetName(name or appName, parent)
-			InterfaceOptions_AddCategory(group.frame)
-		end
-
-		return group.frame, group.frame.name
 	else
 		error(("%s has already been added to the Blizzard Options Window with the given path"):format(appName), 2)
 	end

ElvUI_OptionsUI/Libraries/Ace3/AceConfig-3.0/AceConfigRegistry-3.0/AceConfigRegistry-3.0.lua

@@ -11,7 +11,7 @@
 -- @release $Id$
 local CallbackHandler = LibStub("CallbackHandler-1.0")
 
-local MAJOR, MINOR = "AceConfigRegistry-3.0", 22
+local MAJOR, MINOR = "AceConfigRegistry-3.0-ElvUI", 20
 local AceConfigRegistry = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not AceConfigRegistry then return end
@@ -57,8 +57,8 @@ local istable={["table"]=true,   _="table"}
 local ismethodtable={["table"]=true,["string"]=true,["function"]=true,   _="methodname, funcref or table"}
 local optstring={["nil"]=true,["string"]=true, _="string"}
 local optstringfunc={["nil"]=true,["string"]=true,["function"]=true, _="string or funcref"}
-local optstringnumberfunc={["nil"]=true,["string"]=true,["number"]=true,["function"]=true, _="string, number or funcref"}
 local optnumber={["nil"]=true,["number"]=true, _="number"}
+local optnumberfunc={["nil"]=true,["number"]=true,["function"]=true,_="number"} -- added by ElvUI for range
 local optmethodfalse={["nil"]=true,["string"]=true,["function"]=true,["boolean"]={[false]=true},  _="methodname, funcref or false"}
 local optmethodnumber={["nil"]=true,["string"]=true,["function"]=true,["number"]=true,  _="methodname, funcref or number"}
 local optmethodtable={["nil"]=true,["string"]=true,["function"]=true,["table"]=true,  _="methodname, funcref or table"}
@@ -75,6 +75,7 @@ local basekeys={
 	descStyle=optstring,
 	order=optmethodnumber,
 	validate=optmethodfalse,
+	validatePopup=optbool, --ElvUI
 	confirm=optmethodbool,
 	confirmText=optstring,
 	disabled=optmethodbool,
@@ -83,8 +84,7 @@ local basekeys={
 		dialogHidden=optmethodbool,
 		dropdownHidden=optmethodbool,
 	cmdHidden=optmethodbool,
-	tooltipHyperlink=optstringfunc,
+	icon=optstringfunc,
-	icon=optstringnumberfunc,
 	iconCoords=optmethodtable,
 	handler=opttable,
 	get=optmethodfalse,
@@ -92,7 +92,18 @@ local basekeys={
 	func=optmethodfalse,
 	arg={["*"]=true},
 	width=optstringnumber,
-	relWidth=optnumber,
+	-- below here were created by ElvUI --
+	customWidth=optnumber,
+	textWidth=optmethodbool,
+	sortByValue=optmethodbool,
+	dragdrop=optmethodbool,
+		dragOnEnter=optmethodfalse,
+		dragOnLeave=optmethodfalse,
+		dragOnClick=optmethodfalse,
+		dragOnMouseUp=optmethodfalse,
+		dragOnMouseDown=optmethodfalse,
+		stateSwitchOnClick=optmethodfalse,
+		stateSwitchGetText=optmethodfalse,
 }
 
 local typedkeys={
@@ -102,7 +113,7 @@ local typedkeys={
 		dropdownControl=optstring,
 	},
 	description={
-		image=optstringnumberfunc,
+		image=optstringfunc,
 		imageCoords=optmethodtable,
 		imageHeight=optnumber,
 		imageWidth=optnumber,
@@ -122,7 +133,7 @@ local typedkeys={
 		childGroups=optstring,
 	},
 	execute={
-		image=optstringnumberfunc,
+		image=optstringfunc,
 		imageCoords=optmethodtable,
 		imageHeight=optnumber,
 		imageWidth=optnumber,
@@ -140,7 +151,7 @@ local typedkeys={
 	},
 	toggle={
 		tristate=optbool,
-		image=optstringnumberfunc,
+		image=optstringfunc,
 		imageCoords=optmethodtable,
 		control=optstring,
 		dialogControl=optstring,
@@ -149,12 +160,12 @@ local typedkeys={
 	tristate={
 	},
 	range={
-		min=optnumber,
+		min=optnumberfunc, --ElvUI
-		softMin=optnumber,
+		softMin=optnumberfunc, --ElvUI
-		max=optnumber,
+		max=optnumberfunc, --ElvUI
-		softMax=optnumber,
+		softMax=optnumberfunc, --ElvUI
 		step=optnumber,
-		bigStep=optnumber,
+		bigStep=optnumberfunc, --ElvUI
 		isPercent=optbool,
 		control=optstring,
 		dialogControl=optstring,

ElvUI_OptionsUI/Libraries/Ace3/AceDBOptions-3.0/AceDBOptions-3.0.lua

@@ -13,6 +13,10 @@ local pairs, next = pairs, next
 -- WoW APIs
 local UnitClass = UnitClass
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: NORMAL_FONT_COLOR_CODE, FONT_COLOR_CODE_CLOSE
+
 AceDBOptions.optionTables = AceDBOptions.optionTables or {}
 AceDBOptions.handlers = AceDBOptions.handlers or {}
 
@@ -84,25 +88,25 @@ elseif LOCALE == "frFR" then
 	L["reset_desc"] = "Réinitialise le profil actuel au cas où votre configuration est corrompue ou si vous voulez tout simplement faire table rase."
 	L["reset_sub"] = "Réinitialise le profil actuel avec les paramètres par défaut."
 elseif LOCALE == "koKR" then
-	L["choose"] = "기존 프로필"
+	L["choose"] = "저장 중인 프로필"
-	L["choose_desc"] = "편집 상자에 이름을 입력하여 새로운 프로필을 만들거나 이미 존재하는 프로필 중 하나를 선택할 수 있습니다."
+	L["choose_desc"] = "입력창에 새로운 이름을 입력하거나 저장 중인 프로필 중 하나를 선택하여 새로운 프로필을 만들 수 있습니다."
 	L["choose_sub"] = "현재 이용할 수 있는 프로필 중 하나를 선택합니다."
-	L["copy"] = "복사해 올 프로필"
+	L["copy"] = "복사해오기"
-	L["copy_desc"] = "기존 프로필의 설정을 현재 활성화된 프로필로 복사합니다."
+	L["copy_desc"] = "현재 사용 중인 프로필에 선택한 프로필의 설정을 복사합니다."
 	L["current"] = "현재 프로필:"
 	L["default"] = "기본값"
 	L["delete"] = "프로필 삭제"
-	L["delete_confirm"] = "선택한 프로필을 삭제하시겠습니까?"
+	L["delete_confirm"] = "정말로 선택한 프로필을 삭제할까요?"
-	L["delete_desc"] = "데이터베이스에서 기존 프로필과 사용하지 않는 프로필을 삭제하여 공간을 절약하고 SavedVariables 파일을 정리합니다."
+	L["delete_desc"] = "저장 공간 절약과 SavedVariables 파일의 정리를 위해 데이터베이스에서 사용하지 않는 프로필을 삭제하세요."
-	L["delete_sub"] = "데이터베이스에서 프로필을 삭제합니다."
+	L["delete_sub"] = "데이터베이스의 프로필을 삭제합니다."
-	L["intro"] = "활성 데이터베이스 프로필을 변경할 수 있으며, 모든 캐릭터마다 서로 다른 설정을 지정할 수 있습니다."
+	L["intro"] = "활성 데이터베이스 프로필을 변경할 수 있고, 각 캐릭터 별로 다른 설정을 할 수 있습니다."
 	L["new"] = "새로운 프로필"
-	L["new_sub"] = "비어 있는 프로필을 새로 만듭니다."
+	L["new_sub"] = "새로운 프로필을 만듭니다."
 	L["profiles"] = "프로필"
 	L["profiles_sub"] = "프로필 관리"
-	L["reset"] = "프로필 재설정"
+	L["reset"] = "프로필 초기화"
-	L["reset_desc"] = "구성이 손상되었거나 처음부터 다시 시작하고 싶은 경우 현재 프로필을 기본값으로 재설정하세요."
+	L["reset_desc"] = "설정이 깨졌거나 처음부터 다시 설정을 원하는 경우, 현재 프로필을 기본값으로 초기화하세요."
-	L["reset_sub"] = "현재 프로필을 기본값으로 재설정합니다"
+	L["reset_sub"] = "현재 프로필을 기본값으로 초기화합니다"
 elseif LOCALE == "esES" or LOCALE == "esMX" then
 	L["choose"] = "Perfiles existentes"
 	L["choose_desc"] = "Puedes crear un nuevo perfil introduciendo un nombre en el recuadro o puedes seleccionar un perfil de los ya existentes."
@@ -166,31 +170,31 @@ elseif LOCALE == "zhCN" then
 elseif LOCALE == "ruRU" then
 	L["choose"] = "Существующие профили"
 	L["choose_desc"] = "Вы можете создать новый профиль, введя название в поле ввода, или выбрать один из уже существующих профилей."
-	L["choose_sub"] = "Выбор одного из уже доступных профилей."
+	L["choose_sub"] = "Выбор одиного из уже доступных профилей"
 	L["copy"] = "Скопировать из"
-	L["copy_desc"] = "Копирование настроек из выбранного профиля в активный."
+	L["copy_desc"] = "Скопировать настройки из выбранного профиля в активный."
 	L["current"] = "Текущий профиль:"
 	L["default"] = "По умолчанию"
 	L["delete"] = "Удалить профиль"
-	L["delete_confirm"] = "Вы уверены, что хотите удалить выбранный профиль?"
+	L["delete_confirm"] = "Вы уверены, что вы хотите удалить выбранный профиль?"
-	L["delete_desc"] = "Удаление существующего и неиспользуемого профиля из базы данных для сохранения места, и очистка файла SavedVariables."
+	L["delete_desc"] = "Удалить существующий и неиспользуемый профиль из БД для сохранения места, и очистить SavedVariables файл."
-	L["delete_sub"] = "Удаление профиля из базы данных."
+	L["delete_sub"] = "Удаление профиля из БД"
-	L["intro"] = "Изменяя активный профиль, Вы можете задать разные настройки для каждого персонажа."
+	L["intro"] = "Изменяя активный профиль, вы можете задать различные настройки модификаций для каждого персонажа."
 	L["new"] = "Новый"
-	L["new_sub"] = "Создание нового чистого профиля."
+	L["new_sub"] = "Создать новый чистый профиль"
 	L["profiles"] = "Профили"
 	L["profiles_sub"] = "Управление профилями"
-	L["reset"] = "Сбросить профиль"
+	L["reset"] = "Сброс профиля"
-	L["reset_desc"] = "Сброс текущего профиля к стандартным настройкам, если Ваша конфигурация испорчена или Вы хотите настроить все заново."
+	L["reset_desc"] = "Сбросить текущий профиль к стандартным настройкам, если ваша конфигурация испорчена или вы хотите настроить всё заново."
 	L["reset_sub"] = "Сброс текущего профиля на стандартный"
 elseif LOCALE == "itIT" then
 	L["choose"] = "Profili Esistenti"
 	L["choose_desc"] = "Puoi creare un nuovo profilo digitando il nome della casella di testo, oppure scegliendone uno tra i profili già esistenti."
 	L["choose_sub"] = "Seleziona uno dei profili attualmente disponibili."
 	L["copy"] = "Copia Da"
-	L["copy_desc"] = "Copia le impostazioni da un profilo esistente nel profilo attivo in questo momento."
+	L["copy_desc"] = "Copia le impostazioni da un profilo esistente, nel profilo attivo in questo momento."
 	L["current"] = "Profilo Attivo:"
-	L["default"] = "Predefinito"
+	L["default"] = "Standard"
 	L["delete"] = "Cancella un Profilo"
 	L["delete_confirm"] = "Sei sicuro di voler cancellare il profilo selezionato?"
 	L["delete_desc"] = "Cancella i profili non utilizzati dal database per risparmiare spazio e mantenere puliti i file di configurazione SavedVariables."

ElvUI_OptionsUI/Libraries/Ace3/AceGUI-3.0/AceGUI-3.0.lua

@@ -31,21 +31,26 @@ local AceGUI, oldminor = LibStub:NewLibrary(ACEGUI_MAJOR, ACEGUI_MINOR)
 if not AceGUI then return end -- No upgrade needed
 
 -- Lua APIs
-local tinsert, wipe = table.insert, table.wipe
+local tconcat, tinsert = table.concat, table.insert
 local select, pairs, next, type = select, pairs, next, type
-local error, assert = error, assert
+local error, assert, loadstring = error, assert, loadstring
-local setmetatable, rawget = setmetatable, rawget
+local setmetatable, rawget, rawset = setmetatable, rawget, rawset
-local math_max, math_min, math_ceil = math.max, math.min, math.ceil
+local math_max = math.max
 
 -- WoW APIs
 local UIParent = UIParent
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: geterrorhandler, LibStub
+
+--local con = LibStub("AceConsole-3.0",true)
+
 AceGUI.WidgetRegistry = AceGUI.WidgetRegistry or {}
 AceGUI.LayoutRegistry = AceGUI.LayoutRegistry or {}
 AceGUI.WidgetBase = AceGUI.WidgetBase or {}
 AceGUI.WidgetContainerBase = AceGUI.WidgetContainerBase or {}
 AceGUI.WidgetVersions = AceGUI.WidgetVersions or {}
-AceGUI.tooltip = AceGUI.tooltip or CreateFrame("GameTooltip", "AceGUITooltip", UIParent, "GameTooltipTemplate")
 
 -- local upvalues
 local WidgetRegistry = AceGUI.WidgetRegistry
@@ -61,10 +66,39 @@ local function errorhandler(err)
 	return geterrorhandler()(err)
 end
 
+local function CreateDispatcher(argCount)
+	local code = [[
+		local xpcall, eh = ...
+		local method, ARGS
+		local function call() return method(ARGS) end
+
+		local function dispatch(func, ...)
+			method = func
+			if not method then return end
+			ARGS = ...
+			return xpcall(call, eh)
+		end
+
+		return dispatch
+	]]
+
+	local ARGS = {}
+	for i = 1, argCount do ARGS[i] = "arg"..i end
+	code = code:gsub("ARGS", tconcat(ARGS, ", "))
+	return assert(loadstring(code, "safecall Dispatcher["..argCount.."]"))(xpcall, errorhandler)
+end
+
+local Dispatchers = setmetatable({}, {__index=function(self, argCount)
+	local dispatcher = CreateDispatcher(argCount)
+	rawset(self, argCount, dispatcher)
+	return dispatcher
+end})
+Dispatchers[0] = function(func)
+	return xpcall(func, errorhandler)
+end
+
 local function safecall(func, ...)
-	if func then
+	return Dispatchers[select("#", ...)](func, ...)
-		return xpcall(func, errorhandler, ...)
-	end
 end
 
 -- Recycling functions
@@ -88,38 +122,38 @@ do
 	AceGUI.objPools = AceGUI.objPools or {}
 	local objPools = AceGUI.objPools
 	--Returns a new instance, if none are available either returns a new table or calls the given contructor
-	function newWidget(widgetType)
+	function newWidget(type)
-		if not WidgetRegistry[widgetType] then
+		if not WidgetRegistry[type] then
 			error("Attempt to instantiate unknown widget type", 2)
 		end
 
-		if not objPools[widgetType] then
+		if not objPools[type] then
-			objPools[widgetType] = {}
+			objPools[type] = {}
 		end
 
-		local newObj = next(objPools[widgetType])
+		local newObj = next(objPools[type])
 		if not newObj then
-			newObj = WidgetRegistry[widgetType]()
+			newObj = WidgetRegistry[type]()
-			newObj.AceGUIWidgetVersion = WidgetVersions[widgetType]
+			newObj.AceGUIWidgetVersion = WidgetVersions[type]
 		else
-			objPools[widgetType][newObj] = nil
+			objPools[type][newObj] = nil
 			-- if the widget is older then the latest, don't even try to reuse it
 			-- just forget about it, and grab a new one.
-			if not newObj.AceGUIWidgetVersion or newObj.AceGUIWidgetVersion < WidgetVersions[widgetType] then
+			if not newObj.AceGUIWidgetVersion or newObj.AceGUIWidgetVersion < WidgetVersions[type] then
-				return newWidget(widgetType)
+				return newWidget(type)
 			end
 		end
 		return newObj
 	end
 	-- Releases an instance to the Pool
-	function delWidget(obj,widgetType)
+	function delWidget(obj,type)
-		if not objPools[widgetType] then
+		if not objPools[type] then
-			objPools[widgetType] = {}
+			objPools[type] = {}
 		end
-		if objPools[widgetType][obj] then
+		if objPools[type][obj] then
 			error("Attempt to Release Widget that is already released", 2)
 		end
-		objPools[widgetType][obj] = true
+		objPools[type][obj] = true
 	end
 end
 
@@ -135,9 +169,9 @@ end
 -- OnAcquire function on it, before returning.
 -- @param type The type of the widget.
 -- @return The newly created widget.
-function AceGUI:Create(widgetType)
+function AceGUI:Create(type)
-	if WidgetRegistry[widgetType] then
+	if WidgetRegistry[type] then
-		local widget = newWidget(widgetType)
+		local widget = newWidget(type)
 
 		if rawget(widget, "Acquire") then
 			widget.OnAcquire = widget.Acquire
@@ -155,7 +189,7 @@ function AceGUI:Create(widgetType)
 		if widget.OnAcquire then
 			widget:OnAcquire()
 		else
-			error(("Widget type %s doesn't supply an OnAcquire Function"):format(widgetType))
+			error(("Widget type %s doesn't supply an OnAcquire Function"):format(type))
 		end
 		-- Set the default Layout ("List")
 		safecall(widget.SetLayout, widget, "List")
@@ -583,25 +617,25 @@ AceGUI.counts = AceGUI.counts or {}
 -- This is used by widgets that require a named frame, e.g. when a Blizzard
 -- Template requires it.
 -- @param type The widget type
-function AceGUI:GetNextWidgetNum(widgetType)
+function AceGUI:GetNextWidgetNum(type)
-	if not self.counts[widgetType] then
+	if not self.counts[type] then
-		self.counts[widgetType] = 0
+		self.counts[type] = 0
 	end
-	self.counts[widgetType] = self.counts[widgetType] + 1
+	self.counts[type] = self.counts[type] + 1
-	return self.counts[widgetType]
+	return self.counts[type]
 end
 
 --- Return the number of created widgets for this type.
 -- In contrast to GetNextWidgetNum, the number is not incremented.
--- @param widgetType The widget type
+-- @param type The widget type
-function AceGUI:GetWidgetCount(widgetType)
+function AceGUI:GetWidgetCount(type)
-	return self.counts[widgetType] or 0
+	return self.counts[type] or 0
 end
 
 --- Return the version of the currently registered widget type.
--- @param widgetType The widget type
+-- @param type The widget type
-function AceGUI:GetWidgetVersion(widgetType)
+function AceGUI:GetWidgetVersion(type)
-	return WidgetVersions[widgetType]
+	return WidgetVersions[type]
 end
 
 -------------
@@ -764,6 +798,7 @@ AceGUI:RegisterLayout("Flow",
 
 				usedwidth = 0
 				rowstart = frame
+				rowstartoffset = frameoffset
 
 				if child.DoLayout then
 					child:DoLayout()
@@ -806,8 +841,7 @@ local GetCellAlign = function (dir, tableObj, colObj, cellObj, cell, child)
 			or colObj and (colObj["align" .. dir] or colObj.align)
 			or tableObj["align" .. dir] or tableObj.align
 			or "CENTERLEFT"
-	local val
+	local child, cell, val = child or 0, cell or 0, nil
-	child, cell = child or 0, cell or 0
 
 	if type(fn) == "string" then
 		fn = fn:lower()
@@ -821,7 +855,7 @@ local GetCellAlign = function (dir, tableObj, colObj, cellObj, cell, child)
 		val = fn
 	end
 
-	return fn, math_max(0, math_min(val, cell))
+	return fn, max(0, min(val, cell))
 end
 
 -- Get width or height for multiple cells combined
@@ -830,7 +864,7 @@ local GetCellDimension = function (dir, laneDim, from, to, space)
 	for cell=from,to do
 		dim = dim + (laneDim[cell] or 0)
 	end
-	return dim + math_max(0, to - from) * (space or 0)
+	return dim + max(0, to - from) * (space or 0)
 end
 
 --[[ Options
@@ -876,7 +910,7 @@ AceGUI:RegisterLayout("Table",
 				repeat
 					n = n + 1
 					local col = (n - 1) % #cols + 1
-					local row = math_ceil(n / #cols)
+					local row = ceil(n / #cols)
 					local rowspan = rowspans[col]
 					local cell = rowspan and rowspan.child or child
 					local cellObj = cell:GetUserData("cell")
@@ -892,7 +926,7 @@ AceGUI:RegisterLayout("Table",
 					end
 
 					-- Colspan
-					local colspan = math_max(0, math_min((cellObj and cellObj.colspan or 1) - 1, #cols - col))
+					local colspan = max(0, min((cellObj and cellObj.colspan or 1) - 1, #cols - col))
 					n = n + colspan
 
 					-- Place the cell
@@ -909,7 +943,7 @@ AceGUI:RegisterLayout("Table",
 			end
 		end
 
-		local rows = math_ceil(n / #cols)
+		local rows = ceil(n / #cols)
 
 		-- Determine fixed size cols and collect weights
 		local extantH, totalWeight = totalH, 0
@@ -934,16 +968,16 @@ AceGUI:RegisterLayout("Table",
 							f:ClearAllPoints()
 							local childH = f:GetWidth() or 0
 
-							laneH[col] = math_max(laneH[col], childH - GetCellDimension("H", laneH, colStart[child], col - 1, spaceH))
+							laneH[col] = max(laneH[col], childH - GetCellDimension("H", laneH, colStart[child], col - 1, spaceH))
 						end
 					end
 
-					laneH[col] = math_max(colObj.min or colObj[1] or 0, math_min(laneH[col], colObj.max or colObj[2] or laneH[col]))
+					laneH[col] = max(colObj.min or colObj[1] or 0, min(laneH[col], colObj.max or colObj[2] or laneH[col]))
 				else
 					-- Rel./Abs. width
 					laneH[col] = colObj.width < 1 and colObj.width * totalH or colObj.width
 				end
-				extantH = math_max(0, extantH - laneH[col])
+				extantH = max(0, extantH - laneH[col])
 			end
 		end
 
@@ -982,7 +1016,7 @@ AceGUI:RegisterLayout("Table",
 						child:DoLayout()
 					end
 
-					rowV = math_max(rowV, (f:GetHeight() or 0) - GetCellDimension("V", laneV, rowStart[child], row - 1, spaceV))
+					rowV = max(rowV, (f:GetHeight() or 0) - GetCellDimension("V", laneV, rowStart[child], row - 1, spaceV))
 				end
 			end
 

ElvUI_OptionsUI/Libraries/Ace3/AceGUI-3.0/AceGUI-3.0.xml

@@ -13,6 +13,7 @@
 	<Script file="widgets\AceGUIContainer-Window.lua"/>
 	<!-- Widgets -->
 	<Script file="widgets\AceGUIWidget-Button.lua"/>
+	<Script file="widgets\AceGUIWidget-Button-ElvUI.lua"/>
 	<Script file="widgets\AceGUIWidget-CheckBox.lua"/>
 	<Script file="widgets\AceGUIWidget-ColorPicker.lua"/>
 	<Script file="widgets\AceGUIWidget-DropDown.lua"/>

ElvUI_OptionsUI/Libraries/Ace3/AceGUI-3.0/widgets/AceGUIContainer-BlizOptionsGroup.lua

@@ -2,7 +2,7 @@
 BlizOptionsGroup Container
 Simple container widget for the integration of AceGUI into the Blizzard Interface Options
 -------------------------------------------------------------------------------]]
-local Type, Version = "BlizOptionsGroup", 26
+local Type, Version = "BlizOptionsGroup", 21
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -99,11 +99,7 @@ local methods = {
 Constructor
 -------------------------------------------------------------------------------]]
 local function Constructor()
-	-- CoA-compat: InterfaceOptionsFramePanelContainer is a global from the stock 3.3.5
+	local frame = CreateFrame("Frame")
-	-- Interface Options frame; on the CoA reworked FrameXML it can be nil at the time
-	-- AceGUI widgets are constructed. Fall back to UIParent so CreateFrame doesn't blow up.
-	local _parent = InterfaceOptionsFramePanelContainer or UIParent
-	local frame = CreateFrame("Frame", nil, _parent)
 	frame:Hide()
 
 	-- support functions for the Blizzard Interface Options
@@ -112,11 +108,6 @@ local function Constructor()
 	frame.default = default
 	frame.refresh = refresh
 
-	-- 10.0 support function aliases (cancel has been removed)
-	frame.OnCommit = okay
-	frame.OnDefault = default
-	frame.OnRefresh = refresh
-
 	frame:SetScript("OnHide", OnHide)
 	frame:SetScript("OnShow", OnShow)
 

ElvUI_OptionsUI/Libraries/Ace3/AceGUI-3.0/widgets/AceGUIContainer-DropDownGroup.lua

@@ -2,7 +2,7 @@
 DropdownGroup Container
 Container controlled by a dropdown on the top.
 -------------------------------------------------------------------------------]]
-local Type, Version = "DropdownGroup", 22
+local Type, Version = "DropdownGroup", 21
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -125,7 +125,7 @@ local function Constructor()
 	dropdown.frame:Show()
 	dropdown:SetLabel("")
 
-	local border = CreateFrame("Frame", nil, frame, "BackdropTemplate")
+	local border = CreateFrame("Frame", nil, frame)
 	border:SetPoint("TOPLEFT", 0, -26)
 	border:SetPoint("BOTTOMRIGHT", 0, 3)
 	border:SetBackdrop(PaneBackdrop)

ElvUI_OptionsUI/Libraries/Ace3/AceGUI-3.0/widgets/AceGUIContainer-Frame.lua

@@ -1,7 +1,7 @@
 --[[-----------------------------------------------------------------------------
 Frame Container
 -------------------------------------------------------------------------------]]
-local Type, Version = "Frame", 30
+local Type, Version = "Frame", 25
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -13,11 +13,15 @@ local wipe = table.wipe
 local PlaySound = PlaySound
 local CreateFrame, UIParent = CreateFrame, UIParent
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: CLOSE
+
 --[[-----------------------------------------------------------------------------
 Scripts
 -------------------------------------------------------------------------------]]
 local function Button_OnClick(frame)
-	PlaySound(799) -- SOUNDKIT.GS_TITLE_OPTION_EXIT
+	PlaySound("gsTitleOptionExit")
 	frame.obj:Hide()
 end
 
@@ -79,7 +83,6 @@ 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()
@@ -176,21 +179,16 @@ local PaneBackdrop  = {
 }
 
 local function Constructor()
-	local frame = CreateFrame("Frame", nil, UIParent, "BackdropTemplate")
+	local frame = CreateFrame("Frame", nil, UIParent)
 	frame:Hide()
 
 	frame:EnableMouse(true)
 	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)
-	if frame.SetResizeBounds then -- WoW 10.0
+	frame:SetMinResize(400, 200)
-		frame:SetResizeBounds(400, 200)
-	else
-		frame:SetMinResize(400, 200)
-	end
 	frame:SetToplevel(true)
 	frame:SetScript("OnShow", Frame_OnShow)
 	frame:SetScript("OnHide", Frame_OnClose)
@@ -203,7 +201,7 @@ local function Constructor()
 	closebutton:SetWidth(100)
 	closebutton:SetText(CLOSE)
 
-	local statusbg = CreateFrame("Button", nil, frame, "BackdropTemplate")
+	local statusbg = CreateFrame("Button", nil, frame)
 	statusbg:SetPoint("BOTTOMLEFT", 15, 15)
 	statusbg:SetPoint("BOTTOMRIGHT", -132, 15)
 	statusbg:SetHeight(24)
@@ -271,7 +269,7 @@ local function Constructor()
 	line2:SetHeight(8)
 	line2:SetPoint("BOTTOMRIGHT", -8, 8)
 	line2:SetTexture("Interface\\Tooltips\\UI-Tooltip-Border")
-	x = 0.1 * 8/17
+	local x = 0.1 * 8/17
 	line2:SetTexCoord(0.05 - x, 0.5, 0.05, 0.5 + x, 0.05, 0.5 - x, 0.5 + x, 0.5)
 
 	local sizer_s = CreateFrame("Frame", nil, frame)

ElvUI_OptionsUI/Libraries/Ace3/AceGUI-3.0/widgets/AceGUIContainer-InlineGroup.lua

@@ -2,7 +2,7 @@
 InlineGroup Container
 Simple container widget that creates a visible "box" with an optional title.
 -------------------------------------------------------------------------------]]
-local Type, Version = "InlineGroup", 22
+local Type, Version = "InlineGroup", 21
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -75,7 +75,7 @@ local function Constructor()
 	titletext:SetJustifyH("LEFT")
 	titletext:SetHeight(18)
 
-	local border = CreateFrame("Frame", nil, frame, "BackdropTemplate")
+	local border = CreateFrame("Frame", nil, frame)
 	border:SetPoint("TOPLEFT", 0, -17)
 	border:SetPoint("BOTTOMRIGHT", -1, 3)
 	border:SetBackdrop(PaneBackdrop)

ElvUI_OptionsUI/Libraries/Ace3/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua

@@ -187,7 +187,7 @@ local function Constructor()
 
 	local scrollbg = scrollbar:CreateTexture(nil, "BACKGROUND")
 	scrollbg:SetAllPoints(scrollbar)
-	scrollbg:SetColorTexture(0, 0, 0, 0.4)
+	scrollbg:SetTexture(0, 0, 0, 0.4)
 
 	--Container Support
 	local content = CreateFrame("Frame", nil, scrollframe)

ElvUI_OptionsUI/Libraries/Ace3/AceGUI-3.0/widgets/AceGUIContainer-TabGroup.lua

@@ -2,18 +2,22 @@
 TabGroup Container
 Container that uses tabs on top to switch between groups.
 -------------------------------------------------------------------------------]]
-local Type, Version = "TabGroup", 38
+local Type, Version = "TabGroup", 31
 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, table.wipe
+local pairs, ipairs, assert, type, wipe = pairs, ipairs, assert, type, wipe
 
 -- WoW APIs
 local PlaySound = PlaySound
 local CreateFrame, UIParent = CreateFrame, UIParent
 local _G = _G
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: PanelTemplates_TabResize, PanelTemplates_SetDisabledTabState, PanelTemplates_SelectTab, PanelTemplates_DeselectTab
+
 -- local upvalue storage used by BuildTabs
 local widths = {}
 local rowwidths = {}
@@ -22,143 +26,6 @@ local rowends = {}
 --[[-----------------------------------------------------------------------------
 Support functions
 -------------------------------------------------------------------------------]]
-
-local function PanelTemplates_TabResize(tab, padding, absoluteSize, minWidth, maxWidth, absoluteTextSize)
-	local tabName = tab:GetName();
-
-	local buttonMiddle = tab.Middle or tab.middleTexture or _G[tabName.."Middle"];
-	local buttonMiddleDisabled = tab.MiddleDisabled or (tabName and _G[tabName.."MiddleDisabled"]);
-	local left = tab.Left or tab.leftTexture or _G[tabName.."Left"];
-	local sideWidths = 2 * left:GetWidth();
-	local tabText = tab.Text or _G[tab:GetName().."Text"];
-	local highlightTexture = tab.HighlightTexture or (tabName and _G[tabName.."HighlightTexture"]);
-
-	local width, tabWidth;
-	local textWidth;
-	if ( absoluteTextSize ) then
-		textWidth = absoluteTextSize;
-	else
-		tabText:SetWidth(0);
-		textWidth = tabText:GetWidth();
-	end
-	-- If there's an absolute size specified then use it
-	if ( absoluteSize ) then
-		if ( absoluteSize < sideWidths) then
-			width = 1;
-			tabWidth = sideWidths
-		else
-			width = absoluteSize - sideWidths;
-			tabWidth = absoluteSize
-		end
-		tabText:SetWidth(width);
-	else
-		-- Otherwise try to use padding
-		if ( padding ) then
-			width = textWidth + padding;
-		else
-			width = textWidth + 24;
-		end
-		-- If greater than the maxWidth then cap it
-		if ( maxWidth and width > maxWidth ) then
-			if ( padding ) then
-				width = maxWidth + padding;
-			else
-				width = maxWidth + 24;
-			end
-			tabText:SetWidth(width);
-		else
-			tabText:SetWidth(0);
-		end
-		if (minWidth and width < minWidth) then
-			width = minWidth;
-		end
-		tabWidth = width + sideWidths;
-	end
-
-	if ( buttonMiddle ) then
-		buttonMiddle:SetWidth(width);
-	end
-	if ( buttonMiddleDisabled ) then
-		buttonMiddleDisabled:SetWidth(width);
-	end
-
-	tab:SetWidth(tabWidth);
-
-	if ( highlightTexture ) then
-		highlightTexture:SetWidth(tabWidth);
-	end
-end
-
-local function PanelTemplates_DeselectTab(tab)
-	local name = tab:GetName();
-
-	local left = tab.Left or _G[name.."Left"];
-	local middle = tab.Middle or _G[name.."Middle"];
-	local right = tab.Right or _G[name.."Right"];
-	left:Show();
-	middle:Show();
-	right:Show();
-	--tab:UnlockHighlight();
-	tab:Enable();
-	local text = tab.Text or _G[name.."Text"];
-	text:SetPoint("CENTER", tab, "CENTER", (tab.deselectedTextX or 0), (tab.deselectedTextY or 2));
-
-	local leftDisabled = tab.LeftDisabled or _G[name.."LeftDisabled"];
-	local middleDisabled = tab.MiddleDisabled or _G[name.."MiddleDisabled"];
-	local rightDisabled = tab.RightDisabled or _G[name.."RightDisabled"];
-	leftDisabled:Hide();
-	middleDisabled:Hide();
-	rightDisabled:Hide();
-end
-
-local function PanelTemplates_SelectTab(tab)
-	local name = tab:GetName();
-
-	local left = tab.Left or _G[name.."Left"];
-	local middle = tab.Middle or _G[name.."Middle"];
-	local right = tab.Right or _G[name.."Right"];
-	left:Hide();
-	middle:Hide();
-	right:Hide();
-	--tab:LockHighlight();
-	tab:Disable();
-	tab:SetDisabledFontObject(GameFontHighlightSmall);
-	local text = tab.Text or _G[name.."Text"];
-	text:SetPoint("CENTER", tab, "CENTER", (tab.selectedTextX or 0), (tab.selectedTextY or -3));
-
-	local leftDisabled = tab.LeftDisabled or _G[name.."LeftDisabled"];
-	local middleDisabled = tab.MiddleDisabled or _G[name.."MiddleDisabled"];
-	local rightDisabled = tab.RightDisabled or _G[name.."RightDisabled"];
-	leftDisabled:Show();
-	middleDisabled:Show();
-	rightDisabled:Show();
-
-	if GameTooltip:IsOwned(tab) then
-		GameTooltip:Hide();
-	end
-end
-
-local function PanelTemplates_SetDisabledTabState(tab)
-	local name = tab:GetName();
-	local left = tab.Left or _G[name.."Left"];
-	local middle = tab.Middle or _G[name.."Middle"];
-	local right = tab.Right or _G[name.."Right"];
-	left:Show();
-	middle:Show();
-	right:Show();
-	--tab:UnlockHighlight();
-	tab:Disable();
-	tab.text = tab:GetText();
-	-- Gray out text
-	tab:SetDisabledFontObject(GameFontDisableSmall);
-	local leftDisabled = tab.LeftDisabled or _G[name.."LeftDisabled"];
-	local middleDisabled = tab.MiddleDisabled or _G[name.."MiddleDisabled"];
-	local rightDisabled = tab.RightDisabled or _G[name.."RightDisabled"];
-	leftDisabled:Hide();
-	middleDisabled:Hide();
-	rightDisabled:Hide();
-end
-
 local function UpdateTabLook(frame)
 	if frame.disabled then
 		PanelTemplates_SetDisabledTabState(frame)
@@ -172,7 +39,7 @@ end
 local function Tab_SetText(frame, text)
 	frame:_SetText(text)
 	local width = frame.obj.frame.width or frame.obj.frame:GetWidth() or 0
-	PanelTemplates_TabResize(frame, 0, nil, nil, width, frame:GetFontString():GetStringWidth())
+	PanelTemplates_TabResize(frame, 0, nil, width)
 end
 
 local function Tab_SetSelected(frame, selected)
@@ -196,7 +63,7 @@ Scripts
 -------------------------------------------------------------------------------]]
 local function Tab_OnClick(frame)
 	if not (frame.selected or frame.disabled) then
-		PlaySound(841) -- SOUNDKIT.IG_CHARACTER_INFO_TAB
+		PlaySound("igCharacterInfoTab")
 		frame.obj:SelectTab(frame.value)
 	end
 end
@@ -236,64 +103,11 @@ local methods = {
 
 	["CreateTab"] = function(self, id)
 		local tabname = ("AceGUITabGroup%dTab%d"):format(self.num, id)
-		local tab = CreateFrame("Button", tabname, self.border)
+		local tab = CreateFrame("Button", tabname, self.border, "OptionsFrameTabButtonTemplate")
-		tab:SetSize(115, 24)
-		tab.deselectedTextY = -3
-		tab.selectedTextY = -2
-
-		tab.LeftDisabled = tab:CreateTexture(tabname .. "LeftDisabled", "BORDER")
-		tab.LeftDisabled:SetTexture("Interface\\OptionsFrame\\UI-OptionsFrame-ActiveTab")
-		tab.LeftDisabled:SetSize(20, 24)
-		tab.LeftDisabled:SetPoint("BOTTOMLEFT", 0, -3)
-		tab.LeftDisabled:SetTexCoord(0, 0.15625, 0, 1.0)
-
-		tab.MiddleDisabled = tab:CreateTexture(tabname .. "MiddleDisabled", "BORDER")
-		tab.MiddleDisabled:SetTexture("Interface\\OptionsFrame\\UI-OptionsFrame-ActiveTab")
-		tab.MiddleDisabled:SetSize(88, 24)
-		tab.MiddleDisabled:SetPoint("LEFT", tab.LeftDisabled, "RIGHT")
-		tab.MiddleDisabled:SetTexCoord(0.15625, 0.84375, 0, 1.0)
-
-		tab.RightDisabled = tab:CreateTexture(tabname .. "RightDisabled", "BORDER")
-		tab.RightDisabled:SetTexture("Interface\\OptionsFrame\\UI-OptionsFrame-ActiveTab")
-		tab.RightDisabled:SetSize(20, 24)
-		tab.RightDisabled:SetPoint("LEFT", tab.MiddleDisabled, "RIGHT")
-		tab.RightDisabled:SetTexCoord(0.84375, 1.0, 0, 1.0)
-
-		tab.Left = tab:CreateTexture(tabname .. "Left", "BORDER")
-		tab.Left:SetTexture("Interface\\OptionsFrame\\UI-OptionsFrame-InActiveTab")
-		tab.Left:SetSize(20, 24)
-		tab.Left:SetPoint("TOPLEFT")
-		tab.Left:SetTexCoord(0, 0.15625, 0, 1.0)
-
-		tab.Middle = tab:CreateTexture(tabname .. "Middle", "BORDER")
-		tab.Middle:SetTexture("Interface\\OptionsFrame\\UI-OptionsFrame-InActiveTab")
-		tab.Middle:SetSize(88, 24)
-		tab.Middle:SetPoint("LEFT", tab.Left, "RIGHT")
-		tab.Middle:SetTexCoord(0.15625, 0.84375, 0, 1.0)
-
-		tab.Right = tab:CreateTexture(tabname .. "Right", "BORDER")
-		tab.Right:SetTexture("Interface\\OptionsFrame\\UI-OptionsFrame-InActiveTab")
-		tab.Right:SetSize(20, 24)
-		tab.Right:SetPoint("LEFT", tab.Middle, "RIGHT")
-		tab.Right:SetTexCoord(0.84375, 1.0, 0, 1.0)
-
-		tab.Text = tab:CreateFontString(tabname .. "Text")
-		tab:SetFontString(tab.Text)
-
-		tab:SetNormalFontObject(GameFontNormalSmall)
-		tab:SetHighlightFontObject(GameFontHighlightSmall)
-		tab:SetDisabledFontObject(GameFontHighlightSmall)
-		tab:SetHighlightTexture("Interface\\PaperDollInfoFrame\\UI-Character-Tab-Highlight", "ADD")
-		tab.HighlightTexture = tab:GetHighlightTexture()
-		tab.HighlightTexture:ClearAllPoints()
-		tab.HighlightTexture:SetPoint("LEFT", tab, "LEFT", 10, -4)
-		tab.HighlightTexture:SetPoint("RIGHT", tab, "RIGHT", -10, -4)
-		_G[tabname .. "HighlightTexture"] = tab.HighlightTexture
-
 		tab.obj = self
 		tab.id = id
 
-		tab.text = tab.Text -- compat
+		tab.text = _G[tabname .. "Text"]
 		tab.text:ClearAllPoints()
 		tab.text:SetPoint("LEFT", 14, -3)
 		tab.text:SetPoint("RIGHT", -12, -3)
@@ -441,7 +255,7 @@ local methods = {
 			end
 
 			for i = starttab, endtab do
-				PanelTemplates_TabResize(tabs[i], padding + 4, nil, nil, width, tabs[i]:GetFontString():GetStringWidth())
+				PanelTemplates_TabResize(tabs[i], padding + 4, nil, width)
 			end
 			starttab = endtab + 1
 		end
@@ -502,7 +316,7 @@ local function Constructor()
 	titletext:SetHeight(18)
 	titletext:SetText("")
 
-	local border = CreateFrame("Frame", nil, frame, "BackdropTemplate")
+	local border = CreateFrame("Frame", nil, frame)
 	border:SetPoint("TOPLEFT", 1, -27)
 	border:SetPoint("BOTTOMRIGHT", -1, 3)
 	border:SetBackdrop(PaneBackdrop)

ElvUI_OptionsUI/Libraries/Ace3/AceGUI-3.0/widgets/AceGUIContainer-TreeGroup.lua

@@ -2,18 +2,22 @@
 TreeGroup Container
 Container that uses a tree control to switch between groups.
 -------------------------------------------------------------------------------]]
-local Type, Version = "TreeGroup", 49
+local Type, Version = "TreeGroup", 43
 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 next, pairs, ipairs, assert, type = next, pairs, ipairs, assert, type
-local math_min, math_max, floor = math.min, math.max, math.floor
+local math_min, math_max, floor = math.min, math.max, floor
 local select, tremove, unpack, tconcat = select, table.remove, unpack, table.concat
 
 -- WoW APIs
 local CreateFrame, UIParent = CreateFrame, UIParent
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: GameTooltip, FONT_COLOR_CODE_CLOSE
+
 -- Recycling functions
 local new, del
 do
@@ -155,7 +159,7 @@ end
 local function FirstFrameUpdate(frame)
 	local self = frame.obj
 	frame:SetScript("OnUpdate", nil)
-	self:RefreshTree(nil, true)
+	self:RefreshTree()
 end
 
 local function BuildUniqueValue(...)
@@ -202,13 +206,11 @@ local function Button_OnEnter(frame)
 	self:Fire("OnButtonEnter", frame.uniquevalue, frame)
 
 	if self.enabletooltips then
-		local tooltip = AceGUI.tooltip
+		GameTooltip:SetOwner(frame, "ANCHOR_NONE")
-		tooltip:SetOwner(frame, "ANCHOR_NONE")
+		GameTooltip:SetPoint("LEFT",frame,"RIGHT")
-		tooltip:ClearAllPoints()
+		GameTooltip:SetText(frame.text:GetText() or "", 1, .82, 0, 1)
-		tooltip:SetPoint("LEFT",frame,"RIGHT")
-		tooltip:SetText(frame.text:GetText() or "", 1, .82, 0, 1, true)
 
-		tooltip:Show()
+		GameTooltip:Show()
 	end
 end
 
@@ -217,7 +219,7 @@ local function Button_OnLeave(frame)
 	self:Fire("OnButtonLeave", frame.uniquevalue, frame)
 
 	if self.enabletooltips then
-		AceGUI.tooltip:Hide()
+		GameTooltip:Hide()
 	end
 end
 
@@ -225,7 +227,7 @@ local function OnScrollValueChanged(frame, value)
 	if frame.obj.noupdate then return end
 	local self = frame.obj
 	local status = self.status or self.localstatus
-	status.scrollvalue = floor(value + 0.5)
+	status.scrollvalue = value
 	self:RefreshTree()
 	AceGUI:ClearFocus()
 end
@@ -290,13 +292,10 @@ local methods = {
 	["OnAcquire"] = function(self)
 		self:SetTreeWidth(DEFAULT_TREE_WIDTH, DEFAULT_TREE_SIZABLE)
 		self:EnableButtonTooltips(true)
-		self.frame:SetScript("OnUpdate", FirstFrameUpdate)
 	end,
 
 	["OnRelease"] = function(self)
 		self.status = nil
-		self.tree = nil
-		self.frame:SetScript("OnUpdate", nil)
 		for k, v in pairs(self.localstatus) do
 			if k == "groups" then
 				for k2 in pairs(v) do
@@ -384,9 +383,13 @@ local methods = {
 		end
 	end,
 
-	["RefreshTree"] = function(self,scrollToSelection,fromOnUpdate)
+	["RefreshTree"] = function(self,scrollToSelection)
 		local buttons = self.buttons
 		local lines = self.lines
+
+		for i, v in ipairs(buttons) do
+			v:Hide()
+		end
 		while lines[1] do
 			local t = tremove(lines)
 			for k in pairs(t) do
@@ -412,11 +415,6 @@ local methods = {
 		local maxlines = (floor(((self.treeframe:GetHeight()or 0) - 20 ) / 18))
 		if maxlines <= 0 then return end
 
-		if self.frame:GetParent() == UIParent and not fromOnUpdate then
-			self.frame:SetScript("OnUpdate", FirstFrameUpdate)
-			return
-		end
-
 		local first, last
 
 		scrollToSelection = status.scrollToSelection
@@ -495,10 +493,6 @@ local methods = {
 			buttonnum = buttonnum + 1
 		end
 
-		-- 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.
-		for i = buttonnum, #buttons do
-			buttons[i]:Hide()
-		end
 	end,
 
 	["SetSelected"] = function(self, value)
@@ -563,11 +557,7 @@ local methods = {
 		if maxtreewidth > 100 and status.treewidth > maxtreewidth then
 			self:SetTreeWidth(maxtreewidth, status.treesizable)
 		end
-		if treeframe.SetResizeBounds then
+		treeframe:SetMaxResize(maxtreewidth, 1600)
-			treeframe:SetResizeBounds(100, 1, maxtreewidth, 1600)
-		else
-			treeframe:SetMaxResize(maxtreewidth, 1600)
-		end
 	end,
 
 	["OnHeightSet"] = function(self, height)
@@ -629,7 +619,7 @@ local PaneBackdrop  = {
 local DraggerBackdrop  = {
 	bgFile = "Interface\\Tooltips\\UI-Tooltip-Background",
 	edgeFile = nil,
-	tile = true, tileSize = 16, edgeSize = 1,
+	tile = true, tileSize = 16, edgeSize = 0,
 	insets = { left = 3, right = 3, top = 7, bottom = 7 }
 }
 
@@ -637,7 +627,7 @@ local function Constructor()
 	local num = AceGUI:GetNextWidgetNum(Type)
 	local frame = CreateFrame("Frame", nil, UIParent)
 
-	local treeframe = CreateFrame("Frame", nil, frame, "BackdropTemplate")
+	local treeframe = CreateFrame("Frame", nil, frame)
 	treeframe:SetPoint("TOPLEFT")
 	treeframe:SetPoint("BOTTOMLEFT")
 	treeframe:SetWidth(DEFAULT_TREE_WIDTH)
@@ -646,17 +636,13 @@ local function Constructor()
 	treeframe:SetBackdropColor(0.1, 0.1, 0.1, 0.5)
 	treeframe:SetBackdropBorderColor(0.4, 0.4, 0.4)
 	treeframe:SetResizable(true)
-	if treeframe.SetResizeBounds then -- WoW 10.0
+	treeframe:SetMinResize(100, 1)
-		treeframe:SetResizeBounds(100, 1, 400, 1600)
+	treeframe:SetMaxResize(400, 1600)
-	else
-		treeframe:SetMinResize(100, 1)
-		treeframe:SetMaxResize(400, 1600)
-	end
 	treeframe:SetScript("OnUpdate", FirstFrameUpdate)
 	treeframe:SetScript("OnSizeChanged", Tree_OnSizeChanged)
 	treeframe:SetScript("OnMouseWheel", Tree_OnMouseWheel)
 
-	local dragger = CreateFrame("Frame", nil, treeframe, "BackdropTemplate")
+	local dragger = CreateFrame("Frame", nil, treeframe)
 	dragger:SetWidth(8)
 	dragger:SetPoint("TOP", treeframe, "TOPRIGHT")
 	dragger:SetPoint("BOTTOM", treeframe, "BOTTOMRIGHT")
@@ -679,9 +665,9 @@ local function Constructor()
 
 	local scrollbg = scrollbar:CreateTexture(nil, "BACKGROUND")
 	scrollbg:SetAllPoints(scrollbar)
-	scrollbg:SetColorTexture(0,0,0,0.4)
+	scrollbg:SetTexture(0,0,0,0.4)
 
-	local border = CreateFrame("Frame", nil, frame, "BackdropTemplate")
+	local border = CreateFrame("Frame",nil,frame)
 	border:SetPoint("TOPLEFT", treeframe, "TOPRIGHT")
 	border:SetPoint("BOTTOMRIGHT")
 	border:SetBackdrop(PaneBackdrop)

ElvUI_OptionsUI/Libraries/Ace3/AceGUI-3.0/widgets/AceGUIContainer-Window.lua

@@ -7,6 +7,10 @@ local pairs, assert, type = pairs, assert, type
 local PlaySound = PlaySound
 local CreateFrame, UIParent = CreateFrame, UIParent
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: GameFontNormal
+
 ----------------
 -- Main Frame --
 ----------------
@@ -17,7 +21,7 @@ local CreateFrame, UIParent = CreateFrame, UIParent
 ]]
 do
 	local Type = "Window"
-	local Version = 8
+	local Version = 5
 
 	local function frameOnShow(this)
 		this.obj:Fire("OnShow")
@@ -28,7 +32,7 @@ do
 	end
 
 	local function closeOnClick(this)
-		PlaySound(799) -- SOUNDKIT.GS_TITLE_OPTION_EXIT
+		PlaySound("gsTitleOptionExit")
 		this.obj:Hide()
 	end
 
@@ -182,75 +186,71 @@ do
 
 		frame:SetScript("OnShow",frameOnShow)
 		frame:SetScript("OnHide",frameOnClose)
-		if frame.SetResizeBounds then -- WoW 10.0
+		frame:SetMinResize(240,240)
-			frame:SetResizeBounds(240,240)
-		else
-			frame:SetMinResize(240,240)
-		end
 		frame:SetToplevel(true)
 
 		local titlebg = frame:CreateTexture(nil, "BACKGROUND")
-		titlebg:SetTexture("Interface\\PaperDollInfoFrame\\UI-GearManager-Title-Background")
+		titlebg:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Title-Background]])
 		titlebg:SetPoint("TOPLEFT", 9, -6)
 		titlebg:SetPoint("BOTTOMRIGHT", frame, "TOPRIGHT", -28, -24)
 
 		local dialogbg = frame:CreateTexture(nil, "BACKGROUND")
-		dialogbg:SetTexture("Interface\\Tooltips\\UI-Tooltip-Background")
+		dialogbg:SetTexture([[Interface\Tooltips\UI-Tooltip-Background]])
 		dialogbg:SetPoint("TOPLEFT", 8, -24)
 		dialogbg:SetPoint("BOTTOMRIGHT", -6, 8)
 		dialogbg:SetVertexColor(0, 0, 0, .75)
 
 		local topleft = frame:CreateTexture(nil, "BORDER")
-		topleft:SetTexture("Interface\\PaperDollInfoFrame\\UI-GearManager-Border")
+		topleft:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
 		topleft:SetWidth(64)
 		topleft:SetHeight(64)
 		topleft:SetPoint("TOPLEFT")
 		topleft:SetTexCoord(0.501953125, 0.625, 0, 1)
 
 		local topright = frame:CreateTexture(nil, "BORDER")
-		topright:SetTexture("Interface\\PaperDollInfoFrame\\UI-GearManager-Border")
+		topright:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
 		topright:SetWidth(64)
 		topright:SetHeight(64)
 		topright:SetPoint("TOPRIGHT")
 		topright:SetTexCoord(0.625, 0.75, 0, 1)
 
 		local top = frame:CreateTexture(nil, "BORDER")
-		top:SetTexture("Interface\\PaperDollInfoFrame\\UI-GearManager-Border")
+		top:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
 		top:SetHeight(64)
 		top:SetPoint("TOPLEFT", topleft, "TOPRIGHT")
 		top:SetPoint("TOPRIGHT", topright, "TOPLEFT")
 		top:SetTexCoord(0.25, 0.369140625, 0, 1)
 
 		local bottomleft = frame:CreateTexture(nil, "BORDER")
-		bottomleft:SetTexture("Interface\\PaperDollInfoFrame\\UI-GearManager-Border")
+		bottomleft:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
 		bottomleft:SetWidth(64)
 		bottomleft:SetHeight(64)
 		bottomleft:SetPoint("BOTTOMLEFT")
 		bottomleft:SetTexCoord(0.751953125, 0.875, 0, 1)
 
 		local bottomright = frame:CreateTexture(nil, "BORDER")
-		bottomright:SetTexture("Interface\\PaperDollInfoFrame\\UI-GearManager-Border")
+		bottomright:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
 		bottomright:SetWidth(64)
 		bottomright:SetHeight(64)
 		bottomright:SetPoint("BOTTOMRIGHT")
 		bottomright:SetTexCoord(0.875, 1, 0, 1)
 
 		local bottom = frame:CreateTexture(nil, "BORDER")
-		bottom:SetTexture("Interface\\PaperDollInfoFrame\\UI-GearManager-Border")
+		bottom:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
 		bottom:SetHeight(64)
 		bottom:SetPoint("BOTTOMLEFT", bottomleft, "BOTTOMRIGHT")
 		bottom:SetPoint("BOTTOMRIGHT", bottomright, "BOTTOMLEFT")
 		bottom:SetTexCoord(0.376953125, 0.498046875, 0, 1)
 
 		local left = frame:CreateTexture(nil, "BORDER")
-		left:SetTexture("Interface\\PaperDollInfoFrame\\UI-GearManager-Border")
+		left:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
 		left:SetWidth(64)
 		left:SetPoint("TOPLEFT", topleft, "BOTTOMLEFT")
 		left:SetPoint("BOTTOMLEFT", bottomleft, "TOPLEFT")
 		left:SetTexCoord(0.001953125, 0.125, 0, 1)
 
 		local right = frame:CreateTexture(nil, "BORDER")
-		right:SetTexture("Interface\\PaperDollInfoFrame\\UI-GearManager-Border")
+		right:SetTexture([[Interface\PaperDollInfoFrame\UI-GearManager-Border]])
 		right:SetWidth(64)
 		right:SetPoint("TOPRIGHT", topright, "BOTTOMRIGHT")
 		right:SetPoint("BOTTOMRIGHT", bottomright, "TOPRIGHT")
@@ -300,7 +300,7 @@ do
 		line2:SetHeight(8)
 		line2:SetPoint("BOTTOMRIGHT", -8, 8)
 		line2:SetTexture("Interface\\Tooltips\\UI-Tooltip-Border")
-		x = 0.1 * 8/17
+		local x = 0.1 * 8/17
 		line2:SetTexCoord(0.05 - x, 0.5, 0.05, 0.5 + x, 0.05, 0.5 - x, 0.5 + x, 0.5)
 
 		local sizer_s = CreateFrame("Frame",nil,frame)

ElvUI_OptionsUI/Libraries/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Button-ElvUI.lua

@@ -0,0 +1,179 @@
+--[[-----------------------------------------------------------------------------
+Button Widget (Modified to change text color on SetDisabled method)
+Graphical Button.
+-------------------------------------------------------------------------------]]
+local Type, Version = "Button-ElvUI", 2
+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 = pairs
+
+-- WoW APIs
+local _G = _G
+local PlaySound, CreateFrame, UIParent = PlaySound, CreateFrame, UIParent
+local IsShiftKeyDown = IsShiftKeyDown
+-- GLOBALS: GameTooltip, ElvUI
+
+--[[-----------------------------------------------------------------------------
+Scripts
+-------------------------------------------------------------------------------]]
+local dragdropButton
+local function lockTooltip()
+	GameTooltip:SetOwner(UIParent, "ANCHOR_CURSOR")
+	GameTooltip:SetText(" ")
+	GameTooltip:Show()
+end
+local function dragdrop_OnMouseDown(frame, ...)
+	if frame.obj.dragOnMouseDown then
+		dragdropButton.mouseDownFrame = frame
+		dragdropButton:SetText(frame.obj.value or "Unknown")
+		dragdropButton:SetSize(frame:GetSize())
+		frame.obj.dragOnMouseDown(frame, ...)
+	end
+end
+local function dragdrop_OnMouseUp(frame, ...)
+	if frame.obj.dragOnMouseUp then
+		frame:SetAlpha(1)
+		GameTooltip:Hide()
+		dragdropButton:Hide()
+		if dragdropButton.enteredFrame and dragdropButton.enteredFrame ~= frame and dragdropButton.enteredFrame:IsMouseOver() then
+			frame.obj.dragOnMouseUp(frame, ...)
+			frame.obj.ActivateMultiControl(frame.obj, ...)
+		end
+		dragdropButton.enteredFrame = nil
+		dragdropButton.mouseDownFrame = nil
+	end
+end
+local function dragdrop_OnLeave(frame, ...)
+	if frame.obj.dragOnLeave then
+		if dragdropButton.mouseDownFrame then
+			lockTooltip()
+		end
+		if frame == dragdropButton.mouseDownFrame then
+			frame:SetAlpha(0)
+			dragdropButton:Show()
+			frame.obj.dragOnLeave(frame, ...)
+		end
+	end
+end
+local function dragdrop_OnEnter(frame, ...)
+	if frame.obj.dragOnEnter and dragdropButton:IsShown() then
+		dragdropButton.enteredFrame = frame
+		lockTooltip()
+		frame.obj.dragOnEnter(frame, ...)
+	end
+end
+local function dragdrop_OnClick(frame, ...)
+	local button = ...
+	if frame.obj.dragOnClick and button == "RightButton" then
+		frame.obj.dragOnClick(frame, ...)
+		frame.obj.ActivateMultiControl(frame.obj, ...)
+	elseif frame.obj.stateSwitchOnClick and (button == "LeftButton") and IsShiftKeyDown() then
+		frame.obj.stateSwitchOnClick(frame, ...)
+		frame.obj.ActivateMultiControl(frame.obj, ...)
+	end
+end
+
+local function Button_OnClick(frame, ...)
+	AceGUI:ClearFocus()
+	PlaySound("igMainMenuOption")
+	frame.obj:Fire("OnClick", ...)
+end
+
+local function Control_OnEnter(frame)
+	frame.obj:Fire("OnEnter")
+end
+
+local function Control_OnLeave(frame)
+	frame.obj:Fire("OnLeave")
+end
+
+--[[-----------------------------------------------------------------------------
+Methods
+-------------------------------------------------------------------------------]]
+local methods = {
+	["OnAcquire"] = function(self)
+		-- restore default values
+		self:SetHeight(24)
+		self:SetWidth(200)
+		self:SetDisabled(false)
+		self:SetAutoWidth(false)
+		self:SetText()
+	end,
+
+	-- ["OnRelease"] = nil,
+
+	["SetText"] = function(self, text)
+		self.text:SetText(text)
+		if self.autoWidth then
+			self:SetWidth(self.text:GetStringWidth() + 30)
+		end
+	end,
+
+	["SetAutoWidth"] = function(self, autoWidth)
+		self.autoWidth = autoWidth
+		if self.autoWidth then
+			self:SetWidth(self.text:GetStringWidth() + 30)
+		end
+	end,
+
+	["SetDisabled"] = function(self, disabled)
+		self.disabled = disabled
+		if disabled then
+			self.frame:Disable()
+			self.text:SetTextColor(0.4, 0.4, 0.4)
+		else
+			self.frame:Enable()
+			self.text:SetTextColor(1, 0.82, 0)
+		end
+	end
+}
+
+--[[-----------------------------------------------------------------------------
+Constructor
+-------------------------------------------------------------------------------]]
+local function Constructor()
+	local name = "AceGUI30Button" .. AceGUI:GetNextWidgetNum(Type)
+	local frame = CreateFrame("Button", name, UIParent, "UIPanelButtonTemplate2")
+	frame:Hide()
+	frame:EnableMouse(true)
+	frame:RegisterForClicks("AnyUp")
+	frame:SetScript("OnClick", Button_OnClick)
+	frame:SetScript("OnEnter", Control_OnEnter)
+	frame:SetScript("OnLeave", Control_OnLeave)
+
+	-- dragdrop
+	if not dragdropButton then
+		dragdropButton = CreateFrame("Button", "ElvUIAceGUI30DragDropButton", UIParent, "UIPanelButtonTemplate")
+		dragdropButton:SetFrameStrata("TOOLTIP")
+		dragdropButton:SetFrameLevel(5)
+		dragdropButton:SetPoint('BOTTOM', GameTooltip, "BOTTOM", 0, 10)
+		dragdropButton:Hide()
+		ElvUI[1]:GetModule('Skins'):HandleButton(dragdropButton)
+	end
+	frame:HookScript("OnClick", dragdrop_OnClick)
+	frame:HookScript("OnEnter", dragdrop_OnEnter)
+	frame:HookScript("OnLeave", dragdrop_OnLeave)
+	frame:HookScript("OnMouseUp", dragdrop_OnMouseUp)
+	frame:HookScript("OnMouseDown", dragdrop_OnMouseDown)
+
+	local text = frame:GetFontString()
+	text:ClearAllPoints()
+	text:SetPoint("TOPLEFT", 15, -1)
+	text:SetPoint("BOTTOMRIGHT", -15, 1)
+	text:SetJustifyV("MIDDLE")
+
+	local widget = {
+		text  = text,
+		frame = frame,
+		type  = Type
+	}
+	for method, func in pairs(methods) do
+		widget[method] = func
+	end
+
+	return AceGUI:RegisterAsWidget(widget)
+end
+
+AceGUI:RegisterWidgetType(Type, Constructor, Version)

ElvUI_OptionsUI/Libraries/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Button.lua

@@ -2,7 +2,7 @@
 Button Widget
 Graphical Button.
 -------------------------------------------------------------------------------]]
-local Type, Version = "Button", 24
+local Type, Version = "Button", 23
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -18,7 +18,7 @@ Scripts
 -------------------------------------------------------------------------------]]
 local function Button_OnClick(frame, ...)
 	AceGUI:ClearFocus()
-	PlaySound(852) -- SOUNDKIT.IG_MAINMENU_OPTION
+	PlaySound("igMainMenuOption")
 	frame.obj:Fire("OnClick", ...)
 end
 
@@ -74,7 +74,7 @@ Constructor
 -------------------------------------------------------------------------------]]
 local function Constructor()
 	local name = "AceGUI30Button" .. AceGUI:GetNextWidgetNum(Type)
-	local frame = CreateFrame("Button", name, UIParent, "UIPanelButtonTemplate")
+	local frame = CreateFrame("Button", name, UIParent, "UIPanelButtonTemplate2")
 	frame:Hide()
 
 	frame:EnableMouse(true)

ElvUI_OptionsUI/Libraries/Ace3/AceGUI-3.0/widgets/AceGUIWidget-CheckBox.lua

@@ -12,6 +12,10 @@ local select, pairs = select, pairs
 local PlaySound = PlaySound
 local CreateFrame, UIParent = CreateFrame, UIParent
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: SetDesaturation, GameFontHighlight
+
 --[[-----------------------------------------------------------------------------
 Support functions
 -------------------------------------------------------------------------------]]
@@ -56,9 +60,9 @@ local function CheckBox_OnMouseUp(frame)
 		self:ToggleChecked()
 
 		if self.checked then
-			PlaySound(856) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON
+			PlaySound("igMainMenuOptionCheckBoxOn")
 		else -- for both nil and false (tristate)
-			PlaySound(857) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_OFF
+			PlaySound("igMainMenuOptionCheckBoxOff")
 		end
 
 		self:Fire("OnValueChanged", self.checked)
@@ -195,14 +199,13 @@ local methods = {
 	["SetDescription"] = function(self, desc)
 		if desc then
 			if not self.desc then
-				local f = self.frame:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
+				local desc = self.frame:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
-				f:ClearAllPoints()
+				desc:ClearAllPoints()
-				f:SetPoint("TOPLEFT", self.checkbg, "TOPRIGHT", 5, -21)
+				desc:SetPoint("TOPLEFT", self.checkbg, "TOPRIGHT", 5, -21)
-				f:SetWidth(self.frame.width - 30)
+				desc:SetWidth(self.frame.width - 30)
-				f:SetPoint("RIGHT", self.frame, "RIGHT", -30, 0)
+				desc:SetJustifyH("LEFT")
-				f:SetJustifyH("LEFT")
+				desc:SetJustifyV("TOP")
-				f:SetJustifyV("TOP")
+				self.desc = desc
-				self.desc = f
 			end
 			self.desc:Show()
 			--self.text:SetFontObject(GameFontNormal)

ElvUI_OptionsUI/Libraries/Ace3/AceGUI-3.0/widgets/AceGUIWidget-ColorPicker.lua

@@ -1,7 +1,7 @@
 --[[-----------------------------------------------------------------------------
 ColorPicker Widget
 -------------------------------------------------------------------------------]]
-local Type, Version = "ColorPicker", 28
+local Type, Version = "ColorPicker-ElvUI", 25
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -11,24 +11,21 @@ local pairs = pairs
 -- WoW APIs
 local CreateFrame, UIParent = CreateFrame, UIParent
 
--- Unfortunately we have no way to realistically detect if a client uses inverted alpha
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
--- as no API will tell you. Wrath uses the old colorpicker, era uses the new one, both are inverted
+-- List them here for Mikk's FindGlobals script
-local INVERTED_ALPHA = (WOW_PROJECT_ID ~= WOW_PROJECT_MAINLINE)
+-- GLOBALS: ColorPickerFrame, OpacitySliderFrame, ColorPPDefault
 
 --[[-----------------------------------------------------------------------------
 Support functions
 -------------------------------------------------------------------------------]]
 local function ColorCallback(self, r, g, b, a, isAlpha)
-	if INVERTED_ALPHA and a then
+	-- this will block an infinite loop from `E.GrabColorPickerValues`
-		a = 1 - a
+	-- which is caused when we set values into the color picker again on `OnValueChanged`
-	end
+	if ColorPickerFrame.noColorCallback then return end
+
 	if not self.HasAlpha then
 		a = 1
 	end
-	-- no change, skip update
-	if r == self.r and g == self.g and b == self.b and a == self.a then
-		return
-	end
 	self:SetColor(r, g, b, a)
 	if ColorPickerFrame:IsVisible() then
 		--colorpicker is still open
@@ -61,63 +58,37 @@ local function ColorSwatch_OnClick(frame)
 		ColorPickerFrame:SetFrameLevel(frame:GetFrameLevel() + 10)
 		ColorPickerFrame:SetClampedToScreen(true)
 
-		if ColorPickerFrame.SetupColorPickerAndShow then -- 10.2.5 color picker overhaul
+		ColorPickerFrame.func = function()
-			local r2, g2, b2, a2 = self.r, self.g, self.b, (self.a or 1)
+			local r, g, b = ColorPickerFrame:GetColorRGB()
-			if INVERTED_ALPHA then
+			local a = 1 - OpacitySliderFrame:GetValue()
-				a2 = 1 - a2
+			ColorCallback(self, r, g, b, a)
-			end
-
-			local info = {
-				swatchFunc = function()
-					local r, g, b = ColorPickerFrame:GetColorRGB()
-					local a = ColorPickerFrame:GetColorAlpha()
-					ColorCallback(self, r, g, b, a)
-				end,
-
-				hasOpacity = self.HasAlpha,
-				opacityFunc = function()
-					local r, g, b = ColorPickerFrame:GetColorRGB()
-					local a = ColorPickerFrame:GetColorAlpha()
-					ColorCallback(self, r, g, b, a, true)
-				end,
-				opacity = a2,
-
-				cancelFunc = function()
-					ColorCallback(self, r2, g2, b2, a2, true)
-				end,
-
-				r = r2,
-				g = g2,
-				b = b2,
-			}
-
-			ColorPickerFrame:SetupColorPickerAndShow(info)
-		else
-			ColorPickerFrame.func = function()
-				local r, g, b = ColorPickerFrame:GetColorRGB()
-				local a = OpacitySliderFrame:GetValue()
-				ColorCallback(self, r, g, b, a)
-			end
-
-			ColorPickerFrame.hasOpacity = self.HasAlpha
-			ColorPickerFrame.opacityFunc = function()
-				local r, g, b = ColorPickerFrame:GetColorRGB()
-				local a = OpacitySliderFrame:GetValue()
-				ColorCallback(self, r, g, b, a, true)
-			end
-
-			local r, g, b, a = self.r, self.g, self.b, 1 - (self.a or 1)
-			if self.HasAlpha then
-				ColorPickerFrame.opacity = a
-			end
-			ColorPickerFrame:SetColorRGB(r, g, b)
-
-			ColorPickerFrame.cancelFunc = function()
-				ColorCallback(self, r, g, b, a, true)
-			end
-
-			ColorPickerFrame:Show()
 		end
+
+		ColorPickerFrame.hasOpacity = self.HasAlpha
+		ColorPickerFrame.opacityFunc = function()
+			local r, g, b = ColorPickerFrame:GetColorRGB()
+			local a = 1 - OpacitySliderFrame:GetValue()
+			ColorCallback(self, r, g, b, a, true)
+		end
+
+		local r, g, b, a = self.r, self.g, self.b, self.a
+		if self.HasAlpha then
+			ColorPickerFrame.opacity = 1 - (a or 0)
+		end
+		ColorPickerFrame:SetColorRGB(r, g, b)
+
+		if ColorPPDefault and self.dR and self.dG and self.dB then
+			local alpha = 1
+			if self.dA then alpha = 1 - self.dA end
+			if not ColorPPDefault.colors then ColorPPDefault.colors = {} end
+			ColorPPDefault.colors.r, ColorPPDefault.colors.g, ColorPPDefault.colors.b, ColorPPDefault.colors.a = self.dR, self.dG, self.dB, alpha
+		end
+
+		ColorPickerFrame.cancelFunc = function()
+			ColorCallback(self, r, g, b, a, true)
+		end
+
+		ColorPickerFrame:Show()
 	end
 	AceGUI:ClearFocus()
 end
@@ -141,11 +112,15 @@ local methods = {
 		self.text:SetText(text)
 	end,
 
-	["SetColor"] = function(self, r, g, b, a)
+	["SetColor"] = function(self, r, g, b, a, defaultR, defaultG, defaultB, defaultA)
 		self.r = r
 		self.g = g
 		self.b = b
 		self.a = a or 1
+		self.dR = defaultR or self.dR
+		self.dG = defaultG or self.dG
+		self.dB = defaultB or self.dB
+		self.dA = defaultA or self.dA
 		self.colorSwatch:SetVertexColor(r, g, b, a)
 	end,
 
@@ -187,7 +162,7 @@ local function Constructor()
 	colorSwatch.background = texture
 	texture:SetWidth(16)
 	texture:SetHeight(16)
-	texture:SetColorTexture(1, 1, 1)
+	texture:SetTexture(1, 1, 1)
 	texture:SetPoint("CENTER", colorSwatch)
 	texture:Show()
 

ElvUI_OptionsUI/Libraries/Ace3/AceGUI-3.0/widgets/AceGUIWidget-DropDown-Items.lua

@@ -41,7 +41,7 @@ local ItemBase = {
 	-- NOTE: The ItemBase version is added to each item's version number
 	--       to ensure proper updates on ItemBase changes.
 	--       Use at least 1000er steps.
-	version = 2000,
+	version = 1000,
 	counter = 0,
 }
 
@@ -178,7 +178,7 @@ function ItemBase.Create(type)
 	highlight:Hide()
 	self.highlight = highlight
 
-	local check = frame:CreateTexture(nil, "OVERLAY")
+	local check = frame:CreateTexture("OVERLAY")
 	check:SetWidth(16)
 	check:SetHeight(16)
 	check:SetPoint("LEFT",frame,"LEFT",3,-1)
@@ -186,7 +186,7 @@ function ItemBase.Create(type)
 	check:Hide()
 	self.check = check
 
-	local sub = frame:CreateTexture(nil, "OVERLAY")
+	local sub = frame:CreateTexture("OVERLAY")
 	sub:SetWidth(16)
 	sub:SetHeight(16)
 	sub:SetPoint("RIGHT",frame,"RIGHT",-3,-1)
@@ -323,7 +323,7 @@ end
 -- Does not close the pullout on click.
 do
 	local widgetType = "Dropdown-Item-Toggle"
-	local widgetVersion = 4
+	local widgetVersion = 3
 
 	local function UpdateToggle(self)
 		if self.value then
@@ -343,9 +343,9 @@ do
 		if self.disabled then return end
 		self.value = not self.value
 		if self.value then
-			PlaySound(856) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON
+			PlaySound("igMainMenuOptionCheckBoxOn")
 		else
-			PlaySound(857) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_OFF
+			PlaySound("igMainMenuOptionCheckBoxOff")
 		end
 		UpdateToggle(self)
 		self:Fire("OnValueChanged", self.value)
@@ -440,7 +440,7 @@ end
 -- A single line to separate items
 do
 	local widgetType = "Dropdown-Item-Separator"
-	local widgetVersion = 2
+	local widgetVersion = 1
 
 	-- exported, override
 	local function SetDisabled(self, disabled)
@@ -455,7 +455,7 @@ do
 
 		local line = self.frame:CreateTexture(nil, "OVERLAY")
 		line:SetHeight(1)
-		line:SetColorTexture(.5, .5, .5)
+		line:SetTexture(.5, .5, .5)
 		line:SetPoint("LEFT", self.frame, "LEFT", 10, 0)
 		line:SetPoint("RIGHT", self.frame, "RIGHT", -10, 0)
 

ElvUI_OptionsUI/Libraries/Ace3/AceGUI-3.0/widgets/AceGUIWidget-DropDown.lua

@@ -4,13 +4,17 @@ local AceGUI = LibStub("AceGUI-3.0")
 -- Lua APIs
 local min, max, floor = math.min, math.max, math.floor
 local select, pairs, ipairs, type, tostring = select, pairs, ipairs, type, tostring
-local tsort = table.sort
+local tsort, tonumber = table.sort, tonumber
 
 -- WoW APIs
 local PlaySound = PlaySound
 local UIParent, CreateFrame = UIParent, CreateFrame
 local _G = _G
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: CLOSE
+
 local function fixlevels(parent,...)
 	local i = 1
 	local child = select(i, ...)
@@ -35,7 +39,7 @@ end
 
 do
 	local widgetType = "Dropdown-Pullout"
-	local widgetVersion = 5
+	local widgetVersion = 3
 
 	--[[ Static data ]]--
 
@@ -189,7 +193,12 @@ do
 
 		local height = 8
 		for i, item in pairs(items) do
-			item:SetPoint("TOP", itemFrame, "TOP", 0, -2 + (i - 1) * -16)
+			if i == 1 then
+				item:SetPoint("TOP", itemFrame, "TOP", 0, -2)
+			else
+				item:SetPoint("TOP", items[i-1].frame, "BOTTOM", 0, 1)
+			end
+
 			item:Show()
 
 			height = height + 16
@@ -249,7 +258,7 @@ do
 
 	local function Constructor()
 		local count = AceGUI:GetNextWidgetNum(widgetType)
-		local frame = CreateFrame("Frame", "AceGUI30Pullout"..count, UIParent, "BackdropTemplate")
+		local frame = CreateFrame("Frame", "AceGUI30Pullout"..count, UIParent)
 		local self = {}
 		self.count = count
 		self.type = widgetType
@@ -300,7 +309,7 @@ do
 		scrollFrame.obj = self
 		itemFrame.obj = self
 
-		local slider = CreateFrame("Slider", "AceGUI30PulloutScrollbar"..count, scrollFrame, "BackdropTemplate")
+		local slider = CreateFrame("Slider", "AceGUI30PulloutScrollbar"..count, scrollFrame)
 		slider:SetOrientation("VERTICAL")
 		slider:SetHitRectInsets(0, 0, -10, 0)
 		slider:SetBackdrop(sliderBackdrop)
@@ -347,7 +356,7 @@ end
 
 do
 	local widgetType = "Dropdown"
-	local widgetVersion = 36
+	local widgetVersion = 35
 
 	--[[ Static data ]]--
 
@@ -372,6 +381,7 @@ do
 
 	local function Dropdown_TogglePullout(this)
 		local self = this.obj
+		PlaySound("igMainMenuOptionCheckBoxOn") -- missleading name, but the Blizzard code uses this sound
 		if self.open then
 			self.open = nil
 			self.pullout:Close()
@@ -589,21 +599,47 @@ do
 			return tostring(x) < tostring(y)
 		end
 	end
-	local function SetList(self, list, order, itemType)
+
+	-- these were added by ElvUI
+	local sortStr1, sortStr2 = "%((%d+)%)", "%[(%d+)]"
+	local sortValue = function(a,b)
+		if a and b and (a[2] and b[2]) then
+			local a2 = tonumber(a[2]:match(sortStr1) or a[2]:match(sortStr2))
+			local b2 = tonumber(b[2]:match(sortStr1) or b[2]:match(sortStr2))
+			if a2 and b2 and (a2 ~= b2) then
+				return a2 < b2 -- try to sort by the number inside of brackets if we can
+			end
+			return a[2] < b[2]
+		end
+	end
+
+	local function SetList(self, list, order, itemType, sortByValue)
 		self.list = list or {}
 		self.pullout:Clear()
 		self.hasClose = nil
 		if not list then return end
 
 		if type(order) ~= "table" then
-			for v in pairs(list) do
+			if sortByValue then -- added by ElvUI
-				sortlist[#sortlist + 1] = v
+				for k, v in pairs(list) do
-			end
+					sortlist[#sortlist + 1] = {k,v}
-			tsort(sortlist, sortTbl)
+				end
+				tsort(sortlist, sortValue)
 
-			for i, key in ipairs(sortlist) do
+				for i, sortedList in ipairs(sortlist) do
-				AddListItem(self, key, list[key], itemType)
+					AddListItem(self, sortedList[1], sortedList[2], itemType)
-				sortlist[i] = nil
+					sortlist[i] = nil
+				end
+			else -- this is the default way (unchanged by ElvUI)
+				for v in pairs(list) do
+					sortlist[#sortlist + 1] = v
+				end
+				tsort(sortlist, sortTbl)
+
+				for i, key in ipairs(sortlist) do
+					AddListItem(self, key, list[key], itemType)
+					sortlist[i] = nil
+				end
 			end
 		else
 			for i, key in ipairs(order) do

ElvUI_OptionsUI/Libraries/Ace3/AceGUI-3.0/widgets/AceGUIWidget-EditBox.lua

@@ -1,7 +1,7 @@
 --[[-----------------------------------------------------------------------------
 EditBox Widget
 -------------------------------------------------------------------------------]]
-local Type, Version = "EditBox", 29
+local Type, Version = "EditBox", 28
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -10,20 +10,20 @@ local tostring, pairs = tostring, pairs
 
 -- WoW APIs
 local PlaySound = PlaySound
-local GetCursorInfo, ClearCursor = GetCursorInfo, ClearCursor
+local GetCursorInfo, ClearCursor, GetSpellInfo = GetCursorInfo, ClearCursor, GetSpellInfo
 local CreateFrame, UIParent = CreateFrame, UIParent
 local _G = _G
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: AceGUIEditBoxInsertLink, ChatFontNormal, OKAY
+
 --[[-----------------------------------------------------------------------------
 Support functions
 -------------------------------------------------------------------------------]]
 if not AceGUIEditBoxInsertLink then
 	-- upgradeable hook
-	if ChatFrameUtil and ChatFrameUtil.InsertLink then
+	hooksecurefunc("ChatEdit_InsertLink", function(...) return _G.AceGUIEditBoxInsertLink(...) end)
-		hooksecurefunc(ChatFrameUtil, "InsertLink", function(...) return _G.AceGUIEditBoxInsertLink(...) end)
-	elseif ChatEdit_InsertLink then
-		hooksecurefunc("ChatEdit_InsertLink", function(...) return _G.AceGUIEditBoxInsertLink(...) end)
-	end
 end
 
 function _G.AceGUIEditBoxInsertLink(text)
@@ -73,23 +73,19 @@ local function EditBox_OnEnterPressed(frame)
 	local value = frame:GetText()
 	local cancel = self:Fire("OnEnterPressed", value)
 	if not cancel then
-		PlaySound(856) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON
+		PlaySound("igMainMenuOptionCheckBoxOn")
 		HideButton(self)
 	end
 end
 
 local function EditBox_OnReceiveDrag(frame)
 	local self = frame.obj
-	local type, id, info, extra = GetCursorInfo()
+	local type, id, info = GetCursorInfo()
 	local name
 	if type == "item" then
 		name = info
 	elseif type == "spell" then
-		if C_Spell and C_Spell.GetSpellName then
+		name = GetSpellInfo(id, info)
-			name = C_Spell.GetSpellName(extra)
-		else
-			name = GetSpellInfo(id, info)
-		end
 	elseif type == "macro" then
 		name = GetMacroInfo(id)
 	end

ElvUI_OptionsUI/Libraries/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Icon.lua

@@ -132,7 +132,7 @@ local function Constructor()
 		widget[method] = func
 	end
 
-	widget.SetText = function(self, ...) print("AceGUI-3.0-Icon: SetText is deprecated! Use SetLabel instead!"); self:SetLabel(...) end
+	widget.SetText = widget.SetLabel
 
 	return AceGUI:RegisterAsWidget(widget)
 end

ElvUI_OptionsUI/Libraries/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Keybinding.lua

@@ -2,7 +2,7 @@
 Keybinding Widget
 Set Keybindings in the Config UI.
 -------------------------------------------------------------------------------]]
-local Type, Version = "Keybinding", 27
+local Type, Version = "Keybinding", 25
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -13,6 +13,10 @@ local pairs = pairs
 local IsShiftKeyDown, IsControlKeyDown, IsAltKeyDown = IsShiftKeyDown, IsControlKeyDown, IsAltKeyDown
 local CreateFrame, UIParent = CreateFrame, UIParent
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: NOT_BOUND
+
 --[[-----------------------------------------------------------------------------
 Scripts
 -------------------------------------------------------------------------------]]
@@ -31,14 +35,12 @@ local function Keybinding_OnClick(frame, button)
 		if self.waitingForKey then
 			frame:EnableKeyboard(false)
 			frame:EnableMouseWheel(false)
-			frame:EnableGamePadButton(false)
 			self.msgframe:Hide()
 			frame:UnlockHighlight()
 			self.waitingForKey = nil
 		else
 			frame:EnableKeyboard(true)
 			frame:EnableMouseWheel(true)
-			frame:EnableGamePadButton(true)
 			self.msgframe:Show()
 			frame:LockHighlight()
 			self.waitingForKey = true
@@ -74,7 +76,6 @@ local function Keybinding_OnKeyDown(frame, key)
 
 		frame:EnableKeyboard(false)
 		frame:EnableMouseWheel(false)
-		frame:EnableGamePadButton(false)
 		self.msgframe:Hide()
 		frame:UnlockHighlight()
 		self.waitingForKey = nil
@@ -122,7 +123,6 @@ local methods = {
 		self:SetDisabled(false)
 		self.button:EnableKeyboard(false)
 		self.button:EnableMouseWheel(false)
-		self.button:EnableGamePadButton(false)
 	end,
 
 	-- ["OnRelease"] = nil,
@@ -188,7 +188,7 @@ local function Constructor()
 	local name = "AceGUI30KeybindingButton" .. AceGUI:GetNextWidgetNum(Type)
 
 	local frame = CreateFrame("Frame", nil, UIParent)
-	local button = CreateFrame("Button", name, frame, "UIPanelButtonTemplate")
+	local button = CreateFrame("Button", name, frame, "UIPanelButtonTemplate2")
 
 	button:EnableMouse(true)
 	button:EnableMouseWheel(false)
@@ -199,12 +199,10 @@ local function Constructor()
 	button:SetScript("OnKeyDown", Keybinding_OnKeyDown)
 	button:SetScript("OnMouseDown", Keybinding_OnMouseDown)
 	button:SetScript("OnMouseWheel", Keybinding_OnMouseWheel)
-	button:SetScript("OnGamePadButtonDown", Keybinding_OnKeyDown)
 	button:SetPoint("BOTTOMLEFT")
 	button:SetPoint("BOTTOMRIGHT")
 	button:SetHeight(24)
 	button:EnableKeyboard(false)
-	button:EnableGamePadButton(false)
 
 	local text = button:GetFontString()
 	text:SetPoint("LEFT", 7, 0)
@@ -216,7 +214,7 @@ local function Constructor()
 	label:SetJustifyH("CENTER")
 	label:SetHeight(18)
 
-	local msgframe = CreateFrame("Frame", nil, UIParent, "BackdropTemplate")
+	local msgframe = CreateFrame("Frame", nil, UIParent)
 	msgframe:SetHeight(30)
 	msgframe:SetBackdrop(ControlBackdrop)
 	msgframe:SetBackdropColor(0,0,0)

ElvUI_OptionsUI/Libraries/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Label.lua

@@ -2,7 +2,7 @@
 Label Widget
 Displays text and optionally an icon.
 -------------------------------------------------------------------------------]]
-local Type, Version = "Label", 28
+local Type, Version = "Label", 27
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -12,6 +12,10 @@ local max, select, pairs = math.max, select, pairs
 -- WoW APIs
 local CreateFrame, UIParent = CreateFrame, UIParent
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: GameFontHighlightSmall
+
 --[[-----------------------------------------------------------------------------
 Support functions
 -------------------------------------------------------------------------------]]
@@ -125,16 +129,12 @@ local methods = {
 	end,
 
 	["SetFont"] = function(self, font, height, flags)
-		if not self.fontObject then
+		self.label:SetFont(font, height, flags)
-			self.fontObject = CreateFont("AceGUI30LabelFont" .. AceGUI:GetNextWidgetNum(Type))
+		UpdateImageAnchor(self)
-		end
-		self.fontObject:SetFont(font, height, flags)
-		self:SetFontObject(self.fontObject)
 	end,
 
 	["SetFontObject"] = function(self, font)
-		self.label:SetFontObject(font or GameFontHighlightSmall)
+		self:SetFont((font or GameFontHighlightSmall):GetFont())
-		UpdateImageAnchor(self)
 	end,
 
 	["SetImageSize"] = function(self, width, height)

ElvUI_OptionsUI/Libraries/Ace3/AceGUI-3.0/widgets/AceGUIWidget-MultiLineEditBox.lua

@@ -1,4 +1,4 @@
-local Type, Version = "MultiLineEditBox", 33
+local Type, Version = "MultiLineEditBox", 28
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -6,21 +6,21 @@ if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 local pairs = pairs
 
 -- WoW APIs
-local GetCursorInfo, ClearCursor = GetCursorInfo, ClearCursor
+local GetCursorInfo, GetSpellInfo, ClearCursor = GetCursorInfo, GetSpellInfo, ClearCursor
 local CreateFrame, UIParent = CreateFrame, UIParent
 local _G = _G
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: ACCEPT, ChatFontNormal
+
 --[[-----------------------------------------------------------------------------
 Support functions
 -------------------------------------------------------------------------------]]
 
 if not AceGUIMultiLineEditBoxInsertLink then
 	-- upgradeable hook
-	if ChatFrameUtil and ChatFrameUtil.InsertLink then
+	hooksecurefunc("ChatEdit_InsertLink", function(...) return _G.AceGUIMultiLineEditBoxInsertLink(...) end)
-		hooksecurefunc(ChatFrameUtil, "InsertLink", function(...) return _G.AceGUIMultiLineEditBoxInsertLink(...) end)
-	elseif ChatEdit_InsertLink then
-		hooksecurefunc("ChatEdit_InsertLink", function(...) return _G.AceGUIMultiLineEditBoxInsertLink(...) end)
-	end
 end
 
 function _G.AceGUIMultiLineEditBoxInsertLink(text)
@@ -104,13 +104,9 @@ local function OnMouseUp(self)
 end
 
 local function OnReceiveDrag(self)                                               -- EditBox / ScrollFrame
-	local type, id, info, extra = GetCursorInfo()
+	local type, id, info = GetCursorInfo()
 	if type == "spell" then
-		if C_Spell and C_Spell.GetSpellName then
+		info = GetSpellInfo(id, info)
-			info = C_Spell.GetSpellName(extra)
-		else
-			info = GetSpellInfo(id, info)
-		end
 	elseif type ~= "item" then
 		return
 	end
@@ -149,14 +145,6 @@ local function OnVerticalScroll(self, offset)
 	editBox:SetHitRectInsets(0, 0, offset, editBox:GetHeight() - offset - self:GetHeight())
 end
 
-local function OnScrollRangeChanged(self, xrange, yrange)
-	if yrange == 0 then
-		self.obj.editBox:SetHitRectInsets(0, 0, 0, 0)
-	else
-		OnVerticalScroll(self, self:GetVerticalScroll())
-	end
-end
-
 local function OnShowFocus(frame)
 	frame.obj.editBox:SetFocus()
 	frame:SetScript("OnShow", nil)
@@ -269,6 +257,8 @@ local methods = {
 	["SetCursorPosition"] = function(self, ...)
 		return self.editBox:SetCursorPosition(...)
 	end,
+
+
 }
 
 --[[-----------------------------------------------------------------------------
@@ -293,7 +283,7 @@ local function Constructor()
 	label:SetText(ACCEPT)
 	label:SetHeight(10)
 
-	local button = CreateFrame("Button", ("%s%dButton"):format(Type, widgetNum), frame, "UIPanelButtonTemplate")
+	local button = CreateFrame("Button", ("%s%dButton"):format(Type, widgetNum), frame, "UIPanelButtonTemplate2")
 	button:SetPoint("BOTTOMLEFT", 0, 4)
 	button:SetHeight(22)
 	button:SetWidth(label:GetStringWidth() + 24)
@@ -307,7 +297,7 @@ local function Constructor()
 	text:SetPoint("BOTTOMRIGHT", button, "BOTTOMRIGHT", -5, 1)
 	text:SetJustifyV("MIDDLE")
 
-	local scrollBG = CreateFrame("Frame", nil, frame, "BackdropTemplate")
+	local scrollBG = CreateFrame("Frame", nil, frame)
 	scrollBG:SetBackdrop(backdrop)
 	scrollBG:SetBackdropColor(0, 0, 0)
 	scrollBG:SetBackdropBorderColor(0.4, 0.4, 0.4)
@@ -331,7 +321,6 @@ local function Constructor()
 	scrollFrame:SetScript("OnReceiveDrag", OnReceiveDrag)
 	scrollFrame:SetScript("OnSizeChanged", OnSizeChanged)
 	scrollFrame:HookScript("OnVerticalScroll", OnVerticalScroll)
-	scrollFrame:HookScript("OnScrollRangeChanged", OnScrollRangeChanged)
 
 	local editBox = CreateFrame("EditBox", ("%s%dEdit"):format(Type, widgetNum), scrollFrame)
 	editBox:SetAllPoints()

ElvUI_OptionsUI/Libraries/Ace3/AceGUI-3.0/widgets/AceGUIWidget-Slider.lua

@@ -2,7 +2,7 @@
 Slider Widget
 Graphical Slider, like, for Range values.
 -------------------------------------------------------------------------------]]
-local Type, Version = "Slider", 24
+local Type, Version = "Slider", 20
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
@@ -14,6 +14,10 @@ local tonumber, pairs = tonumber, pairs
 local PlaySound = PlaySound
 local CreateFrame, UIParent = CreateFrame, UIParent
 
+-- Global vars/functions that we don't upvalue since they might get hooked, or upgraded
+-- List them here for Mikk's FindGlobals script
+-- GLOBALS: GameFontHighlightSmall
+
 --[[-----------------------------------------------------------------------------
 Support functions
 -------------------------------------------------------------------------------]]
@@ -27,13 +31,13 @@ local function UpdateText(self)
 end
 
 local function UpdateLabels(self)
-	local min_value, max_value = (self.min or 0), (self.max or 100)
+	local min, max = (self.min or 0), (self.max or 100)
 	if self.ispercent then
-		self.lowtext:SetFormattedText("%s%%", (min_value * 100))
+		self.lowtext:SetFormattedText("%s%%", (min * 100))
-		self.hightext:SetFormattedText("%s%%", (max_value * 100))
+		self.hightext:SetFormattedText("%s%%", (max * 100))
 	else
-		self.lowtext:SetText(min_value)
+		self.lowtext:SetText(min)
-		self.hightext:SetText(max_value)
+		self.hightext:SetText(max)
 	end
 end
 
@@ -56,10 +60,6 @@ end
 local function Slider_OnValueChanged(frame, newvalue)
 	local self = frame.obj
 	if not frame.setup then
-		if self.step and self.step > 0 then
-			local min_value = self.min or 0
-			newvalue = floor((newvalue - min_value) / self.step + 0.5) * self.step + min_value
-		end
 		if newvalue ~= self.value and not self.disabled then
 			self.value = newvalue
 			self:Fire("OnValueChanged", newvalue)
@@ -103,7 +103,7 @@ local function EditBox_OnEnterPressed(frame)
 	end
 
 	if value then
-		PlaySound(856) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON
+		PlaySound("igMainMenuOptionCheckBoxOn")
 		self.slider:SetValue(value)
 		self:Fire("OnMouseUp", value)
 	end
@@ -171,13 +171,16 @@ local methods = {
 		self.label:SetText(text)
 	end,
 
-	["SetSliderValues"] = function(self, min_value, max_value, step)
+	["SetSliderValues"] = function(self, min, max, step)
+		if type(min) == 'function' then min = min() end -- ElvUI
+		if type(max) == 'function' then max = max() end -- ElvUI
+
 		local frame = self.slider
 		frame.setup = true
-		self.min = min_value
+		self.min = min
-		self.max = max_value
+		self.max = max
 		self.step = step
-		frame:SetMinMaxValues(min_value or 0,max_value or 100)
+		frame:SetMinMaxValues(min or 0,max or 100)
 		UpdateLabels(self)
 		frame:SetValueStep(step or 1)
 		if self.value then
@@ -221,7 +224,7 @@ local function Constructor()
 	label:SetJustifyH("CENTER")
 	label:SetHeight(15)
 
-	local slider = CreateFrame("Slider", nil, frame, "BackdropTemplate")
+	local slider = CreateFrame("Slider", nil, frame)
 	slider:SetOrientation("HORIZONTAL")
 	slider:SetHeight(15)
 	slider:SetHitRectInsets(0, 0, -10, 0)
@@ -243,7 +246,7 @@ local function Constructor()
 	local hightext = slider:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall")
 	hightext:SetPoint("TOPRIGHT", slider, "BOTTOMRIGHT", -2, 3)
 
-	local editbox = CreateFrame("EditBox", nil, frame, "BackdropTemplate")
+	local editbox = CreateFrame("EditBox", nil, frame)
 	editbox:SetAutoFocus(false)
 	editbox:SetFontObject(GameFontHighlightSmall)
 	editbox:SetPoint("TOP", slider, "BOTTOM")
@@ -273,7 +276,6 @@ local function Constructor()
 		widget[method] = func
 	end
 	slider.obj, editbox.obj = widget, widget
-	C_Timer.After(0.3, function() editbox:SetText(" ") UpdateText(widget) end) -- Workaround for font loading issue, making the editboxes blank until the text is changed
 
 	return AceGUI:RegisterAsWidget(widget)
 end