Compare commits
29 Commits
Author | SHA1 | Date |
---|---|---|
Robin Hüskes | da56c18402 | |
Robin Hüskes | ff37e7abcb | |
robin | 997d689db5 | |
Gnarfoz (Christian Wissel) | 08a7819fcb | |
Robin Hüskes | 77a852053e | |
Robin Hüskes | 0d6ae08f6c | |
Robin Hüskes | 7def31f16a | |
Robin Hüskes | b459d1dcbc | |
Robin Hüskes | 4c5e36588b | |
Robin Hüskes | efb7d130f9 | |
Robin Hüskes | 0aec7c390f | |
Robin Hüskes | 400a0f1773 | |
Robin Hüskes | 24a9da55a2 | |
Robin Hüskes | 81e9724a29 | |
Robin Hüskes | 7d58073c88 | |
Robin Hüskes | c55d367a9b | |
Robin Hüskes | 5ae3353bc6 | |
robin | 7593172b35 | |
robin | 37b11645c3 | |
robin | 8e8a946666 | |
robin | f91e0c3487 | |
robin | 98fbfa2261 | |
robin | e6e7e9203d | |
robin | 8fbe678e20 | |
robin | 3b70c9a5a5 | |
robin | 954c8c85c3 | |
robin | bb00b9b018 | |
robin | e21863595b | |
robin | 6dd7cac80f |
|
@ -1,3 +0,0 @@
|
||||||
<Bindings>
|
|
||||||
<Binding name="COORDS_TOGGLE" header="COORDS" category="ADDONS">zzCoords_MinimapToggle()</Binding>
|
|
||||||
</Bindings>
|
|
|
@ -1,7 +1,7 @@
|
||||||
--- AceConfigCmd-3.0 handles access to an options table through the "command line" interface via the ChatFrames.
|
--- AceConfigCmd-3.0 handles access to an options table through the "command line" interface via the ChatFrames.
|
||||||
-- @class file
|
-- @class file
|
||||||
-- @name AceConfigCmd-3.0
|
-- @name AceConfigCmd-3.0
|
||||||
-- @release $Id: AceConfigCmd-3.0.lua 1202 2019-05-15 23:11:22Z nevcairiel $
|
-- @release $Id: AceConfigCmd-3.0.lua 1284 2022-09-25 09:15:30Z nevcairiel $
|
||||||
|
|
||||||
--[[
|
--[[
|
||||||
AceConfigCmd-3.0
|
AceConfigCmd-3.0
|
||||||
|
@ -37,17 +37,10 @@ local error, assert = error, assert
|
||||||
-- WoW APIs
|
-- WoW APIs
|
||||||
local _G = _G
|
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
|
local L = setmetatable({}, { -- TODO: replace with proper locale
|
||||||
__index = function(self,k) return k end
|
__index = function(self,k) return k end
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
local function print(msg)
|
local function print(msg)
|
||||||
(SELECTED_CHAT_FRAME or DEFAULT_CHAT_FRAME):AddMessage(msg)
|
(SELECTED_CHAT_FRAME or DEFAULT_CHAT_FRAME):AddMessage(msg)
|
||||||
end
|
end
|
||||||
|
@ -401,7 +394,7 @@ local function handle(info, inputpos, tab, depth, retfalse)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
local str = strsub(info.input,inputpos);
|
local strInput = strsub(info.input,inputpos);
|
||||||
|
|
||||||
if tab.type=="execute" then
|
if tab.type=="execute" then
|
||||||
------------ execute --------------------------------------------
|
------------ execute --------------------------------------------
|
||||||
|
@ -414,21 +407,21 @@ local function handle(info, inputpos, tab, depth, retfalse)
|
||||||
|
|
||||||
local res = true
|
local res = true
|
||||||
if tab.pattern then
|
if tab.pattern then
|
||||||
if not(type(tab.pattern)=="string") then err(info, inputpos, "'pattern' - expected a string") end
|
if type(tab.pattern)~="string" then err(info, inputpos, "'pattern' - expected a string") end
|
||||||
if not strmatch(str, tab.pattern) then
|
if not strmatch(strInput, tab.pattern) then
|
||||||
usererr(info, inputpos, "'"..str.."' - " .. L["invalid input"])
|
usererr(info, inputpos, "'"..strInput.."' - " .. L["invalid input"])
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
do_final(info, inputpos, tab, "set", str)
|
do_final(info, inputpos, tab, "set", strInput)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
elseif tab.type=="toggle" then
|
elseif tab.type=="toggle" then
|
||||||
------------ toggle --------------------------------------------
|
------------ toggle --------------------------------------------
|
||||||
local b
|
local b
|
||||||
local str = strtrim(strlower(str))
|
local str = strtrim(strlower(strInput))
|
||||||
if str=="" then
|
if str=="" then
|
||||||
b = callmethod(info, inputpos, tab, "get")
|
b = callmethod(info, inputpos, tab, "get")
|
||||||
|
|
||||||
|
@ -465,9 +458,9 @@ local function handle(info, inputpos, tab, depth, retfalse)
|
||||||
|
|
||||||
elseif tab.type=="range" then
|
elseif tab.type=="range" then
|
||||||
------------ range --------------------------------------------
|
------------ range --------------------------------------------
|
||||||
local val = tonumber(str)
|
local val = tonumber(strInput)
|
||||||
if not val then
|
if not val then
|
||||||
usererr(info, inputpos, "'"..str.."' - "..L["expected number"])
|
usererr(info, inputpos, "'"..strInput.."' - "..L["expected number"])
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
if type(info.step)=="number" then
|
if type(info.step)=="number" then
|
||||||
|
@ -487,7 +480,7 @@ local function handle(info, inputpos, tab, depth, retfalse)
|
||||||
|
|
||||||
elseif tab.type=="select" then
|
elseif tab.type=="select" then
|
||||||
------------ select ------------------------------------
|
------------ select ------------------------------------
|
||||||
local str = strtrim(strlower(str))
|
local str = strtrim(strlower(strInput))
|
||||||
|
|
||||||
local values = tab.values
|
local values = tab.values
|
||||||
if type(values) == "function" or type(values) == "string" then
|
if type(values) == "function" or type(values) == "string" then
|
||||||
|
@ -528,7 +521,7 @@ local function handle(info, inputpos, tab, depth, retfalse)
|
||||||
|
|
||||||
elseif tab.type=="multiselect" then
|
elseif tab.type=="multiselect" then
|
||||||
------------ multiselect -------------------------------------------
|
------------ multiselect -------------------------------------------
|
||||||
local str = strtrim(strlower(str))
|
local str = strtrim(strlower(strInput))
|
||||||
|
|
||||||
local values = tab.values
|
local values = tab.values
|
||||||
if type(values) == "function" or type(values) == "string" then
|
if type(values) == "function" or type(values) == "string" then
|
||||||
|
@ -565,7 +558,7 @@ local function handle(info, inputpos, tab, depth, retfalse)
|
||||||
|
|
||||||
--check that the opt is valid
|
--check that the opt is valid
|
||||||
local ok
|
local ok
|
||||||
for k,v in pairs(values) do
|
for k in pairs(values) do
|
||||||
if strlower(k)==opt then
|
if strlower(k)==opt then
|
||||||
opt = k -- overwrite with key (in case of case mismatches)
|
opt = k -- overwrite with key (in case of case mismatches)
|
||||||
ok = true
|
ok = true
|
||||||
|
@ -634,7 +627,7 @@ local function handle(info, inputpos, tab, depth, retfalse)
|
||||||
|
|
||||||
elseif tab.type=="color" then
|
elseif tab.type=="color" then
|
||||||
------------ color --------------------------------------------
|
------------ color --------------------------------------------
|
||||||
local str = strtrim(strlower(str))
|
local str = strtrim(strlower(strInput))
|
||||||
if str == "" then
|
if str == "" then
|
||||||
--TODO: Show current value
|
--TODO: Show current value
|
||||||
return
|
return
|
||||||
|
@ -706,7 +699,7 @@ local function handle(info, inputpos, tab, depth, retfalse)
|
||||||
|
|
||||||
elseif tab.type=="keybinding" then
|
elseif tab.type=="keybinding" then
|
||||||
------------ keybinding --------------------------------------------
|
------------ keybinding --------------------------------------------
|
||||||
local str = strtrim(strlower(str))
|
local str = strtrim(strlower(strInput))
|
||||||
if str == "" then
|
if str == "" then
|
||||||
--TODO: Show current value
|
--TODO: Show current value
|
||||||
return
|
return
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
--- AceConfigDialog-3.0 generates AceGUI-3.0 based windows based on option tables.
|
--- AceConfigDialog-3.0 generates AceGUI-3.0 based windows based on option tables.
|
||||||
-- @class file
|
-- @class file
|
||||||
-- @name AceConfigDialog-3.0
|
-- @name AceConfigDialog-3.0
|
||||||
-- @release $Id: AceConfigDialog-3.0.lua 1248 2021-02-05 14:27:49Z funkehdude $
|
-- @release $Id: AceConfigDialog-3.0.lua 1296 2022-11-04 18:50:10Z nevcairiel $
|
||||||
|
|
||||||
local LibStub = LibStub
|
local LibStub = LibStub
|
||||||
local gui = LibStub("AceGUI-3.0")
|
local gui = LibStub("AceGUI-3.0")
|
||||||
local reg = LibStub("AceConfigRegistry-3.0")
|
local reg = LibStub("AceConfigRegistry-3.0")
|
||||||
|
|
||||||
local MAJOR, MINOR = "AceConfigDialog-3.0", 81
|
local MAJOR, MINOR = "AceConfigDialog-3.0", 86
|
||||||
local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
|
local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
|
||||||
|
|
||||||
if not AceConfigDialog then return end
|
if not AceConfigDialog then return end
|
||||||
|
@ -29,12 +29,6 @@ local pairs, next, select, type, unpack, ipairs = pairs, next, select, type, unp
|
||||||
local tostring, tonumber = tostring, tonumber
|
local tostring, tonumber = tostring, tonumber
|
||||||
local math_min, math_max, math_floor = math.min, math.max, math.floor
|
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, ACCEPT, CANCEL
|
|
||||||
-- GLOBALS: PlaySound, GameFontHighlight, GameFontHighlightSmall, GameFontHighlightLarge
|
|
||||||
-- GLOBALS: CloseSpecialWindows, InterfaceOptions_AddCategory, geterrorhandler
|
|
||||||
|
|
||||||
local emptyTbl = {}
|
local emptyTbl = {}
|
||||||
|
|
||||||
--[[
|
--[[
|
||||||
|
@ -153,6 +147,7 @@ local stringIsLiteral = {
|
||||||
width = true,
|
width = true,
|
||||||
image = true,
|
image = true,
|
||||||
fontSize = true,
|
fontSize = true,
|
||||||
|
tooltipHyperlink = true
|
||||||
}
|
}
|
||||||
|
|
||||||
--Is Never a function or method
|
--Is Never a function or method
|
||||||
|
@ -194,9 +189,8 @@ local function GetOptionsMemberValue(membername, option, options, path, appName,
|
||||||
--We have a function to call
|
--We have a function to call
|
||||||
local info = new()
|
local info = new()
|
||||||
--traverse the options table, picking up the handler and filling the info with the path
|
--traverse the options table, picking up the handler and filling the info with the path
|
||||||
local handler
|
|
||||||
local group = options
|
local group = options
|
||||||
handler = group.handler or handler
|
local handler = group.handler
|
||||||
|
|
||||||
for i = 1, #path do
|
for i = 1, #path do
|
||||||
group = GetSubOption(group, path[i])
|
group = GetSubOption(group, path[i])
|
||||||
|
@ -508,6 +502,14 @@ local function OptionOnMouseOver(widget, event)
|
||||||
local tooltip = AceConfigDialog.tooltip
|
local tooltip = AceConfigDialog.tooltip
|
||||||
|
|
||||||
tooltip:SetOwner(widget.frame, "ANCHOR_TOPRIGHT")
|
tooltip:SetOwner(widget.frame, "ANCHOR_TOPRIGHT")
|
||||||
|
|
||||||
|
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 name = GetOptionsMemberValue("name", opt, options, path, appName)
|
||||||
local desc = GetOptionsMemberValue("desc", opt, options, path, appName)
|
local desc = GetOptionsMemberValue("desc", opt, options, path, appName)
|
||||||
local usage = GetOptionsMemberValue("usage", opt, options, path, appName)
|
local usage = GetOptionsMemberValue("usage", opt, options, path, appName)
|
||||||
|
@ -535,8 +537,7 @@ local function OptionOnMouseLeave(widget, event)
|
||||||
end
|
end
|
||||||
|
|
||||||
local function GetFuncName(option)
|
local function GetFuncName(option)
|
||||||
local type = option.type
|
if option.type == "execute" then
|
||||||
if type == "execute" then
|
|
||||||
return "func"
|
return "func"
|
||||||
else
|
else
|
||||||
return "set"
|
return "set"
|
||||||
|
@ -566,28 +567,17 @@ do
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
||||||
if not frame.SetFixedFrameStrata then -- API capability check (classic check)
|
local border = CreateFrame("Frame", nil, frame, "DialogBorderOpaqueTemplate")
|
||||||
frame:SetBackdrop({
|
border:SetAllPoints(frame)
|
||||||
bgFile = [[Interface\DialogFrame\UI-DialogBox-Background-Dark]],
|
frame:SetFixedFrameStrata(true)
|
||||||
edgeFile = [[Interface\DialogFrame\UI-DialogBox-Border]],
|
frame:SetFixedFrameLevel(true)
|
||||||
tile = true,
|
|
||||||
tileSize = 32,
|
|
||||||
edgeSize = 32,
|
|
||||||
insets = { left = 11, right = 11, top = 11, bottom = 11 },
|
|
||||||
})
|
|
||||||
else
|
|
||||||
local border = CreateFrame("Frame", nil, frame, "DialogBorderOpaqueTemplate")
|
|
||||||
border:SetAllPoints(frame)
|
|
||||||
frame:SetFixedFrameStrata(true)
|
|
||||||
frame:SetFixedFrameLevel(true)
|
|
||||||
end
|
|
||||||
|
|
||||||
local text = frame:CreateFontString(nil, "ARTWORK", "GameFontHighlight")
|
local text = frame:CreateFontString(nil, "ARTWORK", "GameFontHighlight")
|
||||||
text:SetSize(290, 0)
|
text:SetSize(290, 0)
|
||||||
text:SetPoint("TOP", 0, -16)
|
text:SetPoint("TOP", 0, -16)
|
||||||
frame.text = text
|
frame.text = text
|
||||||
|
|
||||||
local function newButton(text)
|
local function newButton(newText)
|
||||||
local button = CreateFrame("Button", nil, frame)
|
local button = CreateFrame("Button", nil, frame)
|
||||||
button:SetSize(128, 21)
|
button:SetSize(128, 21)
|
||||||
button:SetNormalFontObject(GameFontNormal)
|
button:SetNormalFontObject(GameFontNormal)
|
||||||
|
@ -598,7 +588,7 @@ do
|
||||||
button:GetPushedTexture():SetTexCoord(0.0, 1.0, 0.0, 0.71875)
|
button:GetPushedTexture():SetTexCoord(0.0, 1.0, 0.0, 0.71875)
|
||||||
button:SetHighlightTexture(130762) -- "Interface\\Buttons\\UI-DialogBox-Button-Highlight"
|
button:SetHighlightTexture(130762) -- "Interface\\Buttons\\UI-DialogBox-Button-Highlight"
|
||||||
button:GetHighlightTexture():SetTexCoord(0.0, 1.0, 0.0, 0.71875)
|
button:GetHighlightTexture():SetTexCoord(0.0, 1.0, 0.0, 0.71875)
|
||||||
button:SetText(text)
|
button:SetText(newText)
|
||||||
return button
|
return button
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -685,7 +675,7 @@ local function ActivateControl(widget, event, ...)
|
||||||
if group[funcname] ~= nil then
|
if group[funcname] ~= nil then
|
||||||
func = group[funcname]
|
func = group[funcname]
|
||||||
end
|
end
|
||||||
handler = group.handler or handler
|
handler = group.handler
|
||||||
confirm = group.confirm
|
confirm = group.confirm
|
||||||
validate = group.validate
|
validate = group.validate
|
||||||
for i = 1, #path do
|
for i = 1, #path do
|
||||||
|
@ -749,7 +739,6 @@ local function ActivateControl(widget, event, ...)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local rootframe = user.rootframe
|
|
||||||
if not validated or type(validated) == "string" then
|
if not validated or type(validated) == "string" then
|
||||||
if not validated then
|
if not validated then
|
||||||
if usage then
|
if usage then
|
||||||
|
@ -764,8 +753,8 @@ local function ActivateControl(widget, event, ...)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- show validate message
|
-- show validate message
|
||||||
if rootframe.SetStatusText then
|
if user.rootframe.SetStatusText then
|
||||||
rootframe:SetStatusText(validated)
|
user.rootframe:SetStatusText(validated)
|
||||||
else
|
else
|
||||||
validationErrorPopup(validated)
|
validationErrorPopup(validated)
|
||||||
end
|
end
|
||||||
|
@ -802,14 +791,14 @@ local function ActivateControl(widget, event, ...)
|
||||||
if type(confirm) == "boolean" then
|
if type(confirm) == "boolean" then
|
||||||
if confirm then
|
if confirm then
|
||||||
if not confirmText then
|
if not confirmText then
|
||||||
local name, desc = option.name, option.desc
|
local option_name, desc = option.name, option.desc
|
||||||
if type(name) == "function" then
|
if type(option_name) == "function" then
|
||||||
name = name(info)
|
option_name = option_name(info)
|
||||||
end
|
end
|
||||||
if type(desc) == "function" then
|
if type(desc) == "function" then
|
||||||
desc = desc(info)
|
desc = desc(info)
|
||||||
end
|
end
|
||||||
confirmText = name
|
confirmText = option_name
|
||||||
if desc then
|
if desc then
|
||||||
confirmText = confirmText.." - "..desc
|
confirmText = confirmText.." - "..desc
|
||||||
end
|
end
|
||||||
|
@ -1151,8 +1140,6 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
|
||||||
--Control to feed
|
--Control to feed
|
||||||
local control
|
local control
|
||||||
|
|
||||||
local name = GetOptionsMemberValue("name", v, options, path, appName)
|
|
||||||
|
|
||||||
if v.type == "execute" then
|
if v.type == "execute" then
|
||||||
|
|
||||||
local imageCoords = GetOptionsMemberValue("imageCoords",v, options, path, appName)
|
local imageCoords = GetOptionsMemberValue("imageCoords",v, options, path, appName)
|
||||||
|
@ -1255,7 +1242,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
|
||||||
end
|
end
|
||||||
tsort(sorting, sortTblAsStrings)
|
tsort(sorting, sortTblAsStrings)
|
||||||
end
|
end
|
||||||
for k, value in ipairs(sorting) do
|
for _, value in ipairs(sorting) do
|
||||||
local text = values[value]
|
local text = values[value]
|
||||||
local radio = gui:Create("CheckBox")
|
local radio = gui:Create("CheckBox")
|
||||||
radio:SetLabel(text)
|
radio:SetLabel(text)
|
||||||
|
@ -1337,8 +1324,8 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
|
||||||
control:SetWidth(width_multiplier)
|
control:SetWidth(width_multiplier)
|
||||||
end
|
end
|
||||||
--check:SetTriState(v.tristate)
|
--check:SetTriState(v.tristate)
|
||||||
for i = 1, #valuesort do
|
for s = 1, #valuesort do
|
||||||
local key = valuesort[i]
|
local key = valuesort[s]
|
||||||
local value = GetOptionsMemberValue("get",v, options, path, appName, key)
|
local value = GetOptionsMemberValue("get",v, options, path, appName, key)
|
||||||
control:SetItemValue(key,value)
|
control:SetItemValue(key,value)
|
||||||
end
|
end
|
||||||
|
@ -1350,8 +1337,8 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
|
||||||
|
|
||||||
control:PauseLayout()
|
control:PauseLayout()
|
||||||
local width = GetOptionsMemberValue("width",v,options,path,appName)
|
local width = GetOptionsMemberValue("width",v,options,path,appName)
|
||||||
for i = 1, #valuesort do
|
for s = 1, #valuesort do
|
||||||
local value = valuesort[i]
|
local value = valuesort[s]
|
||||||
local text = values[value]
|
local text = values[value]
|
||||||
local check = gui:Create("CheckBox")
|
local check = gui:Create("CheckBox")
|
||||||
check:SetLabel(text)
|
check:SetLabel(text)
|
||||||
|
@ -1368,7 +1355,7 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
|
||||||
elseif width == "half" then
|
elseif width == "half" then
|
||||||
check:SetWidth(width_multiplier / 2)
|
check:SetWidth(width_multiplier / 2)
|
||||||
elseif (type(width) == "number") then
|
elseif (type(width) == "number") then
|
||||||
control:SetWidth(width_multiplier * width)
|
check:SetWidth(width_multiplier * width)
|
||||||
elseif width == "full" then
|
elseif width == "full" then
|
||||||
check.width = "fill"
|
check.width = "fill"
|
||||||
else
|
else
|
||||||
|
@ -1438,8 +1425,8 @@ local function FeedOptions(appName, options,container,rootframe,path,group,inlin
|
||||||
end
|
end
|
||||||
control:SetImageSize(width, height)
|
control:SetImageSize(width, height)
|
||||||
end
|
end
|
||||||
local width = GetOptionsMemberValue("width",v,options,path,appName)
|
local controlWidth = GetOptionsMemberValue("width",v,options,path,appName)
|
||||||
control.width = not width and "fill"
|
control.width = not controlWidth and "fill"
|
||||||
end
|
end
|
||||||
|
|
||||||
--Common Init
|
--Common Init
|
||||||
|
@ -1694,29 +1681,29 @@ function AceConfigDialog:FeedGroup(appName,options,container,rootframe,path, isR
|
||||||
|
|
||||||
elseif grouptype == "select" then
|
elseif grouptype == "select" then
|
||||||
|
|
||||||
local select = gui:Create("DropdownGroup")
|
local selectGroup = gui:Create("DropdownGroup")
|
||||||
select:SetTitle(name)
|
selectGroup:SetTitle(name)
|
||||||
InjectInfo(select, options, group, path, rootframe, appName)
|
InjectInfo(selectGroup, options, group, path, rootframe, appName)
|
||||||
select:SetCallback("OnGroupSelected", GroupSelected)
|
selectGroup:SetCallback("OnGroupSelected", GroupSelected)
|
||||||
local status = AceConfigDialog:GetStatusTable(appName, path)
|
local status = AceConfigDialog:GetStatusTable(appName, path)
|
||||||
if not status.groups then
|
if not status.groups then
|
||||||
status.groups = {}
|
status.groups = {}
|
||||||
end
|
end
|
||||||
select:SetStatusTable(status.groups)
|
selectGroup:SetStatusTable(status.groups)
|
||||||
local grouplist, orderlist = BuildSelect(group, options, path, appName)
|
local grouplist, orderlist = BuildSelect(group, options, path, appName)
|
||||||
select:SetGroupList(grouplist, orderlist)
|
selectGroup:SetGroupList(grouplist, orderlist)
|
||||||
select:SetUserData("grouplist", grouplist)
|
selectGroup:SetUserData("grouplist", grouplist)
|
||||||
select:SetUserData("orderlist", orderlist)
|
selectGroup:SetUserData("orderlist", orderlist)
|
||||||
|
|
||||||
local firstgroup = orderlist[1]
|
local firstgroup = orderlist[1]
|
||||||
if firstgroup then
|
if firstgroup then
|
||||||
select:SetGroup((GroupExists(appName, options, path,status.groups.selected) and status.groups.selected) or firstgroup)
|
selectGroup:SetGroup((GroupExists(appName, options, path,status.groups.selected) and status.groups.selected) or firstgroup)
|
||||||
end
|
end
|
||||||
|
|
||||||
select.width = "fill"
|
selectGroup.width = "fill"
|
||||||
select.height = "fill"
|
selectGroup.height = "fill"
|
||||||
|
|
||||||
container:AddChild(select)
|
container:AddChild(selectGroup)
|
||||||
|
|
||||||
--assume tree group by default
|
--assume tree group by default
|
||||||
--if parenttype is tree then this group is already a node on that tree
|
--if parenttype is tree then this group is already a node on that tree
|
||||||
|
@ -1944,13 +1931,13 @@ end
|
||||||
-- convert pre-39 BlizOptions structure to the new format
|
-- convert pre-39 BlizOptions structure to the new format
|
||||||
if oldminor and oldminor < 39 and AceConfigDialog.BlizOptions then
|
if oldminor and oldminor < 39 and AceConfigDialog.BlizOptions then
|
||||||
local old = AceConfigDialog.BlizOptions
|
local old = AceConfigDialog.BlizOptions
|
||||||
local new = {}
|
local newOpt = {}
|
||||||
for key, widget in pairs(old) do
|
for key, widget in pairs(old) do
|
||||||
local appName = widget:GetUserData("appName")
|
local appName = widget:GetUserData("appName")
|
||||||
if not new[appName] then new[appName] = {} end
|
if not newOpt[appName] then newOpt[appName] = {} end
|
||||||
new[appName][key] = widget
|
newOpt[appName][key] = widget
|
||||||
end
|
end
|
||||||
AceConfigDialog.BlizOptions = new
|
AceConfigDialog.BlizOptions = newOpt
|
||||||
else
|
else
|
||||||
AceConfigDialog.BlizOptions = AceConfigDialog.BlizOptions or {}
|
AceConfigDialog.BlizOptions = AceConfigDialog.BlizOptions or {}
|
||||||
end
|
end
|
||||||
|
@ -1983,6 +1970,7 @@ end
|
||||||
-- @param parent The parent to use in the interface options tree.
|
-- @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.
|
-- @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 reference to the frame registered into the Interface Options.
|
||||||
|
-- @return The category ID to pass to Settings.OpenToCategory (or InterfaceOptionsFrame_OpenToCategory)
|
||||||
function AceConfigDialog:AddToBlizOptions(appName, name, parent, ...)
|
function AceConfigDialog:AddToBlizOptions(appName, name, parent, ...)
|
||||||
local BlizOptions = AceConfigDialog.BlizOptions
|
local BlizOptions = AceConfigDialog.BlizOptions
|
||||||
|
|
||||||
|
@ -1998,7 +1986,6 @@ function AceConfigDialog:AddToBlizOptions(appName, name, parent, ...)
|
||||||
if not BlizOptions[appName][key] then
|
if not BlizOptions[appName][key] then
|
||||||
local group = gui:Create("BlizOptionsGroup")
|
local group = gui:Create("BlizOptionsGroup")
|
||||||
BlizOptions[appName][key] = group
|
BlizOptions[appName][key] = group
|
||||||
group:SetName(name or appName, parent)
|
|
||||||
|
|
||||||
group:SetTitle(name or appName)
|
group:SetTitle(name or appName)
|
||||||
group:SetUserData("appName", appName)
|
group:SetUserData("appName", appName)
|
||||||
|
@ -2011,8 +1998,30 @@ function AceConfigDialog:AddToBlizOptions(appName, name, parent, ...)
|
||||||
end
|
end
|
||||||
group:SetCallback("OnShow", FeedToBlizPanel)
|
group:SetCallback("OnShow", FeedToBlizPanel)
|
||||||
group:SetCallback("OnHide", ClearBlizPanel)
|
group:SetCallback("OnHide", ClearBlizPanel)
|
||||||
InterfaceOptions_AddCategory(group.frame)
|
if Settings and Settings.RegisterCanvasLayoutCategory then
|
||||||
return group.frame
|
local categoryName = name or appName
|
||||||
|
if parent then
|
||||||
|
local category = Settings.GetCategory(parent)
|
||||||
|
if not category then
|
||||||
|
error(("The parent category '%s' was not found"):format(parent), 2)
|
||||||
|
end
|
||||||
|
local subcategory = Settings.RegisterCanvasLayoutSubcategory(category, group.frame, categoryName)
|
||||||
|
|
||||||
|
-- force the generated ID to be used for subcategories, as these can have very simple names like "Profiles"
|
||||||
|
group:SetName(subcategory.ID, parent)
|
||||||
|
else
|
||||||
|
local category = Settings.RegisterCanvasLayoutCategory(group.frame, categoryName)
|
||||||
|
-- using appName here would be cleaner, but would not be 100% compatible
|
||||||
|
-- but for top-level categories it should be fine, as these are typically addon names
|
||||||
|
category.ID = categoryName
|
||||||
|
group:SetName(categoryName, parent)
|
||||||
|
Settings.RegisterAddOnCategory(category)
|
||||||
|
end
|
||||||
|
else
|
||||||
|
group:SetName(name or appName, parent)
|
||||||
|
InterfaceOptions_AddCategory(group.frame)
|
||||||
|
end
|
||||||
|
return group.frame, group.frame.name
|
||||||
else
|
else
|
||||||
error(("%s has already been added to the Blizzard Options Window with the given path"):format(appName), 2)
|
error(("%s has already been added to the Blizzard Options Window with the given path"):format(appName), 2)
|
||||||
end
|
end
|
||||||
|
|
|
@ -8,10 +8,10 @@
|
||||||
-- :IterateOptionsTables() (and :GetOptionsTable() if only given one argument) return a function reference that the requesting config handling addon must call with valid "uiType", "uiName".
|
-- :IterateOptionsTables() (and :GetOptionsTable() if only given one argument) return a function reference that the requesting config handling addon must call with valid "uiType", "uiName".
|
||||||
-- @class file
|
-- @class file
|
||||||
-- @name AceConfigRegistry-3.0
|
-- @name AceConfigRegistry-3.0
|
||||||
-- @release $Id: AceConfigRegistry-3.0.lua 1207 2019-06-23 12:08:33Z nevcairiel $
|
-- @release $Id: AceConfigRegistry-3.0.lua 1296 2022-11-04 18:50:10Z nevcairiel $
|
||||||
local CallbackHandler = LibStub("CallbackHandler-1.0")
|
local CallbackHandler = LibStub("CallbackHandler-1.0")
|
||||||
|
|
||||||
local MAJOR, MINOR = "AceConfigRegistry-3.0", 20
|
local MAJOR, MINOR = "AceConfigRegistry-3.0", 21
|
||||||
local AceConfigRegistry = LibStub:NewLibrary(MAJOR, MINOR)
|
local AceConfigRegistry = LibStub:NewLibrary(MAJOR, MINOR)
|
||||||
|
|
||||||
if not AceConfigRegistry then return end
|
if not AceConfigRegistry then return end
|
||||||
|
@ -83,6 +83,7 @@ local basekeys={
|
||||||
dialogHidden=optmethodbool,
|
dialogHidden=optmethodbool,
|
||||||
dropdownHidden=optmethodbool,
|
dropdownHidden=optmethodbool,
|
||||||
cmdHidden=optmethodbool,
|
cmdHidden=optmethodbool,
|
||||||
|
tooltipHyperlink=optstringfunc,
|
||||||
icon=optstringnumberfunc,
|
icon=optstringnumberfunc,
|
||||||
iconCoords=optmethodtable,
|
iconCoords=optmethodtable,
|
||||||
handler=opttable,
|
handler=opttable,
|
||||||
|
|
|
@ -40,7 +40,7 @@
|
||||||
-- end
|
-- end
|
||||||
-- @class file
|
-- @class file
|
||||||
-- @name AceDB-3.0.lua
|
-- @name AceDB-3.0.lua
|
||||||
-- @release $Id: AceDB-3.0.lua 1217 2019-07-11 03:06:18Z funkydude $
|
-- @release $Id: AceDB-3.0.lua 1284 2022-09-25 09:15:30Z nevcairiel $
|
||||||
local ACEDB_MAJOR, ACEDB_MINOR = "AceDB-3.0", 27
|
local ACEDB_MAJOR, ACEDB_MINOR = "AceDB-3.0", 27
|
||||||
local AceDB = LibStub:NewLibrary(ACEDB_MAJOR, ACEDB_MINOR)
|
local AceDB = LibStub:NewLibrary(ACEDB_MAJOR, ACEDB_MINOR)
|
||||||
|
|
||||||
|
@ -53,10 +53,6 @@ local setmetatable, rawset, rawget = setmetatable, rawset, rawget
|
||||||
-- WoW APIs
|
-- WoW APIs
|
||||||
local _G = _G
|
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
|
|
||||||
|
|
||||||
AceDB.db_registry = AceDB.db_registry or {}
|
AceDB.db_registry = AceDB.db_registry or {}
|
||||||
AceDB.frame = AceDB.frame or CreateFrame("Frame")
|
AceDB.frame = AceDB.frame or CreateFrame("Frame")
|
||||||
|
|
||||||
|
@ -98,11 +94,11 @@ local function copyDefaults(dest, src)
|
||||||
-- This is a metatable used for table defaults
|
-- This is a metatable used for table defaults
|
||||||
local mt = {
|
local mt = {
|
||||||
-- This handles the lookup and creation of new subtables
|
-- This handles the lookup and creation of new subtables
|
||||||
__index = function(t,k)
|
__index = function(t,k2)
|
||||||
if k == nil then return nil end
|
if k2 == nil then return nil end
|
||||||
local tbl = {}
|
local tbl = {}
|
||||||
copyDefaults(tbl, v)
|
copyDefaults(tbl, v)
|
||||||
rawset(t, k, tbl)
|
rawset(t, k2, tbl)
|
||||||
return tbl
|
return tbl
|
||||||
end,
|
end,
|
||||||
}
|
}
|
||||||
|
@ -115,7 +111,7 @@ local function copyDefaults(dest, src)
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
-- Values are not tables, so this is just a simple return
|
-- Values are not tables, so this is just a simple return
|
||||||
local mt = {__index = function(t,k) return k~=nil and v or nil end}
|
local mt = {__index = function(t,k2) return k2~=nil and v or nil end}
|
||||||
setmetatable(dest, mt)
|
setmetatable(dest, mt)
|
||||||
end
|
end
|
||||||
elseif type(v) == "table" then
|
elseif type(v) == "table" then
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
--- AceDBOptions-3.0 provides a universal AceConfig options screen for managing AceDB-3.0 profiles.
|
--- AceDBOptions-3.0 provides a universal AceConfig options screen for managing AceDB-3.0 profiles.
|
||||||
-- @class file
|
-- @class file
|
||||||
-- @name AceDBOptions-3.0
|
-- @name AceDBOptions-3.0
|
||||||
-- @release $Id: AceDBOptions-3.0.lua 1202 2019-05-15 23:11:22Z nevcairiel $
|
-- @release $Id: AceDBOptions-3.0.lua 1284 2022-09-25 09:15:30Z nevcairiel $
|
||||||
local ACEDBO_MAJOR, ACEDBO_MINOR = "AceDBOptions-3.0", 15
|
local ACEDBO_MAJOR, ACEDBO_MINOR = "AceDBOptions-3.0", 15
|
||||||
local AceDBOptions = LibStub:NewLibrary(ACEDBO_MAJOR, ACEDBO_MINOR)
|
local AceDBOptions = LibStub:NewLibrary(ACEDBO_MAJOR, ACEDBO_MINOR)
|
||||||
|
|
||||||
|
@ -13,10 +13,6 @@ local pairs, next = pairs, next
|
||||||
-- WoW APIs
|
-- WoW APIs
|
||||||
local UnitClass = UnitClass
|
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.optionTables = AceDBOptions.optionTables or {}
|
||||||
AceDBOptions.handlers = AceDBOptions.handlers or {}
|
AceDBOptions.handlers = AceDBOptions.handlers or {}
|
||||||
|
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
-- f:AddChild(btn)
|
-- f:AddChild(btn)
|
||||||
-- @class file
|
-- @class file
|
||||||
-- @name AceGUI-3.0
|
-- @name AceGUI-3.0
|
||||||
-- @release $Id: AceGUI-3.0.lua 1247 2021-01-23 23:16:39Z funkehdude $
|
-- @release $Id: AceGUI-3.0.lua 1288 2022-09-25 14:19:00Z funkehdude $
|
||||||
local ACEGUI_MAJOR, ACEGUI_MINOR = "AceGUI-3.0", 41
|
local ACEGUI_MAJOR, ACEGUI_MINOR = "AceGUI-3.0", 41
|
||||||
local AceGUI, oldminor = LibStub:NewLibrary(ACEGUI_MAJOR, ACEGUI_MINOR)
|
local AceGUI, oldminor = LibStub:NewLibrary(ACEGUI_MAJOR, ACEGUI_MINOR)
|
||||||
|
|
||||||
|
@ -35,17 +35,11 @@ local tinsert, wipe = table.insert, table.wipe
|
||||||
local select, pairs, next, type = select, pairs, next, type
|
local select, pairs, next, type = select, pairs, next, type
|
||||||
local error, assert = error, assert
|
local error, assert = error, assert
|
||||||
local setmetatable, rawget = setmetatable, rawget
|
local setmetatable, rawget = setmetatable, rawget
|
||||||
local math_max = math.max
|
local math_max, math_min, math_ceil = math.max, math.min, math.ceil
|
||||||
|
|
||||||
-- WoW APIs
|
-- WoW APIs
|
||||||
local UIParent = UIParent
|
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.WidgetRegistry = AceGUI.WidgetRegistry or {}
|
||||||
AceGUI.LayoutRegistry = AceGUI.LayoutRegistry or {}
|
AceGUI.LayoutRegistry = AceGUI.LayoutRegistry or {}
|
||||||
AceGUI.WidgetBase = AceGUI.WidgetBase or {}
|
AceGUI.WidgetBase = AceGUI.WidgetBase or {}
|
||||||
|
@ -94,38 +88,38 @@ do
|
||||||
AceGUI.objPools = AceGUI.objPools or {}
|
AceGUI.objPools = AceGUI.objPools or {}
|
||||||
local objPools = AceGUI.objPools
|
local objPools = AceGUI.objPools
|
||||||
--Returns a new instance, if none are available either returns a new table or calls the given contructor
|
--Returns a new instance, if none are available either returns a new table or calls the given contructor
|
||||||
function newWidget(type)
|
function newWidget(widgetType)
|
||||||
if not WidgetRegistry[type] then
|
if not WidgetRegistry[widgetType] then
|
||||||
error("Attempt to instantiate unknown widget type", 2)
|
error("Attempt to instantiate unknown widget type", 2)
|
||||||
end
|
end
|
||||||
|
|
||||||
if not objPools[type] then
|
if not objPools[widgetType] then
|
||||||
objPools[type] = {}
|
objPools[widgetType] = {}
|
||||||
end
|
end
|
||||||
|
|
||||||
local newObj = next(objPools[type])
|
local newObj = next(objPools[widgetType])
|
||||||
if not newObj then
|
if not newObj then
|
||||||
newObj = WidgetRegistry[type]()
|
newObj = WidgetRegistry[widgetType]()
|
||||||
newObj.AceGUIWidgetVersion = WidgetVersions[type]
|
newObj.AceGUIWidgetVersion = WidgetVersions[widgetType]
|
||||||
else
|
else
|
||||||
objPools[type][newObj] = nil
|
objPools[widgetType][newObj] = nil
|
||||||
-- if the widget is older then the latest, don't even try to reuse it
|
-- if the widget is older then the latest, don't even try to reuse it
|
||||||
-- just forget about it, and grab a new one.
|
-- just forget about it, and grab a new one.
|
||||||
if not newObj.AceGUIWidgetVersion or newObj.AceGUIWidgetVersion < WidgetVersions[type] then
|
if not newObj.AceGUIWidgetVersion or newObj.AceGUIWidgetVersion < WidgetVersions[widgetType] then
|
||||||
return newWidget(type)
|
return newWidget(widgetType)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return newObj
|
return newObj
|
||||||
end
|
end
|
||||||
-- Releases an instance to the Pool
|
-- Releases an instance to the Pool
|
||||||
function delWidget(obj,type)
|
function delWidget(obj,widgetType)
|
||||||
if not objPools[type] then
|
if not objPools[widgetType] then
|
||||||
objPools[type] = {}
|
objPools[widgetType] = {}
|
||||||
end
|
end
|
||||||
if objPools[type][obj] then
|
if objPools[widgetType][obj] then
|
||||||
error("Attempt to Release Widget that is already released", 2)
|
error("Attempt to Release Widget that is already released", 2)
|
||||||
end
|
end
|
||||||
objPools[type][obj] = true
|
objPools[widgetType][obj] = true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -141,9 +135,9 @@ end
|
||||||
-- OnAcquire function on it, before returning.
|
-- OnAcquire function on it, before returning.
|
||||||
-- @param type The type of the widget.
|
-- @param type The type of the widget.
|
||||||
-- @return The newly created widget.
|
-- @return The newly created widget.
|
||||||
function AceGUI:Create(type)
|
function AceGUI:Create(widgetType)
|
||||||
if WidgetRegistry[type] then
|
if WidgetRegistry[widgetType] then
|
||||||
local widget = newWidget(type)
|
local widget = newWidget(widgetType)
|
||||||
|
|
||||||
if rawget(widget, "Acquire") then
|
if rawget(widget, "Acquire") then
|
||||||
widget.OnAcquire = widget.Acquire
|
widget.OnAcquire = widget.Acquire
|
||||||
|
@ -161,7 +155,7 @@ function AceGUI:Create(type)
|
||||||
if widget.OnAcquire then
|
if widget.OnAcquire then
|
||||||
widget:OnAcquire()
|
widget:OnAcquire()
|
||||||
else
|
else
|
||||||
error(("Widget type %s doesn't supply an OnAcquire Function"):format(type))
|
error(("Widget type %s doesn't supply an OnAcquire Function"):format(widgetType))
|
||||||
end
|
end
|
||||||
-- Set the default Layout ("List")
|
-- Set the default Layout ("List")
|
||||||
safecall(widget.SetLayout, widget, "List")
|
safecall(widget.SetLayout, widget, "List")
|
||||||
|
@ -589,25 +583,25 @@ AceGUI.counts = AceGUI.counts or {}
|
||||||
-- This is used by widgets that require a named frame, e.g. when a Blizzard
|
-- This is used by widgets that require a named frame, e.g. when a Blizzard
|
||||||
-- Template requires it.
|
-- Template requires it.
|
||||||
-- @param type The widget type
|
-- @param type The widget type
|
||||||
function AceGUI:GetNextWidgetNum(type)
|
function AceGUI:GetNextWidgetNum(widgetType)
|
||||||
if not self.counts[type] then
|
if not self.counts[widgetType] then
|
||||||
self.counts[type] = 0
|
self.counts[widgetType] = 0
|
||||||
end
|
end
|
||||||
self.counts[type] = self.counts[type] + 1
|
self.counts[widgetType] = self.counts[widgetType] + 1
|
||||||
return self.counts[type]
|
return self.counts[widgetType]
|
||||||
end
|
end
|
||||||
|
|
||||||
--- Return the number of created widgets for this type.
|
--- Return the number of created widgets for this type.
|
||||||
-- In contrast to GetNextWidgetNum, the number is not incremented.
|
-- In contrast to GetNextWidgetNum, the number is not incremented.
|
||||||
-- @param type The widget type
|
-- @param widgetType The widget type
|
||||||
function AceGUI:GetWidgetCount(type)
|
function AceGUI:GetWidgetCount(widgetType)
|
||||||
return self.counts[type] or 0
|
return self.counts[widgetType] or 0
|
||||||
end
|
end
|
||||||
|
|
||||||
--- Return the version of the currently registered widget type.
|
--- Return the version of the currently registered widget type.
|
||||||
-- @param type The widget type
|
-- @param widgetType The widget type
|
||||||
function AceGUI:GetWidgetVersion(type)
|
function AceGUI:GetWidgetVersion(widgetType)
|
||||||
return WidgetVersions[type]
|
return WidgetVersions[widgetType]
|
||||||
end
|
end
|
||||||
|
|
||||||
-------------
|
-------------
|
||||||
|
@ -770,7 +764,6 @@ AceGUI:RegisterLayout("Flow",
|
||||||
|
|
||||||
usedwidth = 0
|
usedwidth = 0
|
||||||
rowstart = frame
|
rowstart = frame
|
||||||
rowstartoffset = frameoffset
|
|
||||||
|
|
||||||
if child.DoLayout then
|
if child.DoLayout then
|
||||||
child:DoLayout()
|
child:DoLayout()
|
||||||
|
@ -813,7 +806,8 @@ local GetCellAlign = function (dir, tableObj, colObj, cellObj, cell, child)
|
||||||
or colObj and (colObj["align" .. dir] or colObj.align)
|
or colObj and (colObj["align" .. dir] or colObj.align)
|
||||||
or tableObj["align" .. dir] or tableObj.align
|
or tableObj["align" .. dir] or tableObj.align
|
||||||
or "CENTERLEFT"
|
or "CENTERLEFT"
|
||||||
local child, cell, val = child or 0, cell or 0, nil
|
local val
|
||||||
|
child, cell = child or 0, cell or 0
|
||||||
|
|
||||||
if type(fn) == "string" then
|
if type(fn) == "string" then
|
||||||
fn = fn:lower()
|
fn = fn:lower()
|
||||||
|
@ -827,7 +821,7 @@ local GetCellAlign = function (dir, tableObj, colObj, cellObj, cell, child)
|
||||||
val = fn
|
val = fn
|
||||||
end
|
end
|
||||||
|
|
||||||
return fn, max(0, min(val, cell))
|
return fn, math_max(0, math_min(val, cell))
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Get width or height for multiple cells combined
|
-- Get width or height for multiple cells combined
|
||||||
|
@ -836,7 +830,7 @@ local GetCellDimension = function (dir, laneDim, from, to, space)
|
||||||
for cell=from,to do
|
for cell=from,to do
|
||||||
dim = dim + (laneDim[cell] or 0)
|
dim = dim + (laneDim[cell] or 0)
|
||||||
end
|
end
|
||||||
return dim + max(0, to - from) * (space or 0)
|
return dim + math_max(0, to - from) * (space or 0)
|
||||||
end
|
end
|
||||||
|
|
||||||
--[[ Options
|
--[[ Options
|
||||||
|
@ -882,7 +876,7 @@ AceGUI:RegisterLayout("Table",
|
||||||
repeat
|
repeat
|
||||||
n = n + 1
|
n = n + 1
|
||||||
local col = (n - 1) % #cols + 1
|
local col = (n - 1) % #cols + 1
|
||||||
local row = ceil(n / #cols)
|
local row = math_ceil(n / #cols)
|
||||||
local rowspan = rowspans[col]
|
local rowspan = rowspans[col]
|
||||||
local cell = rowspan and rowspan.child or child
|
local cell = rowspan and rowspan.child or child
|
||||||
local cellObj = cell:GetUserData("cell")
|
local cellObj = cell:GetUserData("cell")
|
||||||
|
@ -898,7 +892,7 @@ AceGUI:RegisterLayout("Table",
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Colspan
|
-- Colspan
|
||||||
local colspan = max(0, min((cellObj and cellObj.colspan or 1) - 1, #cols - col))
|
local colspan = math_max(0, math_min((cellObj and cellObj.colspan or 1) - 1, #cols - col))
|
||||||
n = n + colspan
|
n = n + colspan
|
||||||
|
|
||||||
-- Place the cell
|
-- Place the cell
|
||||||
|
@ -915,7 +909,7 @@ AceGUI:RegisterLayout("Table",
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
local rows = ceil(n / #cols)
|
local rows = math_ceil(n / #cols)
|
||||||
|
|
||||||
-- Determine fixed size cols and collect weights
|
-- Determine fixed size cols and collect weights
|
||||||
local extantH, totalWeight = totalH, 0
|
local extantH, totalWeight = totalH, 0
|
||||||
|
@ -940,16 +934,16 @@ AceGUI:RegisterLayout("Table",
|
||||||
f:ClearAllPoints()
|
f:ClearAllPoints()
|
||||||
local childH = f:GetWidth() or 0
|
local childH = f:GetWidth() or 0
|
||||||
|
|
||||||
laneH[col] = max(laneH[col], childH - GetCellDimension("H", laneH, colStart[child], col - 1, spaceH))
|
laneH[col] = math_max(laneH[col], childH - GetCellDimension("H", laneH, colStart[child], col - 1, spaceH))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
laneH[col] = max(colObj.min or colObj[1] or 0, min(laneH[col], colObj.max or colObj[2] or laneH[col]))
|
laneH[col] = math_max(colObj.min or colObj[1] or 0, math_min(laneH[col], colObj.max or colObj[2] or laneH[col]))
|
||||||
else
|
else
|
||||||
-- Rel./Abs. width
|
-- Rel./Abs. width
|
||||||
laneH[col] = colObj.width < 1 and colObj.width * totalH or colObj.width
|
laneH[col] = colObj.width < 1 and colObj.width * totalH or colObj.width
|
||||||
end
|
end
|
||||||
extantH = max(0, extantH - laneH[col])
|
extantH = math_max(0, extantH - laneH[col])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -988,7 +982,7 @@ AceGUI:RegisterLayout("Table",
|
||||||
child:DoLayout()
|
child:DoLayout()
|
||||||
end
|
end
|
||||||
|
|
||||||
rowV = max(rowV, (f:GetHeight() or 0) - GetCellDimension("V", laneV, rowStart[child], row - 1, spaceV))
|
rowV = math_max(rowV, (f:GetHeight() or 0) - GetCellDimension("V", laneV, rowStart[child], row - 1, spaceV))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
BlizOptionsGroup Container
|
BlizOptionsGroup Container
|
||||||
Simple container widget for the integration of AceGUI into the Blizzard Interface Options
|
Simple container widget for the integration of AceGUI into the Blizzard Interface Options
|
||||||
-------------------------------------------------------------------------------]]
|
-------------------------------------------------------------------------------]]
|
||||||
local Type, Version = "BlizOptionsGroup", 21
|
local Type, Version = "BlizOptionsGroup", 26
|
||||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||||
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
||||||
|
|
||||||
|
@ -99,7 +99,7 @@ local methods = {
|
||||||
Constructor
|
Constructor
|
||||||
-------------------------------------------------------------------------------]]
|
-------------------------------------------------------------------------------]]
|
||||||
local function Constructor()
|
local function Constructor()
|
||||||
local frame = CreateFrame("Frame")
|
local frame = CreateFrame("Frame", nil, InterfaceOptionsFramePanelContainer)
|
||||||
frame:Hide()
|
frame:Hide()
|
||||||
|
|
||||||
-- support functions for the Blizzard Interface Options
|
-- support functions for the Blizzard Interface Options
|
||||||
|
@ -108,6 +108,11 @@ local function Constructor()
|
||||||
frame.default = default
|
frame.default = default
|
||||||
frame.refresh = refresh
|
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("OnHide", OnHide)
|
||||||
frame:SetScript("OnShow", OnShow)
|
frame:SetScript("OnShow", OnShow)
|
||||||
|
|
||||||
|
|
|
@ -125,7 +125,7 @@ local function Constructor()
|
||||||
dropdown.frame:Show()
|
dropdown.frame:Show()
|
||||||
dropdown:SetLabel("")
|
dropdown:SetLabel("")
|
||||||
|
|
||||||
local border = CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
|
local border = CreateFrame("Frame", nil, frame, "BackdropTemplate")
|
||||||
border:SetPoint("TOPLEFT", 0, -26)
|
border:SetPoint("TOPLEFT", 0, -26)
|
||||||
border:SetPoint("BOTTOMRIGHT", 0, 3)
|
border:SetPoint("BOTTOMRIGHT", 0, 3)
|
||||||
border:SetBackdrop(PaneBackdrop)
|
border:SetBackdrop(PaneBackdrop)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
--[[-----------------------------------------------------------------------------
|
--[[-----------------------------------------------------------------------------
|
||||||
Frame Container
|
Frame Container
|
||||||
-------------------------------------------------------------------------------]]
|
-------------------------------------------------------------------------------]]
|
||||||
local Type, Version = "Frame", 28
|
local Type, Version = "Frame", 30
|
||||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||||
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
||||||
|
|
||||||
|
@ -13,10 +13,6 @@ local wipe = table.wipe
|
||||||
local PlaySound = PlaySound
|
local PlaySound = PlaySound
|
||||||
local CreateFrame, UIParent = CreateFrame, UIParent
|
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
|
Scripts
|
||||||
-------------------------------------------------------------------------------]]
|
-------------------------------------------------------------------------------]]
|
||||||
|
@ -180,7 +176,7 @@ local PaneBackdrop = {
|
||||||
}
|
}
|
||||||
|
|
||||||
local function Constructor()
|
local function Constructor()
|
||||||
local frame = CreateFrame("Frame", nil, UIParent, BackdropTemplateMixin and "BackdropTemplate" or nil)
|
local frame = CreateFrame("Frame", nil, UIParent, "BackdropTemplate")
|
||||||
frame:Hide()
|
frame:Hide()
|
||||||
|
|
||||||
frame:EnableMouse(true)
|
frame:EnableMouse(true)
|
||||||
|
@ -190,7 +186,11 @@ local function Constructor()
|
||||||
frame:SetFrameLevel(100) -- Lots of room to draw under it
|
frame:SetFrameLevel(100) -- Lots of room to draw under it
|
||||||
frame:SetBackdrop(FrameBackdrop)
|
frame:SetBackdrop(FrameBackdrop)
|
||||||
frame:SetBackdropColor(0, 0, 0, 1)
|
frame:SetBackdropColor(0, 0, 0, 1)
|
||||||
frame:SetMinResize(400, 200)
|
if frame.SetResizeBounds then -- WoW 10.0
|
||||||
|
frame:SetResizeBounds(400, 200)
|
||||||
|
else
|
||||||
|
frame:SetMinResize(400, 200)
|
||||||
|
end
|
||||||
frame:SetToplevel(true)
|
frame:SetToplevel(true)
|
||||||
frame:SetScript("OnShow", Frame_OnShow)
|
frame:SetScript("OnShow", Frame_OnShow)
|
||||||
frame:SetScript("OnHide", Frame_OnClose)
|
frame:SetScript("OnHide", Frame_OnClose)
|
||||||
|
@ -203,7 +203,7 @@ local function Constructor()
|
||||||
closebutton:SetWidth(100)
|
closebutton:SetWidth(100)
|
||||||
closebutton:SetText(CLOSE)
|
closebutton:SetText(CLOSE)
|
||||||
|
|
||||||
local statusbg = CreateFrame("Button", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
|
local statusbg = CreateFrame("Button", nil, frame, "BackdropTemplate")
|
||||||
statusbg:SetPoint("BOTTOMLEFT", 15, 15)
|
statusbg:SetPoint("BOTTOMLEFT", 15, 15)
|
||||||
statusbg:SetPoint("BOTTOMRIGHT", -132, 15)
|
statusbg:SetPoint("BOTTOMRIGHT", -132, 15)
|
||||||
statusbg:SetHeight(24)
|
statusbg:SetHeight(24)
|
||||||
|
@ -271,7 +271,7 @@ local function Constructor()
|
||||||
line2:SetHeight(8)
|
line2:SetHeight(8)
|
||||||
line2:SetPoint("BOTTOMRIGHT", -8, 8)
|
line2:SetPoint("BOTTOMRIGHT", -8, 8)
|
||||||
line2:SetTexture(137057) -- Interface\\Tooltips\\UI-Tooltip-Border
|
line2:SetTexture(137057) -- Interface\\Tooltips\\UI-Tooltip-Border
|
||||||
local x = 0.1 * 8/17
|
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)
|
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)
|
local sizer_s = CreateFrame("Frame", nil, frame)
|
||||||
|
|
|
@ -75,7 +75,7 @@ local function Constructor()
|
||||||
titletext:SetJustifyH("LEFT")
|
titletext:SetJustifyH("LEFT")
|
||||||
titletext:SetHeight(18)
|
titletext:SetHeight(18)
|
||||||
|
|
||||||
local border = CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
|
local border = CreateFrame("Frame", nil, frame, "BackdropTemplate")
|
||||||
border:SetPoint("TOPLEFT", 0, -17)
|
border:SetPoint("TOPLEFT", 0, -17)
|
||||||
border:SetPoint("BOTTOMRIGHT", -1, 3)
|
border:SetPoint("BOTTOMRIGHT", -1, 3)
|
||||||
border:SetBackdrop(PaneBackdrop)
|
border:SetBackdrop(PaneBackdrop)
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
TabGroup Container
|
TabGroup Container
|
||||||
Container that uses tabs on top to switch between groups.
|
Container that uses tabs on top to switch between groups.
|
||||||
-------------------------------------------------------------------------------]]
|
-------------------------------------------------------------------------------]]
|
||||||
local Type, Version = "TabGroup", 37
|
local Type, Version = "TabGroup", 38
|
||||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||||
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
||||||
|
|
||||||
|
@ -14,10 +14,6 @@ local PlaySound = PlaySound
|
||||||
local CreateFrame, UIParent = CreateFrame, UIParent
|
local CreateFrame, UIParent = CreateFrame, UIParent
|
||||||
local _G = _G
|
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 upvalue storage used by BuildTabs
|
||||||
local widths = {}
|
local widths = {}
|
||||||
local rowwidths = {}
|
local rowwidths = {}
|
||||||
|
@ -26,6 +22,143 @@ local rowends = {}
|
||||||
--[[-----------------------------------------------------------------------------
|
--[[-----------------------------------------------------------------------------
|
||||||
Support functions
|
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)
|
local function UpdateTabLook(frame)
|
||||||
if frame.disabled then
|
if frame.disabled then
|
||||||
PanelTemplates_SetDisabledTabState(frame)
|
PanelTemplates_SetDisabledTabState(frame)
|
||||||
|
@ -103,11 +236,64 @@ local methods = {
|
||||||
|
|
||||||
["CreateTab"] = function(self, id)
|
["CreateTab"] = function(self, id)
|
||||||
local tabname = ("AceGUITabGroup%dTab%d"):format(self.num, id)
|
local tabname = ("AceGUITabGroup%dTab%d"):format(self.num, id)
|
||||||
local tab = CreateFrame("Button", tabname, self.border, "OptionsFrameTabButtonTemplate")
|
local tab = CreateFrame("Button", tabname, self.border)
|
||||||
|
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.obj = self
|
||||||
tab.id = id
|
tab.id = id
|
||||||
|
|
||||||
tab.text = _G[tabname .. "Text"]
|
tab.text = tab.Text -- compat
|
||||||
tab.text:ClearAllPoints()
|
tab.text:ClearAllPoints()
|
||||||
tab.text:SetPoint("LEFT", 14, -3)
|
tab.text:SetPoint("LEFT", 14, -3)
|
||||||
tab.text:SetPoint("RIGHT", -12, -3)
|
tab.text:SetPoint("RIGHT", -12, -3)
|
||||||
|
@ -316,7 +502,7 @@ local function Constructor()
|
||||||
titletext:SetHeight(18)
|
titletext:SetHeight(18)
|
||||||
titletext:SetText("")
|
titletext:SetText("")
|
||||||
|
|
||||||
local border = CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
|
local border = CreateFrame("Frame", nil, frame, "BackdropTemplate")
|
||||||
border:SetPoint("TOPLEFT", 1, -27)
|
border:SetPoint("TOPLEFT", 1, -27)
|
||||||
border:SetPoint("BOTTOMRIGHT", -1, 3)
|
border:SetPoint("BOTTOMRIGHT", -1, 3)
|
||||||
border:SetBackdrop(PaneBackdrop)
|
border:SetBackdrop(PaneBackdrop)
|
||||||
|
|
|
@ -2,22 +2,18 @@
|
||||||
TreeGroup Container
|
TreeGroup Container
|
||||||
Container that uses a tree control to switch between groups.
|
Container that uses a tree control to switch between groups.
|
||||||
-------------------------------------------------------------------------------]]
|
-------------------------------------------------------------------------------]]
|
||||||
local Type, Version = "TreeGroup", 45
|
local Type, Version = "TreeGroup", 47
|
||||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||||
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
||||||
|
|
||||||
-- Lua APIs
|
-- Lua APIs
|
||||||
local next, pairs, ipairs, assert, type = next, pairs, ipairs, assert, type
|
local next, pairs, ipairs, assert, type = next, pairs, ipairs, assert, type
|
||||||
local math_min, math_max, floor = math.min, math.max, floor
|
local math_min, math_max, floor = math.min, math.max, math.floor
|
||||||
local select, tremove, unpack, tconcat = select, table.remove, unpack, table.concat
|
local select, tremove, unpack, tconcat = select, table.remove, unpack, table.concat
|
||||||
|
|
||||||
-- WoW APIs
|
-- WoW APIs
|
||||||
local CreateFrame, UIParent = CreateFrame, UIParent
|
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: FONT_COLOR_CODE_CLOSE
|
|
||||||
|
|
||||||
-- Recycling functions
|
-- Recycling functions
|
||||||
local new, del
|
local new, del
|
||||||
do
|
do
|
||||||
|
@ -567,7 +563,11 @@ local methods = {
|
||||||
if maxtreewidth > 100 and status.treewidth > maxtreewidth then
|
if maxtreewidth > 100 and status.treewidth > maxtreewidth then
|
||||||
self:SetTreeWidth(maxtreewidth, status.treesizable)
|
self:SetTreeWidth(maxtreewidth, status.treesizable)
|
||||||
end
|
end
|
||||||
treeframe:SetMaxResize(maxtreewidth, 1600)
|
if treeframe.SetResizeBounds then
|
||||||
|
treeframe:SetResizeBounds(100, 1, maxtreewidth, 1600)
|
||||||
|
else
|
||||||
|
treeframe:SetMaxResize(maxtreewidth, 1600)
|
||||||
|
end
|
||||||
end,
|
end,
|
||||||
|
|
||||||
["OnHeightSet"] = function(self, height)
|
["OnHeightSet"] = function(self, height)
|
||||||
|
@ -637,7 +637,7 @@ local function Constructor()
|
||||||
local num = AceGUI:GetNextWidgetNum(Type)
|
local num = AceGUI:GetNextWidgetNum(Type)
|
||||||
local frame = CreateFrame("Frame", nil, UIParent)
|
local frame = CreateFrame("Frame", nil, UIParent)
|
||||||
|
|
||||||
local treeframe = CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
|
local treeframe = CreateFrame("Frame", nil, frame, "BackdropTemplate")
|
||||||
treeframe:SetPoint("TOPLEFT")
|
treeframe:SetPoint("TOPLEFT")
|
||||||
treeframe:SetPoint("BOTTOMLEFT")
|
treeframe:SetPoint("BOTTOMLEFT")
|
||||||
treeframe:SetWidth(DEFAULT_TREE_WIDTH)
|
treeframe:SetWidth(DEFAULT_TREE_WIDTH)
|
||||||
|
@ -646,13 +646,17 @@ local function Constructor()
|
||||||
treeframe:SetBackdropColor(0.1, 0.1, 0.1, 0.5)
|
treeframe:SetBackdropColor(0.1, 0.1, 0.1, 0.5)
|
||||||
treeframe:SetBackdropBorderColor(0.4, 0.4, 0.4)
|
treeframe:SetBackdropBorderColor(0.4, 0.4, 0.4)
|
||||||
treeframe:SetResizable(true)
|
treeframe:SetResizable(true)
|
||||||
treeframe:SetMinResize(100, 1)
|
if treeframe.SetResizeBounds then -- WoW 10.0
|
||||||
treeframe:SetMaxResize(400, 1600)
|
treeframe:SetResizeBounds(100, 1, 400, 1600)
|
||||||
|
else
|
||||||
|
treeframe:SetMinResize(100, 1)
|
||||||
|
treeframe:SetMaxResize(400, 1600)
|
||||||
|
end
|
||||||
treeframe:SetScript("OnUpdate", FirstFrameUpdate)
|
treeframe:SetScript("OnUpdate", FirstFrameUpdate)
|
||||||
treeframe:SetScript("OnSizeChanged", Tree_OnSizeChanged)
|
treeframe:SetScript("OnSizeChanged", Tree_OnSizeChanged)
|
||||||
treeframe:SetScript("OnMouseWheel", Tree_OnMouseWheel)
|
treeframe:SetScript("OnMouseWheel", Tree_OnMouseWheel)
|
||||||
|
|
||||||
local dragger = CreateFrame("Frame", nil, treeframe, BackdropTemplateMixin and "BackdropTemplate" or nil)
|
local dragger = CreateFrame("Frame", nil, treeframe, "BackdropTemplate")
|
||||||
dragger:SetWidth(8)
|
dragger:SetWidth(8)
|
||||||
dragger:SetPoint("TOP", treeframe, "TOPRIGHT")
|
dragger:SetPoint("TOP", treeframe, "TOPRIGHT")
|
||||||
dragger:SetPoint("BOTTOM", treeframe, "BOTTOMRIGHT")
|
dragger:SetPoint("BOTTOM", treeframe, "BOTTOMRIGHT")
|
||||||
|
@ -677,7 +681,7 @@ local function Constructor()
|
||||||
scrollbg:SetAllPoints(scrollbar)
|
scrollbg:SetAllPoints(scrollbar)
|
||||||
scrollbg:SetColorTexture(0,0,0,0.4)
|
scrollbg:SetColorTexture(0,0,0,0.4)
|
||||||
|
|
||||||
local border = CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
|
local border = CreateFrame("Frame", nil, frame, "BackdropTemplate")
|
||||||
border:SetPoint("TOPLEFT", treeframe, "TOPRIGHT")
|
border:SetPoint("TOPLEFT", treeframe, "TOPRIGHT")
|
||||||
border:SetPoint("BOTTOMRIGHT")
|
border:SetPoint("BOTTOMRIGHT")
|
||||||
border:SetBackdrop(PaneBackdrop)
|
border:SetBackdrop(PaneBackdrop)
|
||||||
|
|
|
@ -7,10 +7,6 @@ local pairs, assert, type = pairs, assert, type
|
||||||
local PlaySound = PlaySound
|
local PlaySound = PlaySound
|
||||||
local CreateFrame, UIParent = CreateFrame, UIParent
|
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 --
|
-- Main Frame --
|
||||||
----------------
|
----------------
|
||||||
|
@ -21,7 +17,7 @@ local CreateFrame, UIParent = CreateFrame, UIParent
|
||||||
]]
|
]]
|
||||||
do
|
do
|
||||||
local Type = "Window"
|
local Type = "Window"
|
||||||
local Version = 6
|
local Version = 8
|
||||||
|
|
||||||
local function frameOnShow(this)
|
local function frameOnShow(this)
|
||||||
this.obj:Fire("OnShow")
|
this.obj:Fire("OnShow")
|
||||||
|
@ -186,7 +182,11 @@ do
|
||||||
|
|
||||||
frame:SetScript("OnShow",frameOnShow)
|
frame:SetScript("OnShow",frameOnShow)
|
||||||
frame:SetScript("OnHide",frameOnClose)
|
frame:SetScript("OnHide",frameOnClose)
|
||||||
frame:SetMinResize(240,240)
|
if frame.SetResizeBounds then -- WoW 10.0
|
||||||
|
frame:SetResizeBounds(240,240)
|
||||||
|
else
|
||||||
|
frame:SetMinResize(240,240)
|
||||||
|
end
|
||||||
frame:SetToplevel(true)
|
frame:SetToplevel(true)
|
||||||
|
|
||||||
local titlebg = frame:CreateTexture(nil, "BACKGROUND")
|
local titlebg = frame:CreateTexture(nil, "BACKGROUND")
|
||||||
|
@ -300,7 +300,7 @@ do
|
||||||
line2:SetHeight(8)
|
line2:SetHeight(8)
|
||||||
line2:SetPoint("BOTTOMRIGHT", -8, 8)
|
line2:SetPoint("BOTTOMRIGHT", -8, 8)
|
||||||
line2:SetTexture(137057) -- Interface\\Tooltips\\UI-Tooltip-Border
|
line2:SetTexture(137057) -- Interface\\Tooltips\\UI-Tooltip-Border
|
||||||
local x = 0.1 * 8/17
|
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)
|
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)
|
local sizer_s = CreateFrame("Frame",nil,frame)
|
||||||
|
|
|
@ -12,10 +12,6 @@ local select, pairs = select, pairs
|
||||||
local PlaySound = PlaySound
|
local PlaySound = PlaySound
|
||||||
local CreateFrame, UIParent = CreateFrame, UIParent
|
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
|
Support functions
|
||||||
-------------------------------------------------------------------------------]]
|
-------------------------------------------------------------------------------]]
|
||||||
|
@ -199,14 +195,14 @@ local methods = {
|
||||||
["SetDescription"] = function(self, desc)
|
["SetDescription"] = function(self, desc)
|
||||||
if desc then
|
if desc then
|
||||||
if not self.desc then
|
if not self.desc then
|
||||||
local desc = self.frame:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
|
local f = self.frame:CreateFontString(nil, "OVERLAY", "GameFontHighlightSmall")
|
||||||
desc:ClearAllPoints()
|
f:ClearAllPoints()
|
||||||
desc:SetPoint("TOPLEFT", self.checkbg, "TOPRIGHT", 5, -21)
|
f:SetPoint("TOPLEFT", self.checkbg, "TOPRIGHT", 5, -21)
|
||||||
desc:SetWidth(self.frame.width - 30)
|
f:SetWidth(self.frame.width - 30)
|
||||||
desc:SetPoint("RIGHT", self.frame, "RIGHT", -30, 0)
|
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
|
end
|
||||||
self.desc:Show()
|
self.desc:Show()
|
||||||
--self.text:SetFontObject(GameFontNormal)
|
--self.text:SetFontObject(GameFontNormal)
|
||||||
|
|
|
@ -11,10 +11,6 @@ local pairs = pairs
|
||||||
-- WoW APIs
|
-- WoW APIs
|
||||||
local CreateFrame, UIParent = CreateFrame, UIParent
|
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: ColorPickerFrame, OpacitySliderFrame
|
|
||||||
|
|
||||||
--[[-----------------------------------------------------------------------------
|
--[[-----------------------------------------------------------------------------
|
||||||
Support functions
|
Support functions
|
||||||
-------------------------------------------------------------------------------]]
|
-------------------------------------------------------------------------------]]
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
--[[ $Id: AceGUIWidget-DropDown-Items.lua 1202 2019-05-15 23:11:22Z nevcairiel $ ]]--
|
--[[ $Id: AceGUIWidget-DropDown-Items.lua 1272 2022-08-29 15:56:35Z nevcairiel $ ]]--
|
||||||
|
|
||||||
local AceGUI = LibStub("AceGUI-3.0")
|
local AceGUI = LibStub("AceGUI-3.0")
|
||||||
|
|
||||||
|
@ -41,7 +41,7 @@ local ItemBase = {
|
||||||
-- NOTE: The ItemBase version is added to each item's version number
|
-- NOTE: The ItemBase version is added to each item's version number
|
||||||
-- to ensure proper updates on ItemBase changes.
|
-- to ensure proper updates on ItemBase changes.
|
||||||
-- Use at least 1000er steps.
|
-- Use at least 1000er steps.
|
||||||
version = 1000,
|
version = 2000,
|
||||||
counter = 0,
|
counter = 0,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -178,7 +178,7 @@ function ItemBase.Create(type)
|
||||||
highlight:Hide()
|
highlight:Hide()
|
||||||
self.highlight = highlight
|
self.highlight = highlight
|
||||||
|
|
||||||
local check = frame:CreateTexture("OVERLAY")
|
local check = frame:CreateTexture(nil, "OVERLAY")
|
||||||
check:SetWidth(16)
|
check:SetWidth(16)
|
||||||
check:SetHeight(16)
|
check:SetHeight(16)
|
||||||
check:SetPoint("LEFT",frame,"LEFT",3,-1)
|
check:SetPoint("LEFT",frame,"LEFT",3,-1)
|
||||||
|
@ -186,7 +186,7 @@ function ItemBase.Create(type)
|
||||||
check:Hide()
|
check:Hide()
|
||||||
self.check = check
|
self.check = check
|
||||||
|
|
||||||
local sub = frame:CreateTexture("OVERLAY")
|
local sub = frame:CreateTexture(nil, "OVERLAY")
|
||||||
sub:SetWidth(16)
|
sub:SetWidth(16)
|
||||||
sub:SetHeight(16)
|
sub:SetHeight(16)
|
||||||
sub:SetPoint("RIGHT",frame,"RIGHT",-3,-1)
|
sub:SetPoint("RIGHT",frame,"RIGHT",-3,-1)
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
--[[ $Id: AceGUIWidget-DropDown.lua 1239 2020-09-20 10:22:02Z nevcairiel $ ]]--
|
--[[ $Id: AceGUIWidget-DropDown.lua 1284 2022-09-25 09:15:30Z nevcairiel $ ]]--
|
||||||
local AceGUI = LibStub("AceGUI-3.0")
|
local AceGUI = LibStub("AceGUI-3.0")
|
||||||
|
|
||||||
-- Lua APIs
|
-- Lua APIs
|
||||||
|
@ -11,10 +11,6 @@ local PlaySound = PlaySound
|
||||||
local UIParent, CreateFrame = UIParent, CreateFrame
|
local UIParent, CreateFrame = UIParent, CreateFrame
|
||||||
local _G = _G
|
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 function fixlevels(parent,...)
|
||||||
local i = 1
|
local i = 1
|
||||||
local child = select(i, ...)
|
local child = select(i, ...)
|
||||||
|
@ -253,7 +249,7 @@ do
|
||||||
|
|
||||||
local function Constructor()
|
local function Constructor()
|
||||||
local count = AceGUI:GetNextWidgetNum(widgetType)
|
local count = AceGUI:GetNextWidgetNum(widgetType)
|
||||||
local frame = CreateFrame("Frame", "AceGUI30Pullout"..count, UIParent, BackdropTemplateMixin and "BackdropTemplate" or nil)
|
local frame = CreateFrame("Frame", "AceGUI30Pullout"..count, UIParent, "BackdropTemplate")
|
||||||
local self = {}
|
local self = {}
|
||||||
self.count = count
|
self.count = count
|
||||||
self.type = widgetType
|
self.type = widgetType
|
||||||
|
@ -304,7 +300,7 @@ do
|
||||||
scrollFrame.obj = self
|
scrollFrame.obj = self
|
||||||
itemFrame.obj = self
|
itemFrame.obj = self
|
||||||
|
|
||||||
local slider = CreateFrame("Slider", "AceGUI30PulloutScrollbar"..count, scrollFrame, BackdropTemplateMixin and "BackdropTemplate" or nil)
|
local slider = CreateFrame("Slider", "AceGUI30PulloutScrollbar"..count, scrollFrame, "BackdropTemplate")
|
||||||
slider:SetOrientation("VERTICAL")
|
slider:SetOrientation("VERTICAL")
|
||||||
slider:SetHitRectInsets(0, 0, -10, 0)
|
slider:SetHitRectInsets(0, 0, -10, 0)
|
||||||
slider:SetBackdrop(sliderBackdrop)
|
slider:SetBackdrop(sliderBackdrop)
|
||||||
|
@ -351,7 +347,7 @@ end
|
||||||
|
|
||||||
do
|
do
|
||||||
local widgetType = "Dropdown"
|
local widgetType = "Dropdown"
|
||||||
local widgetVersion = 35
|
local widgetVersion = 36
|
||||||
|
|
||||||
--[[ Static data ]]--
|
--[[ Static data ]]--
|
||||||
|
|
||||||
|
@ -376,7 +372,6 @@ do
|
||||||
|
|
||||||
local function Dropdown_TogglePullout(this)
|
local function Dropdown_TogglePullout(this)
|
||||||
local self = this.obj
|
local self = this.obj
|
||||||
PlaySound(856) -- SOUNDKIT.IG_MAINMENU_OPTION_CHECKBOX_ON
|
|
||||||
if self.open then
|
if self.open then
|
||||||
self.open = nil
|
self.open = nil
|
||||||
self.pullout:Close()
|
self.pullout:Close()
|
||||||
|
|
|
@ -14,10 +14,6 @@ local GetCursorInfo, ClearCursor, GetSpellInfo = GetCursorInfo, ClearCursor, Get
|
||||||
local CreateFrame, UIParent = CreateFrame, UIParent
|
local CreateFrame, UIParent = CreateFrame, UIParent
|
||||||
local _G = _G
|
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
|
Support functions
|
||||||
-------------------------------------------------------------------------------]]
|
-------------------------------------------------------------------------------]]
|
||||||
|
|
|
@ -13,10 +13,6 @@ local pairs = pairs
|
||||||
local IsShiftKeyDown, IsControlKeyDown, IsAltKeyDown = IsShiftKeyDown, IsControlKeyDown, IsAltKeyDown
|
local IsShiftKeyDown, IsControlKeyDown, IsAltKeyDown = IsShiftKeyDown, IsControlKeyDown, IsAltKeyDown
|
||||||
local CreateFrame, UIParent = CreateFrame, UIParent
|
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
|
Scripts
|
||||||
-------------------------------------------------------------------------------]]
|
-------------------------------------------------------------------------------]]
|
||||||
|
@ -214,7 +210,7 @@ local function Constructor()
|
||||||
label:SetJustifyH("CENTER")
|
label:SetJustifyH("CENTER")
|
||||||
label:SetHeight(18)
|
label:SetHeight(18)
|
||||||
|
|
||||||
local msgframe = CreateFrame("Frame", nil, UIParent, BackdropTemplateMixin and "BackdropTemplate" or nil)
|
local msgframe = CreateFrame("Frame", nil, UIParent, "BackdropTemplate")
|
||||||
msgframe:SetHeight(30)
|
msgframe:SetHeight(30)
|
||||||
msgframe:SetBackdrop(ControlBackdrop)
|
msgframe:SetBackdrop(ControlBackdrop)
|
||||||
msgframe:SetBackdropColor(0,0,0)
|
msgframe:SetBackdropColor(0,0,0)
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
Label Widget
|
Label Widget
|
||||||
Displays text and optionally an icon.
|
Displays text and optionally an icon.
|
||||||
-------------------------------------------------------------------------------]]
|
-------------------------------------------------------------------------------]]
|
||||||
local Type, Version = "Label", 27
|
local Type, Version = "Label", 28
|
||||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||||
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
||||||
|
|
||||||
|
@ -12,10 +12,6 @@ local max, select, pairs = math.max, select, pairs
|
||||||
-- WoW APIs
|
-- WoW APIs
|
||||||
local CreateFrame, UIParent = CreateFrame, UIParent
|
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
|
Support functions
|
||||||
-------------------------------------------------------------------------------]]
|
-------------------------------------------------------------------------------]]
|
||||||
|
@ -129,12 +125,16 @@ local methods = {
|
||||||
end,
|
end,
|
||||||
|
|
||||||
["SetFont"] = function(self, font, height, flags)
|
["SetFont"] = function(self, font, height, flags)
|
||||||
self.label:SetFont(font, height, flags)
|
if not self.fontObject then
|
||||||
UpdateImageAnchor(self)
|
self.fontObject = CreateFont("AceGUI30LabelFont" .. AceGUI:GetNextWidgetNum(Type))
|
||||||
|
end
|
||||||
|
self.fontObject:SetFont(font, height, flags)
|
||||||
|
self:SetFontObject(self.fontObject)
|
||||||
end,
|
end,
|
||||||
|
|
||||||
["SetFontObject"] = function(self, font)
|
["SetFontObject"] = function(self, font)
|
||||||
self:SetFont((font or GameFontHighlightSmall):GetFont())
|
self.label:SetFontObject(font or GameFontHighlightSmall)
|
||||||
|
UpdateImageAnchor(self)
|
||||||
end,
|
end,
|
||||||
|
|
||||||
["SetImageSize"] = function(self, width, height)
|
["SetImageSize"] = function(self, width, height)
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
local Type, Version = "MultiLineEditBox", 29
|
local Type, Version = "MultiLineEditBox", 32
|
||||||
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
|
||||||
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
|
||||||
|
|
||||||
|
@ -10,10 +10,6 @@ local GetCursorInfo, GetSpellInfo, ClearCursor = GetCursorInfo, GetSpellInfo, Cl
|
||||||
local CreateFrame, UIParent = CreateFrame, UIParent
|
local CreateFrame, UIParent = CreateFrame, UIParent
|
||||||
local _G = _G
|
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
|
Support functions
|
||||||
-------------------------------------------------------------------------------]]
|
-------------------------------------------------------------------------------]]
|
||||||
|
@ -145,6 +141,14 @@ local function OnVerticalScroll(self, offset)
|
||||||
editBox:SetHitRectInsets(0, 0, offset, editBox:GetHeight() - offset - self:GetHeight())
|
editBox:SetHitRectInsets(0, 0, offset, editBox:GetHeight() - offset - self:GetHeight())
|
||||||
end
|
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)
|
local function OnShowFocus(frame)
|
||||||
frame.obj.editBox:SetFocus()
|
frame.obj.editBox:SetFocus()
|
||||||
frame:SetScript("OnShow", nil)
|
frame:SetScript("OnShow", nil)
|
||||||
|
@ -257,8 +261,6 @@ local methods = {
|
||||||
["SetCursorPosition"] = function(self, ...)
|
["SetCursorPosition"] = function(self, ...)
|
||||||
return self.editBox:SetCursorPosition(...)
|
return self.editBox:SetCursorPosition(...)
|
||||||
end,
|
end,
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
--[[-----------------------------------------------------------------------------
|
--[[-----------------------------------------------------------------------------
|
||||||
|
@ -297,7 +299,7 @@ local function Constructor()
|
||||||
text:SetPoint("BOTTOMRIGHT", button, "BOTTOMRIGHT", -5, 1)
|
text:SetPoint("BOTTOMRIGHT", button, "BOTTOMRIGHT", -5, 1)
|
||||||
text:SetJustifyV("MIDDLE")
|
text:SetJustifyV("MIDDLE")
|
||||||
|
|
||||||
local scrollBG = CreateFrame("Frame", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
|
local scrollBG = CreateFrame("Frame", nil, frame, "BackdropTemplate")
|
||||||
scrollBG:SetBackdrop(backdrop)
|
scrollBG:SetBackdrop(backdrop)
|
||||||
scrollBG:SetBackdropColor(0, 0, 0)
|
scrollBG:SetBackdropColor(0, 0, 0)
|
||||||
scrollBG:SetBackdropBorderColor(0.4, 0.4, 0.4)
|
scrollBG:SetBackdropBorderColor(0.4, 0.4, 0.4)
|
||||||
|
@ -321,6 +323,7 @@ local function Constructor()
|
||||||
scrollFrame:SetScript("OnReceiveDrag", OnReceiveDrag)
|
scrollFrame:SetScript("OnReceiveDrag", OnReceiveDrag)
|
||||||
scrollFrame:SetScript("OnSizeChanged", OnSizeChanged)
|
scrollFrame:SetScript("OnSizeChanged", OnSizeChanged)
|
||||||
scrollFrame:HookScript("OnVerticalScroll", OnVerticalScroll)
|
scrollFrame:HookScript("OnVerticalScroll", OnVerticalScroll)
|
||||||
|
scrollFrame:HookScript("OnScrollRangeChanged", OnScrollRangeChanged)
|
||||||
|
|
||||||
local editBox = CreateFrame("EditBox", ("%s%dEdit"):format(Type, widgetNum), scrollFrame)
|
local editBox = CreateFrame("EditBox", ("%s%dEdit"):format(Type, widgetNum), scrollFrame)
|
||||||
editBox:SetAllPoints()
|
editBox:SetAllPoints()
|
||||||
|
|
|
@ -14,10 +14,6 @@ local tonumber, pairs = tonumber, pairs
|
||||||
local PlaySound = PlaySound
|
local PlaySound = PlaySound
|
||||||
local CreateFrame, UIParent = CreateFrame, UIParent
|
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
|
Support functions
|
||||||
-------------------------------------------------------------------------------]]
|
-------------------------------------------------------------------------------]]
|
||||||
|
@ -31,13 +27,13 @@ local function UpdateText(self)
|
||||||
end
|
end
|
||||||
|
|
||||||
local function UpdateLabels(self)
|
local function UpdateLabels(self)
|
||||||
local min, max = (self.min or 0), (self.max or 100)
|
local min_value, max_value = (self.min or 0), (self.max or 100)
|
||||||
if self.ispercent then
|
if self.ispercent then
|
||||||
self.lowtext:SetFormattedText("%s%%", (min * 100))
|
self.lowtext:SetFormattedText("%s%%", (min_value * 100))
|
||||||
self.hightext:SetFormattedText("%s%%", (max * 100))
|
self.hightext:SetFormattedText("%s%%", (max_value * 100))
|
||||||
else
|
else
|
||||||
self.lowtext:SetText(min)
|
self.lowtext:SetText(min_value)
|
||||||
self.hightext:SetText(max)
|
self.hightext:SetText(max_value)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -175,13 +171,13 @@ local methods = {
|
||||||
self.label:SetText(text)
|
self.label:SetText(text)
|
||||||
end,
|
end,
|
||||||
|
|
||||||
["SetSliderValues"] = function(self, min, max, step)
|
["SetSliderValues"] = function(self, min_value, max_value, step)
|
||||||
local frame = self.slider
|
local frame = self.slider
|
||||||
frame.setup = true
|
frame.setup = true
|
||||||
self.min = min
|
self.min = min_value
|
||||||
self.max = max
|
self.max = max_value
|
||||||
self.step = step
|
self.step = step
|
||||||
frame:SetMinMaxValues(min or 0,max or 100)
|
frame:SetMinMaxValues(min_value or 0,max_value or 100)
|
||||||
UpdateLabels(self)
|
UpdateLabels(self)
|
||||||
frame:SetValueStep(step or 1)
|
frame:SetValueStep(step or 1)
|
||||||
if self.value then
|
if self.value then
|
||||||
|
@ -225,7 +221,7 @@ local function Constructor()
|
||||||
label:SetJustifyH("CENTER")
|
label:SetJustifyH("CENTER")
|
||||||
label:SetHeight(15)
|
label:SetHeight(15)
|
||||||
|
|
||||||
local slider = CreateFrame("Slider", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
|
local slider = CreateFrame("Slider", nil, frame, "BackdropTemplate")
|
||||||
slider:SetOrientation("HORIZONTAL")
|
slider:SetOrientation("HORIZONTAL")
|
||||||
slider:SetHeight(15)
|
slider:SetHeight(15)
|
||||||
slider:SetHitRectInsets(0, 0, -10, 0)
|
slider:SetHitRectInsets(0, 0, -10, 0)
|
||||||
|
@ -247,7 +243,7 @@ local function Constructor()
|
||||||
local hightext = slider:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall")
|
local hightext = slider:CreateFontString(nil, "ARTWORK", "GameFontHighlightSmall")
|
||||||
hightext:SetPoint("TOPRIGHT", slider, "BOTTOMRIGHT", -2, 3)
|
hightext:SetPoint("TOPRIGHT", slider, "BOTTOMRIGHT", -2, 3)
|
||||||
|
|
||||||
local editbox = CreateFrame("EditBox", nil, frame, BackdropTemplateMixin and "BackdropTemplate" or nil)
|
local editbox = CreateFrame("EditBox", nil, frame, "BackdropTemplate")
|
||||||
editbox:SetAutoFocus(false)
|
editbox:SetAutoFocus(false)
|
||||||
editbox:SetFontObject(GameFontHighlightSmall)
|
editbox:SetFontObject(GameFontHighlightSmall)
|
||||||
editbox:SetPoint("TOP", slider, "BOTTOM")
|
editbox:SetPoint("TOP", slider, "BOTTOM")
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
--- **AceLocale-3.0** manages localization in addons, allowing for multiple locale to be registered with fallback to the base locale for untranslated strings.
|
--- **AceLocale-3.0** manages localization in addons, allowing for multiple locale to be registered with fallback to the base locale for untranslated strings.
|
||||||
-- @class file
|
-- @class file
|
||||||
-- @name AceLocale-3.0
|
-- @name AceLocale-3.0
|
||||||
-- @release $Id: AceLocale-3.0.lua 1035 2011-07-09 03:20:13Z kaelten $
|
-- @release $Id: AceLocale-3.0.lua 1284 2022-09-25 09:15:30Z nevcairiel $
|
||||||
local MAJOR,MINOR = "AceLocale-3.0", 6
|
local MAJOR,MINOR = "AceLocale-3.0", 6
|
||||||
|
|
||||||
local AceLocale, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
|
local AceLocale, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
|
||||||
|
@ -12,10 +12,6 @@ if not AceLocale then return end -- no upgrade needed
|
||||||
local assert, tostring, error = assert, tostring, error
|
local assert, tostring, error = assert, tostring, error
|
||||||
local getmetatable, setmetatable, rawset, rawget = getmetatable, setmetatable, rawset, rawget
|
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()
|
local gameLocale = GetLocale()
|
||||||
if gameLocale == "enGB" then
|
if gameLocale == "enGB" then
|
||||||
gameLocale = "enUS"
|
gameLocale = "enUS"
|
||||||
|
@ -93,7 +89,7 @@ local writedefaultproxy = setmetatable({}, {
|
||||||
function AceLocale:NewLocale(application, locale, isDefault, silent)
|
function AceLocale:NewLocale(application, locale, isDefault, silent)
|
||||||
|
|
||||||
-- GAME_LOCALE allows translators to test translations of addons without having that wow client installed
|
-- GAME_LOCALE allows translators to test translations of addons without having that wow client installed
|
||||||
local gameLocale = GAME_LOCALE or gameLocale
|
local activeGameLocale = GAME_LOCALE or gameLocale
|
||||||
|
|
||||||
local app = AceLocale.apps[application]
|
local app = AceLocale.apps[application]
|
||||||
|
|
||||||
|
@ -111,7 +107,7 @@ function AceLocale:NewLocale(application, locale, isDefault, silent)
|
||||||
AceLocale.appnames[app] = application
|
AceLocale.appnames[app] = application
|
||||||
end
|
end
|
||||||
|
|
||||||
if locale ~= gameLocale and not isDefault then
|
if locale ~= activeGameLocale and not isDefault then
|
||||||
return -- nop, we don't need these translations
|
return -- nop, we don't need these translations
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
--[[ $Id: CallbackHandler-1.0.lua 1186 2018-07-21 14:19:18Z nevcairiel $ ]]
|
--[[ $Id: CallbackHandler-1.0.lua 26 2022-12-12 15:09:39Z nevcairiel $ ]]
|
||||||
local MAJOR, MINOR = "CallbackHandler-1.0", 7
|
local MAJOR, MINOR = "CallbackHandler-1.0", 8
|
||||||
local CallbackHandler = LibStub:NewLibrary(MAJOR, MINOR)
|
local CallbackHandler = LibStub:NewLibrary(MAJOR, MINOR)
|
||||||
|
|
||||||
if not CallbackHandler then return end -- No upgrade needed
|
if not CallbackHandler then return end -- No upgrade needed
|
||||||
|
@ -7,26 +7,16 @@ if not CallbackHandler then return end -- No upgrade needed
|
||||||
local meta = {__index = function(tbl, key) tbl[key] = {} return tbl[key] end}
|
local meta = {__index = function(tbl, key) tbl[key] = {} return tbl[key] end}
|
||||||
|
|
||||||
-- Lua APIs
|
-- Lua APIs
|
||||||
local tconcat = table.concat
|
local securecallfunction, error = securecallfunction, error
|
||||||
local assert, error, loadstring = assert, error, loadstring
|
local setmetatable, rawget = setmetatable, rawget
|
||||||
local setmetatable, rawset, rawget = setmetatable, rawset, rawget
|
|
||||||
local next, select, pairs, type, tostring = next, select, pairs, type, tostring
|
local next, select, pairs, type, tostring = next, select, pairs, type, tostring
|
||||||
|
|
||||||
-- 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
|
|
||||||
|
|
||||||
local xpcall = xpcall
|
|
||||||
|
|
||||||
local function errorhandler(err)
|
|
||||||
return geterrorhandler()(err)
|
|
||||||
end
|
|
||||||
|
|
||||||
local function Dispatch(handlers, ...)
|
local function Dispatch(handlers, ...)
|
||||||
local index, method = next(handlers)
|
local index, method = next(handlers)
|
||||||
if not method then return end
|
if not method then return end
|
||||||
repeat
|
repeat
|
||||||
xpcall(method, errorhandler, ...)
|
securecallfunction(method, ...)
|
||||||
index, method = next(handlers, index)
|
index, method = next(handlers, index)
|
||||||
until not method
|
until not method
|
||||||
end
|
end
|
||||||
|
@ -39,7 +29,7 @@ end
|
||||||
-- UnregisterName - name of the callback unregistration API, default "UnregisterCallback"
|
-- UnregisterName - name of the callback unregistration API, default "UnregisterCallback"
|
||||||
-- UnregisterAllName - name of the API to unregister all callbacks, default "UnregisterAllCallbacks". false == don't publish this API.
|
-- UnregisterAllName - name of the API to unregister all callbacks, default "UnregisterAllCallbacks". false == don't publish this API.
|
||||||
|
|
||||||
function CallbackHandler:New(target, RegisterName, UnregisterName, UnregisterAllName)
|
function CallbackHandler.New(_self, target, RegisterName, UnregisterName, UnregisterAllName)
|
||||||
|
|
||||||
RegisterName = RegisterName or "RegisterCallback"
|
RegisterName = RegisterName or "RegisterCallback"
|
||||||
UnregisterName = UnregisterName or "UnregisterCallback"
|
UnregisterName = UnregisterName or "UnregisterCallback"
|
||||||
|
@ -67,13 +57,13 @@ function CallbackHandler:New(target, RegisterName, UnregisterName, UnregisterAll
|
||||||
|
|
||||||
if registry.insertQueue and oldrecurse==0 then
|
if registry.insertQueue and oldrecurse==0 then
|
||||||
-- Something in one of our callbacks wanted to register more callbacks; they got queued
|
-- Something in one of our callbacks wanted to register more callbacks; they got queued
|
||||||
for eventname,callbacks in pairs(registry.insertQueue) do
|
for event,callbacks in pairs(registry.insertQueue) do
|
||||||
local first = not rawget(events, eventname) or not next(events[eventname]) -- test for empty before. not test for one member after. that one member may have been overwritten.
|
local first = not rawget(events, event) or not next(events[event]) -- test for empty before. not test for one member after. that one member may have been overwritten.
|
||||||
for self,func in pairs(callbacks) do
|
for object,func in pairs(callbacks) do
|
||||||
events[eventname][self] = func
|
events[event][object] = func
|
||||||
-- fire OnUsed callback?
|
-- fire OnUsed callback?
|
||||||
if first and registry.OnUsed then
|
if first and registry.OnUsed then
|
||||||
registry.OnUsed(registry, target, eventname)
|
registry.OnUsed(registry, target, event)
|
||||||
first = nil
|
first = nil
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
|
<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
|
||||||
..\FrameXML\UI.xsd">
|
..\FrameXML\UI.xsd">
|
||||||
<Script file="CallbackHandler-1.0.lua"/>
|
<Script file="CallbackHandler-1.0.lua"/>
|
||||||
</Ui>
|
</Ui>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
|
--@curseforge-project-slug: libdbicon-1-0@
|
||||||
-----------------------------------------------------------------------
|
-----------------------------------------------------------------------
|
||||||
-- LibDBIcon-1.0
|
-- LibDBIcon-1.0
|
||||||
--
|
--
|
||||||
|
@ -6,7 +6,7 @@
|
||||||
--
|
--
|
||||||
|
|
||||||
local DBICON10 = "LibDBIcon-1.0"
|
local DBICON10 = "LibDBIcon-1.0"
|
||||||
local DBICON10_MINOR = 44 -- Bump on changes
|
local DBICON10_MINOR = 45 -- Bump on changes
|
||||||
if not LibStub then error(DBICON10 .. " requires LibStub.") end
|
if not LibStub then error(DBICON10 .. " requires LibStub.") end
|
||||||
local ldb = LibStub("LibDataBroker-1.1", true)
|
local ldb = LibStub("LibDataBroker-1.1", true)
|
||||||
if not ldb then error(DBICON10 .. " requires LibDataBroker-1.1.") end
|
if not ldb then error(DBICON10 .. " requires LibDataBroker-1.1.") end
|
||||||
|
@ -218,37 +218,49 @@ local function createButton(name, object, db)
|
||||||
button.dataObject = object
|
button.dataObject = object
|
||||||
button.db = db
|
button.db = db
|
||||||
button:SetFrameStrata("MEDIUM")
|
button:SetFrameStrata("MEDIUM")
|
||||||
if button.SetFixedFrameStrata then -- Classic support
|
button:SetFixedFrameStrata(true)
|
||||||
button:SetFixedFrameStrata(true)
|
|
||||||
end
|
|
||||||
button:SetFrameLevel(8)
|
button:SetFrameLevel(8)
|
||||||
if button.SetFixedFrameLevel then -- Classic support
|
button:SetFixedFrameLevel(true)
|
||||||
button:SetFixedFrameLevel(true)
|
|
||||||
end
|
|
||||||
button:SetSize(31, 31)
|
button:SetSize(31, 31)
|
||||||
button:RegisterForClicks("anyUp")
|
button:RegisterForClicks("anyUp")
|
||||||
button:RegisterForDrag("LeftButton")
|
button:RegisterForDrag("LeftButton")
|
||||||
button:SetHighlightTexture(136477) --"Interface\\Minimap\\UI-Minimap-ZoomButton-Highlight"
|
button:SetHighlightTexture(136477) --"Interface\\Minimap\\UI-Minimap-ZoomButton-Highlight"
|
||||||
local overlay = button:CreateTexture(nil, "OVERLAY")
|
if WOW_PROJECT_ID == WOW_PROJECT_MAINLINE then
|
||||||
overlay:SetSize(53, 53)
|
local overlay = button:CreateTexture(nil, "OVERLAY")
|
||||||
overlay:SetTexture(136430) --"Interface\\Minimap\\MiniMap-TrackingBorder"
|
overlay:SetSize(50, 50)
|
||||||
overlay:SetPoint("TOPLEFT")
|
overlay:SetTexture(136430) --"Interface\\Minimap\\MiniMap-TrackingBorder"
|
||||||
local background = button:CreateTexture(nil, "BACKGROUND")
|
overlay:SetPoint("TOPLEFT", button, "TOPLEFT", 0, 0)
|
||||||
background:SetSize(20, 20)
|
local background = button:CreateTexture(nil, "BACKGROUND")
|
||||||
background:SetTexture(136467) --"Interface\\Minimap\\UI-Minimap-Background"
|
background:SetSize(24, 24)
|
||||||
background:SetPoint("TOPLEFT", 7, -5)
|
background:SetTexture(136467) --"Interface\\Minimap\\UI-Minimap-Background"
|
||||||
local icon = button:CreateTexture(nil, "ARTWORK")
|
background:SetPoint("CENTER", button, "CENTER", 0, 1)
|
||||||
icon:SetSize(17, 17)
|
local icon = button:CreateTexture(nil, "ARTWORK")
|
||||||
icon:SetTexture(object.icon)
|
icon:SetSize(18, 18)
|
||||||
icon:SetPoint("TOPLEFT", 7, -6)
|
icon:SetTexture(object.icon)
|
||||||
button.icon = icon
|
icon:SetPoint("CENTER", button, "CENTER", 0, 1)
|
||||||
|
button.icon = icon
|
||||||
|
else
|
||||||
|
local overlay = button:CreateTexture(nil, "OVERLAY")
|
||||||
|
overlay:SetSize(53, 53)
|
||||||
|
overlay:SetTexture(136430) --"Interface\\Minimap\\MiniMap-TrackingBorder"
|
||||||
|
overlay:SetPoint("TOPLEFT")
|
||||||
|
local background = button:CreateTexture(nil, "BACKGROUND")
|
||||||
|
background:SetSize(20, 20)
|
||||||
|
background:SetTexture(136467) --"Interface\\Minimap\\UI-Minimap-Background"
|
||||||
|
background:SetPoint("TOPLEFT", 7, -5)
|
||||||
|
local icon = button:CreateTexture(nil, "ARTWORK")
|
||||||
|
icon:SetSize(17, 17)
|
||||||
|
icon:SetTexture(object.icon)
|
||||||
|
icon:SetPoint("TOPLEFT", 7, -6)
|
||||||
|
button.icon = icon
|
||||||
|
end
|
||||||
|
|
||||||
button.isMouseDown = false
|
button.isMouseDown = false
|
||||||
|
local r, g, b = button.icon:GetVertexColor()
|
||||||
|
button.icon:SetVertexColor(object.iconR or r, object.iconG or g, object.iconB or b)
|
||||||
|
|
||||||
local r, g, b = icon:GetVertexColor()
|
button.icon.UpdateCoord = updateCoord
|
||||||
icon:SetVertexColor(object.iconR or r, object.iconG or g, object.iconB or b)
|
button.icon:UpdateCoord()
|
||||||
|
|
||||||
icon.UpdateCoord = updateCoord
|
|
||||||
icon:UpdateCoord()
|
|
||||||
|
|
||||||
button:SetScript("OnEnter", onEnter)
|
button:SetScript("OnEnter", onEnter)
|
||||||
button:SetScript("OnLeave", onLeave)
|
button:SetScript("OnLeave", onLeave)
|
||||||
|
|
|
@ -7,24 +7,24 @@ if not LibStub or LibStub.minor < LIBSTUB_MINOR then
|
||||||
LibStub = LibStub or {libs = {}, minors = {} }
|
LibStub = LibStub or {libs = {}, minors = {} }
|
||||||
_G[LIBSTUB_MAJOR] = LibStub
|
_G[LIBSTUB_MAJOR] = LibStub
|
||||||
LibStub.minor = LIBSTUB_MINOR
|
LibStub.minor = LIBSTUB_MINOR
|
||||||
|
|
||||||
function LibStub:NewLibrary(major, minor)
|
function LibStub:NewLibrary(major, minor)
|
||||||
assert(type(major) == "string", "Bad argument #2 to `NewLibrary' (string expected)")
|
assert(type(major) == "string", "Bad argument #2 to `NewLibrary' (string expected)")
|
||||||
minor = assert(tonumber(strmatch(minor, "%d+")), "Minor version must either be a number or contain a number.")
|
minor = assert(tonumber(string.match(minor, "%d+")), "Minor version must either be a number or contain a number.")
|
||||||
|
|
||||||
local oldminor = self.minors[major]
|
local oldminor = self.minors[major]
|
||||||
if oldminor and oldminor >= minor then return nil end
|
if oldminor and oldminor >= minor then return nil end
|
||||||
self.minors[major], self.libs[major] = minor, self.libs[major] or {}
|
self.minors[major], self.libs[major] = minor, self.libs[major] or {}
|
||||||
return self.libs[major], oldminor
|
return self.libs[major], oldminor
|
||||||
end
|
end
|
||||||
|
|
||||||
function LibStub:GetLibrary(major, silent)
|
function LibStub:GetLibrary(major, silent)
|
||||||
if not self.libs[major] and not silent then
|
if not self.libs[major] and not silent then
|
||||||
error(("Cannot find a library instance of %q."):format(tostring(major)), 2)
|
error(("Cannot find a library instance of %q."):format(tostring(major)), 2)
|
||||||
end
|
end
|
||||||
return self.libs[major], self.minors[major]
|
return self.libs[major], self.minors[major]
|
||||||
end
|
end
|
||||||
|
|
||||||
function LibStub:IterateLibraries() return pairs(self.libs) end
|
function LibStub:IterateLibraries() return pairs(self.libs) end
|
||||||
setmetatable(LibStub, { __call = LibStub.GetLibrary })
|
setmetatable(LibStub, { __call = LibStub.GetLibrary })
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
local lib = LibStub:NewLibrary("zzAddOn", 5)
|
local lib = LibStub:NewLibrary("zzAddOn", 12)
|
||||||
if not lib then return end
|
if not lib then return end
|
||||||
local config = LibStub:GetLibrary("zzConfig")
|
local config = LibStub:GetLibrary("zzConfig")
|
||||||
lib['callbacks'] = lib['callbacks'] or LibStub:GetLibrary("CallbackHandler-1.0"):New(lib)
|
lib['callbacks'] = lib['callbacks'] or LibStub:GetLibrary("CallbackHandler-1.0"):New(lib)
|
||||||
lib['addons'] = lib['addons'] or {}
|
lib['addons'] = lib['addons'] or {}
|
||||||
|
lib['managerframe'] = lib['managerframe'] or CreateFrame("FRAME")
|
||||||
lib['events'] = lib['events'] or CreateFrame("FRAME")
|
lib['events'] = lib['events'] or CreateFrame("FRAME")
|
||||||
local function errormsg(err)
|
local function errormsg(err)
|
||||||
print(format("|cffff0000Error:|r %s",err))
|
print(format("|cffff0000Error:|r %s",err))
|
||||||
end
|
end
|
||||||
local mixins = {'NewAddOn', 'GetAddOn', 'AddChild', 'HasChild', 'IsChild', 'HasParent', 'GetParent', 'GetOptions', 'RegisterEvent','UnregisterEvent','IsClassic', 'GetSpecs', 'Fire'}
|
local mixins = {'NewAddOn', 'GetAddOn', 'AddChild', 'HasChild', 'IsChild', 'HasParent', 'GetParent', 'GetOptions', 'RegisterEvent','UnregisterEvent','IsClassic','IsBCC','IsRetail', 'GetSpecs', 'Fire', 'RegisterOpen', 'RegisterClose'}
|
||||||
local events = lib['events']
|
|
||||||
function lib:Fire(...)
|
function lib:Fire(...)
|
||||||
lib['callbacks']:Fire(...)
|
lib['callbacks']:Fire(...)
|
||||||
end
|
end
|
||||||
|
@ -43,19 +43,28 @@ local function joinTables(tab1, tab2, prefix)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
function lib:AddChild(child)
|
local function childExists(parent, child)
|
||||||
local childName = child['specs']['name']
|
if(parent['children']) then
|
||||||
child['parent'] = self
|
for i = 1, #parent['children'] do
|
||||||
self['children'] = self['children'] or {}
|
if(parent['children'][i]['specs']['name'] == child['specs']['name']) then return true end
|
||||||
self['children'][#self['children'] + 1] = child
|
end
|
||||||
if(child['specs']['defaults']) then
|
end
|
||||||
joinTables(self['specs']['defaults'], child['specs']['defaults'])
|
end
|
||||||
|
function lib:AddChild(parentName, child)
|
||||||
|
local parent = self:GetAddOn(parentName)
|
||||||
|
if(parent) then
|
||||||
|
parent['children'] = parent['children'] or {}
|
||||||
|
if(childExists(parent, child)) then return end
|
||||||
|
child['parent'] = parent
|
||||||
|
parent['children'][#parent['children'] + 1] = child
|
||||||
|
if(child['specs']['defaults']) then
|
||||||
|
joinTables(parent['specs']['defaults'], child['specs']['defaults'])
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
function lib:RegisterEvent(event, globalfunc)
|
function lib:RegisterEvent(event, globalfunc)
|
||||||
if(type(event) == 'table') then
|
if(type(event) == 'table') then
|
||||||
for k, v in pairs(event) do
|
for k, v in pairs(event) do
|
||||||
-- print("[zza] Registertab CB", type(ev),ev)
|
|
||||||
local ev = k
|
local ev = k
|
||||||
local func = v
|
local func = v
|
||||||
if(type(v) == 'string') then
|
if(type(v) == 'string') then
|
||||||
|
@ -68,7 +77,6 @@ function lib:RegisterEvent(event, globalfunc)
|
||||||
self:RegisterEvent(ev, func)
|
self:RegisterEvent(ev, func)
|
||||||
end
|
end
|
||||||
elseif(type(event) == 'string') then
|
elseif(type(event) == 'string') then
|
||||||
-- print("[zza] Register CB", type(event),event)
|
|
||||||
if(not lib['events']:IsEventRegistered(event)) then
|
if(not lib['events']:IsEventRegistered(event)) then
|
||||||
lib['events']:RegisterEvent(event)
|
lib['events']:RegisterEvent(event)
|
||||||
end
|
end
|
||||||
|
@ -79,37 +87,72 @@ function lib:RegisterEvent(event, globalfunc)
|
||||||
end
|
end
|
||||||
function lib:UnregisterEvent(event)
|
function lib:UnregisterEvent(event)
|
||||||
if(type(event) == 'table') then
|
if(type(event) == 'table') then
|
||||||
for key, ev in pairs(event) do
|
for k, v in pairs(event) do
|
||||||
|
local ev = type(v) == 'string' and v or k
|
||||||
self:UnregisterEvent(ev)
|
self:UnregisterEvent(ev)
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
lib['UnregisterCallback'](self, event)
|
lib['UnregisterCallback'](self, event)
|
||||||
end
|
end
|
||||||
-- print('unreg', event)
|
end
|
||||||
|
function lib:IsBCC()
|
||||||
|
return WOW_PROJECT_ID == WOW_PROJECT_BURNING_CRUSADE_CLASSIC
|
||||||
end
|
end
|
||||||
function lib:IsClassic()
|
function lib:IsClassic()
|
||||||
return WOW_PROJECT_ID == WOW_PROJECT_CLASSIC
|
return WOW_PROJECT_ID == WOW_PROJECT_CLASSIC
|
||||||
end
|
end
|
||||||
|
function lib:IsRetail()
|
||||||
|
return WOW_PROJECT_ID == WOW_PROJECT_MAINLINE
|
||||||
|
end
|
||||||
|
local function handleManagerFrame(self, event, num)
|
||||||
|
if(event == "PLAYER_INTERACTION_MANAGER_FRAME_SHOW") then
|
||||||
|
lib['callbacks']:Fire(format("show-%i", num))
|
||||||
|
else
|
||||||
|
lib['callbacks']:Fire(format("hide-%i", num))
|
||||||
|
end
|
||||||
|
end
|
||||||
|
local function addManagerFrame(self, mode, num, globalfunc)
|
||||||
|
if(type(num) == 'table') then
|
||||||
|
for k, v in pairs(num) do
|
||||||
|
local n = k
|
||||||
|
local func = v
|
||||||
|
if(type(v) == 'number') then
|
||||||
|
n = v
|
||||||
|
func = globalfunc
|
||||||
|
end
|
||||||
|
addManagerFrame(self, mode, n, func)
|
||||||
|
end
|
||||||
|
elseif(type(num) == 'number') then
|
||||||
|
lib.RegisterCallback(self, format("%s-%i", mode, num), globalfunc)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
function lib:RegisterOpen(num, func)
|
||||||
|
if(not num) then return end
|
||||||
|
if(not lib['managerframe']:IsEventRegistered("PLAYER_INTERACTION_MANAGER_FRAME_SHOW")) then
|
||||||
|
lib['managerframe']:RegisterEvent("PLAYER_INTERACTION_MANAGER_FRAME_SHOW")
|
||||||
|
lib['managerframe']:SetScript("OnEvent", handleManagerFrame)
|
||||||
|
end
|
||||||
|
addManagerFrame(self, 'show', num, func)
|
||||||
|
end
|
||||||
|
function lib:RegisterClose(num, func)
|
||||||
|
if(not num) then return end
|
||||||
|
if(not lib['managerframe']:IsEventRegistered("PLAYER_INTERACTION_MANAGER_FRAME_HIDE")) then
|
||||||
|
lib['managerframe']:RegisterEvent("PLAYER_INTERACTION_MANAGER_FRAME_HIDE")
|
||||||
|
lib['managerframe']:SetScript("OnEvent", handleManagerFrame)
|
||||||
|
end
|
||||||
|
addManagerFrame(self, 'hide', num, func)
|
||||||
|
end
|
||||||
function lib:NewAddOn(addonName, addonTable)
|
function lib:NewAddOn(addonName, addonTable)
|
||||||
local specs = self['specs']
|
local specs = self['specs']
|
||||||
local childName = specs['name']
|
local childName = specs['name']
|
||||||
if(lib['addons'][childName]) then
|
|
||||||
local oldchild = lib['addons'][childName]
|
|
||||||
local parent = oldchild:GetParent()
|
|
||||||
if(parent) then
|
|
||||||
errormsg(format("%s already loaded by %s", childName, parent['specs']['name']))
|
|
||||||
else
|
|
||||||
errormsg(format("|%s already loaded", childName))
|
|
||||||
end
|
|
||||||
return
|
|
||||||
end
|
|
||||||
if(type(childName) == 'string') then
|
if(type(childName) == 'string') then
|
||||||
self.GetAddOnTable = function() return addonTable end
|
self.GetAddOnTable = function() return addonTable end
|
||||||
lib['addons'][childName] = self
|
lib['addons'][childName] = self
|
||||||
|
local child = lib['addons'][childName]
|
||||||
lib:Embed(self)
|
lib:Embed(self)
|
||||||
if(childName ~= addonName) then
|
if(childName ~= addonName) then
|
||||||
local parent = lib['addons'][addonName]
|
local parent = lib['addons'][addonName]
|
||||||
parent:AddChild(self)
|
parent:AddChild(parent['specs']['name'], self)
|
||||||
end
|
end
|
||||||
if(self['events']) then
|
if(self['events']) then
|
||||||
for ev, func in pairs(self['events']) do
|
for ev, func in pairs(self['events']) do
|
||||||
|
@ -131,17 +174,14 @@ for _, target in pairs(lib['addons']) do
|
||||||
end
|
end
|
||||||
lib['events']:RegisterEvent('ADDON_LOADED')
|
lib['events']:RegisterEvent('ADDON_LOADED')
|
||||||
local function addLDB(...)
|
local function addLDB(...)
|
||||||
-- print('addLDB', ...)
|
|
||||||
return LibStub:GetLibrary("zzLDB"):AddLDB(...)
|
return LibStub:GetLibrary("zzLDB"):AddLDB(...)
|
||||||
end
|
end
|
||||||
local function addConfig(addonName, child, specs)
|
local function addConfig(addonName, child, specs)
|
||||||
local at = child:GetAddOnTable()
|
local at = child:GetAddOnTable()
|
||||||
if(addonName == child['specs']['name']) then
|
if(addonName == child['specs']['name']) then
|
||||||
-- print("init options", addonName)
|
|
||||||
config:InitConfig(child, addonName)
|
config:InitConfig(child, addonName)
|
||||||
child['options']['args']['profile'] = LibStub("AceDBOptions-3.0"):GetOptionsTable(at['db'])
|
child['options']['args']['profile'] = LibStub("AceDBOptions-3.0"):GetOptionsTable(at['db'])
|
||||||
else
|
else
|
||||||
-- print('add child options', specs['name'], addonName)
|
|
||||||
config:AddConfig(child, addonName)
|
config:AddConfig(child, addonName)
|
||||||
end
|
end
|
||||||
if(type(specs['cfgReset']) == 'function') then
|
if(type(specs['cfgReset']) == 'function') then
|
||||||
|
@ -152,17 +192,13 @@ end
|
||||||
local function SetupSpecs(addonName, child)
|
local function SetupSpecs(addonName, child)
|
||||||
local specs = child['specs']
|
local specs = child['specs']
|
||||||
if(specs and specs['sv'] and not child['db']) then
|
if(specs and specs['sv'] and not child['db']) then
|
||||||
-- print('dbname',type(specs['sv']),type(specs['sv']) == 'boolean' and addonName or specs['sv'])
|
|
||||||
local dbname = format('%sDB', type(specs['sv']) == 'boolean' and addonName or specs['sv'])
|
local dbname = format('%sDB', type(specs['sv']) == 'boolean' and addonName or specs['sv'])
|
||||||
local at = child:GetAddOnTable()
|
local at = child:GetAddOnTable()
|
||||||
at['db'] = LibStub("AceDB-3.0"):New(dbname, type(specs['defaults']) == 'table' and specs['defaults'] or {}, 'Default')
|
at['db'] = LibStub("AceDB-3.0"):New(dbname, type(specs['defaults']) == 'table' and specs['defaults'] or {}, 'Default')
|
||||||
-- print('setup parent ldb')
|
|
||||||
if(specs['ldb']) then
|
if(specs['ldb']) then
|
||||||
local ldbobj = addLDB(specs['name'], specs['ldb'], at['db'])
|
addLDB(specs['name'], specs['ldb'], at['db'])
|
||||||
-- print(' result parent ldb', specs['name'])
|
|
||||||
end
|
end
|
||||||
if(specs['cfg']) then
|
if(specs['cfg']) then
|
||||||
-- print(' spec parent addcfg', addonName, specs['name'])
|
|
||||||
addConfig(addonName, child, specs)
|
addConfig(addonName, child, specs)
|
||||||
end
|
end
|
||||||
if(child:HasChild()) then
|
if(child:HasChild()) then
|
||||||
|
@ -170,13 +206,10 @@ local function SetupSpecs(addonName, child)
|
||||||
local child = child['children'][i]
|
local child = child['children'][i]
|
||||||
|
|
||||||
local childSpecs = child['specs']
|
local childSpecs = child['specs']
|
||||||
-- print("Add child", childSpecs['name'])
|
|
||||||
if(childSpecs['ldb']) then
|
if(childSpecs['ldb']) then
|
||||||
-- print(" Add ldb", childSpecs['name'])
|
addLDB(childSpecs['name'], childSpecs['ldb'], at['db'])
|
||||||
local ldbobj = addLDB(childSpecs['name'], childSpecs['ldb'], at['db'])
|
|
||||||
end
|
end
|
||||||
if(childSpecs['cfg']) then
|
if(childSpecs['cfg']) then
|
||||||
-- print(' spec child addcfg', addonName, childSpecs['name'])
|
|
||||||
addConfig(addonName, child, childSpecs)
|
addConfig(addonName, child, childSpecs)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -185,7 +218,6 @@ local function SetupSpecs(addonName, child)
|
||||||
end
|
end
|
||||||
|
|
||||||
lib['events']:SetScript("OnEvent", function(self, event, ...)
|
lib['events']:SetScript("OnEvent", function(self, event, ...)
|
||||||
-- print("[zza]", self, event, ...)
|
|
||||||
local addonName = ...
|
local addonName = ...
|
||||||
local child = lib['addons'][addonName]
|
local child = lib['addons'][addonName]
|
||||||
if(child) then
|
if(child) then
|
||||||
|
@ -193,6 +225,5 @@ lib['events']:SetScript("OnEvent", function(self, event, ...)
|
||||||
SetupSpecs(addonName, child)
|
SetupSpecs(addonName, child)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
-- print("[zza] Fire", event, ...)
|
|
||||||
lib['callbacks']:Fire(event, self, event, ...)
|
lib['callbacks']:Fire(event, self, event, ...)
|
||||||
end)
|
end)
|
|
@ -1,6 +1,5 @@
|
||||||
local lib = LibStub:NewLibrary("zzConfig", 3)
|
local lib = LibStub:NewLibrary("zzConfig", 6)
|
||||||
if not lib then return end
|
if not lib then return end
|
||||||
local ldb = LibStub:GetLibrary("LibDataBroker-1.1")
|
|
||||||
local ldbicon = LibStub:GetLibrary("LibDBIcon-1.0")
|
local ldbicon = LibStub:GetLibrary("LibDBIcon-1.0")
|
||||||
local mixins = {'AddConfigMenu', 'AddConfigEntry', 'InitConfig', 'GetDefaultHandler'}
|
local mixins = {'AddConfigMenu', 'AddConfigEntry', 'InitConfig', 'GetDefaultHandler'}
|
||||||
lib['configs'] = lib['configs'] or {}
|
lib['configs'] = lib['configs'] or {}
|
||||||
|
@ -15,7 +14,7 @@ local function getDB(objname)
|
||||||
end
|
end
|
||||||
return db
|
return db
|
||||||
else
|
else
|
||||||
print("noicon", objname)
|
-- print("noicon", objname)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return {}
|
return {}
|
||||||
|
@ -137,7 +136,7 @@ function lib:AddConfigMenu(options, parentName, order, handler, more)
|
||||||
['name'] = parentName,
|
['name'] = parentName,
|
||||||
['type'] = 'group',
|
['type'] = 'group',
|
||||||
['handler'] = handler or self['handler'],
|
['handler'] = handler or self['handler'],
|
||||||
['childGroups'] =' tab',
|
['childGroups'] = 'tab',
|
||||||
['order'] = order or 1,
|
['order'] = order or 1,
|
||||||
['args'] = {}
|
['args'] = {}
|
||||||
}
|
}
|
||||||
|
@ -149,8 +148,14 @@ function lib:AddConfigMenu(options, parentName, order, handler, more)
|
||||||
options['args'][parentName] = menu
|
options['args'][parentName] = menu
|
||||||
return options['args'][parentName]
|
return options['args'][parentName]
|
||||||
end
|
end
|
||||||
|
lib.AddedToBlizz = lib.AddedToBlizz or {}
|
||||||
|
local function addToBlizz(pName, cName)
|
||||||
|
if(not lib['AddedToBlizz'][pName]) then
|
||||||
|
lib['AddedToBlizz'][pName] = true
|
||||||
|
LibStub("AceConfigDialog-3.0"):AddToBlizOptions(pName, pName, cName)
|
||||||
|
end
|
||||||
|
end
|
||||||
function lib:InitConfig(child, parentName, gp, sp)
|
function lib:InitConfig(child, parentName, gp, sp)
|
||||||
local pp = child['specs']['name'] == parentName
|
|
||||||
child['options'] = {
|
child['options'] = {
|
||||||
['name'] = parentName,
|
['name'] = parentName,
|
||||||
['type'] = 'group',
|
['type'] = 'group',
|
||||||
|
@ -164,7 +169,7 @@ function lib:InitConfig(child, parentName, gp, sp)
|
||||||
local par = self:AddConfigMenu(options, parentName)
|
local par = self:AddConfigMenu(options, parentName)
|
||||||
self:AddLDBIconOptions(par, 'minimap')
|
self:AddLDBIconOptions(par, 'minimap')
|
||||||
LibStub("AceConfig-3.0"):RegisterOptionsTable(parentName, options)
|
LibStub("AceConfig-3.0"):RegisterOptionsTable(parentName, options)
|
||||||
LibStub("AceConfigDialog-3.0"):AddToBlizOptions(parentName, parentName, child['parentName'])
|
addToBlizz(parentName, child['parentName'])
|
||||||
return options
|
return options
|
||||||
end
|
end
|
||||||
function lib:AddConfig(child, parentName, gp, sp)
|
function lib:AddConfig(child, parentName, gp, sp)
|
||||||
|
@ -181,7 +186,7 @@ function lib:AddConfig(child, parentName, gp, sp)
|
||||||
local par = self:AddConfigMenu(child['options'], specs['name'])
|
local par = self:AddConfigMenu(child['options'], specs['name'])
|
||||||
self:AddLDBIconOptions(par, 'minimap')
|
self:AddLDBIconOptions(par, 'minimap')
|
||||||
LibStub("AceConfig-3.0"):RegisterOptionsTable(specs['name'], child['options'])
|
LibStub("AceConfig-3.0"):RegisterOptionsTable(specs['name'], child['options'])
|
||||||
LibStub("AceConfigDialog-3.0"):AddToBlizOptions(specs['name'], specs['name'], parentName)
|
addToBlizz(specs['name'], parentName)
|
||||||
return child['options']
|
return child['options']
|
||||||
end
|
end
|
||||||
function lib:Embed(target)
|
function lib:Embed(target)
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
local lib = LibStub:NewLibrary("zzHelper", 2)
|
local lib = LibStub:NewLibrary("zzHelper", 4)
|
||||||
if not lib then return end
|
if not lib then return end
|
||||||
lib['targets'] = lib['targets'] or {}
|
lib['targets'] = lib['targets'] or {}
|
||||||
local mixins = {'colorize', 'round', 'sortArray', 'IsTwink', 'classcolor', 'MoneyString', 'MoneyStringSetString', 'MoneyStringSetSize'}
|
local mixins = {'colorize', 'round', 'sortArray', 'IsTwink', 'classcolor', 'MoneyString', 'MoneyStringSetString', 'MoneyStringSetSize'}
|
||||||
|
@ -34,7 +34,7 @@ function lib:MoneyStringSetSize(size)
|
||||||
iconSize = size
|
iconSize = size
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
function lib:MoneyString(money, color, abrevK, abrevM, noicon, noiconcolor, size)
|
function lib:MoneyString(money, color, abrevK, abrevM, noicon, noiconcolor, size, seperate)
|
||||||
local iconSize = size or iconSize
|
local iconSize = size or iconSize
|
||||||
local goldicon = noicon and (noiconcolor and moneyText['goldColor'] or moneyText['gold']) or format(iconbase, 'Gold', iconSize, iconSize)
|
local goldicon = noicon and (noiconcolor and moneyText['goldColor'] or moneyText['gold']) or format(iconbase, 'Gold', iconSize, iconSize)
|
||||||
local silvericon = noicon and (noiconcolor and moneyText['silverColor'] or moneyText['silver']) or format(iconbase, 'Silver', iconSize, iconSize)
|
local silvericon = noicon and (noiconcolor and moneyText['silverColor'] or moneyText['silver']) or format(iconbase, 'Silver', iconSize, iconSize)
|
||||||
|
@ -66,6 +66,9 @@ function lib:MoneyString(money, color, abrevK, abrevM, noicon, noiconcolor, size
|
||||||
end
|
end
|
||||||
if(money > 0) then
|
if(money > 0) then
|
||||||
if(g>0) then
|
if(g>0) then
|
||||||
|
if(seperate) then
|
||||||
|
g = BreakUpLargeNumbers(g)
|
||||||
|
end
|
||||||
moneystring = format("%s%s%s", color and lib:colorize(g, neg and "ff0000" or "44dd44") or g,abrev, goldicon)
|
moneystring = format("%s%s%s", color and lib:colorize(g, neg and "ff0000" or "44dd44") or g,abrev, goldicon)
|
||||||
end
|
end
|
||||||
if(s>0) then
|
if(s>0) then
|
||||||
|
@ -95,13 +98,13 @@ end
|
||||||
*** Arrayfunctions ***
|
*** Arrayfunctions ***
|
||||||
]]
|
]]
|
||||||
|
|
||||||
function lib:sortArray(tmp,dir)
|
function lib:sortArray(tmp, dir)
|
||||||
local newtmp = {}
|
local newtmp = {}
|
||||||
local n = 1
|
local n = 1
|
||||||
local cnt = 0
|
local cnt = 0
|
||||||
local maximum = 0
|
local maximum = 0
|
||||||
local first
|
local first
|
||||||
for k,v in pairs(tmp) do
|
for k, v in pairs(tmp) do
|
||||||
cnt = cnt + 1
|
cnt = cnt + 1
|
||||||
if(v > maximum) then
|
if(v > maximum) then
|
||||||
maximum = v + 1
|
maximum = v + 1
|
||||||
|
@ -109,15 +112,15 @@ function lib:sortArray(tmp,dir)
|
||||||
first = first or k
|
first = first or k
|
||||||
end
|
end
|
||||||
while(cnt > 0) do
|
while(cnt > 0) do
|
||||||
local mx, mn = dir and maximum or 0,first
|
local mx, mn = dir and maximum or 0, first
|
||||||
for k,v in pairs(tmp) do
|
for k, v in pairs(tmp) do
|
||||||
if(dir) then
|
if(dir) then
|
||||||
if(tonumber(v)<=tonumber(mx)) then
|
if(tonumber(v) <= tonumber(mx)) then
|
||||||
mx = v
|
mx = v
|
||||||
mn = k
|
mn = k
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
if(tonumber(v)>=tonumber(mx)) then
|
if(tonumber(v) >= tonumber(mx)) then
|
||||||
mx = v
|
mx = v
|
||||||
mn = k
|
mn = k
|
||||||
end
|
end
|
||||||
|
@ -126,7 +129,7 @@ function lib:sortArray(tmp,dir)
|
||||||
newtmp[n] = mn
|
newtmp[n] = mn
|
||||||
tmp[mn] = nil
|
tmp[mn] = nil
|
||||||
cnt = 0
|
cnt = 0
|
||||||
for k,v in pairs(tmp) do
|
for _ in pairs(tmp) do
|
||||||
cnt = cnt + 1
|
cnt = cnt + 1
|
||||||
end
|
end
|
||||||
n = n + 1
|
n = n + 1
|
||||||
|
@ -146,8 +149,8 @@ function lib:IsTwink(name)
|
||||||
local realm = GetRealmName()
|
local realm = GetRealmName()
|
||||||
local _
|
local _
|
||||||
if(db['sv']['profileKeys']) then
|
if(db['sv']['profileKeys']) then
|
||||||
for k,v in pairs(db['sv']['profileKeys']) do
|
for k, _ in pairs(db['sv']['profileKeys']) do
|
||||||
local n,m = strsplit(" - ",k,2)
|
local n, m = strsplit(" - ", k, 2)
|
||||||
_,m = strsplit(" ",m,2)
|
_,m = strsplit(" ",m,2)
|
||||||
if(n) then
|
if(n) then
|
||||||
if(n == name and m == realm) then
|
if(n == name and m == realm) then
|
||||||
|
|
|
@ -1,17 +1,16 @@
|
||||||
local lib, oldminor = LibStub:NewLibrary("zzLDB", 4)
|
local lib = LibStub:NewLibrary("zzLDB", 6)
|
||||||
if not lib then return end
|
if not lib then return end
|
||||||
local ldb = LibStub:GetLibrary("LibDataBroker-1.1")
|
local ldb = LibStub:GetLibrary("LibDataBroker-1.1")
|
||||||
local ldbicon = LibStub:GetLibrary("LibDBIcon-1.0")
|
local ldbicon = LibStub:GetLibrary("LibDBIcon-1.0")
|
||||||
oldminor = oldminor or 0
|
|
||||||
local mixins = {'AddLDB', 'GetLDB', 'DefaultOnClick', 'DefaultOnText'}
|
local mixins = {'AddLDB', 'GetLDB', 'DefaultOnClick', 'DefaultOnText'}
|
||||||
local defaults = {
|
local defaults = {
|
||||||
['hide'] = false,
|
['hide'] = false,
|
||||||
}
|
}
|
||||||
lib['ldbs'] = lib['ldbs'] or {}
|
lib['ldbs'] = lib['ldbs'] or {}
|
||||||
local function proto_OnClick(self, button)
|
local function proto_OnClick(self, button)
|
||||||
print("onclick required", self, button)
|
-- print("onclick required", self, button)
|
||||||
end
|
end
|
||||||
function lib:DefaultOnClick(dummy, button, addon, childName)
|
function lib:DefaultOnClick(_, button, addon, childName)
|
||||||
if(IsShiftKeyDown() and button == "LeftButton") then
|
if(IsShiftKeyDown() and button == "LeftButton") then
|
||||||
local sb = addon['db']['global']['ldbicons']
|
local sb = addon['db']['global']['ldbicons']
|
||||||
sb[childName]['hide'] = not sb[childName]['hide']
|
sb[childName]['hide'] = not sb[childName]['hide']
|
||||||
|
@ -23,11 +22,22 @@ function lib:DefaultOnClick(dummy, button, addon, childName)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
if(InterfaceOptionsFrame:IsVisible() and not InCombatLockdown()) then
|
if(not InCombatLockdown()) then
|
||||||
InterfaceOptionsFrame:Hide()
|
if(SettingsPanel) then
|
||||||
else
|
if(SettingsPanel:IsVisible()) then
|
||||||
InterfaceOptionsFrame_OpenToCategory(childName)
|
HideUIPanel(SettingsPanel)
|
||||||
InterfaceOptionsFrame_OpenToCategory(childName) -- Twice because of a bug in InterfaceOptionsFrame_OpenToCategory
|
HideUIPanel(GameMenuFrame)
|
||||||
|
else
|
||||||
|
Settings.OpenToCategory(childName)
|
||||||
|
end
|
||||||
|
elseif(InterfaceOptionsFrame) then
|
||||||
|
if(InterfaceOptionsFrame:IsVisible()) then
|
||||||
|
InterfaceOptionsFrame:Hide()
|
||||||
|
else
|
||||||
|
InterfaceOptionsFrame_OpenToCategory(childName)
|
||||||
|
InterfaceOptionsFrame_OpenToCategory(childName) -- Twice because of a bug in InterfaceOptionsFrame_OpenToCategory
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -8,13 +8,24 @@ local folder = addonName ~= childName and format("Interface\\AddOns\\%s\\%s", a
|
||||||
local function OnClick(self, button)
|
local function OnClick(self, button)
|
||||||
if(button == 'RightButton') then
|
if(button == 'RightButton') then
|
||||||
if(IsShiftKeyDown()) then
|
if(IsShiftKeyDown()) then
|
||||||
zzCoords_MinimapToggle()
|
-- zzCoords_MinimapToggle()
|
||||||
else
|
else
|
||||||
if(InterfaceOptionsFrame:IsVisible() and not InCombatLockdown()) then
|
if(not InCombatLockdown()) then
|
||||||
InterfaceOptionsFrame:Hide()
|
if(SettingsPanel) then
|
||||||
else
|
if(SettingsPanel:IsVisible()) then
|
||||||
InterfaceOptionsFrame_OpenToCategory(childName)
|
HideUIPanel(SettingsPanel)
|
||||||
InterfaceOptionsFrame_OpenToCategory(childName) -- Twice because of a bug in InterfaceOptionsFrame_OpenToCategory
|
HideUIPanel(GameMenuFrame)
|
||||||
|
else
|
||||||
|
Settings.OpenToCategory(childName)
|
||||||
|
end
|
||||||
|
elseif(InterfaceOptionsFrame) then
|
||||||
|
if(InterfaceOptionsFrame:IsVisible()) then
|
||||||
|
InterfaceOptionsFrame:Hide()
|
||||||
|
else
|
||||||
|
InterfaceOptionsFrame_OpenToCategory(childName)
|
||||||
|
InterfaceOptionsFrame_OpenToCategory(childName) -- Twice because of a bug in InterfaceOptionsFrame_OpenToCategory
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
elseif(button == "LeftButton") then
|
elseif(button == "LeftButton") then
|
||||||
|
@ -40,8 +51,8 @@ local function OnTooltipShow(tip)
|
||||||
tip:AddLine(format("%s: %s",childName, child['playerCoords']))
|
tip:AddLine(format("%s: %s",childName, child['playerCoords']))
|
||||||
tip:AddLine(L['HINT'])
|
tip:AddLine(L['HINT'])
|
||||||
tip:AddLine(L['HINT2'])
|
tip:AddLine(L['HINT2'])
|
||||||
tip:AddLine(L['HINT3'])
|
-- tip:AddLine(L['HINT3'])
|
||||||
tip:AddLine(L['HINT4'])
|
-- tip:AddLine(L['HINT4'])
|
||||||
end
|
end
|
||||||
child['ldb'] = { -- https://github.com/tekkub/libdatabroker-1-1/wiki/Data-Specifications
|
child['ldb'] = { -- https://github.com/tekkub/libdatabroker-1-1/wiki/Data-Specifications
|
||||||
['type'] = 'data source', -- required: 'data source' or 'launcher'
|
['type'] = 'data source', -- required: 'data source' or 'launcher'
|
||||||
|
|
|
@ -27,21 +27,19 @@ local function setPlayerCoords()
|
||||||
child['playerCoords'] = playerCoords
|
child['playerCoords'] = playerCoords
|
||||||
end
|
end
|
||||||
local colorlist = {
|
local colorlist = {
|
||||||
['friendly'] = "00ff00",
|
['arena'] = "ff1919",
|
||||||
['arena'] = "ffff00",
|
['combat'] = "ff1919",
|
||||||
['sanctuary'] = "9999ff",
|
['hostile'] = "ff1919",
|
||||||
|
['friendly'] = "19ff19",
|
||||||
|
['sanctuary'] = "68ccef",
|
||||||
|
['contested'] = "ffb200",
|
||||||
}
|
}
|
||||||
local function pvpColor(txt)
|
local function pvpColor(txt)
|
||||||
local col
|
local pvpType = GetZonePVPInfo()
|
||||||
local pvpType, isFFA, faction = GetZonePVPInfo()
|
|
||||||
if(colorlist[pvpType]) then
|
if(colorlist[pvpType]) then
|
||||||
col = colorlist[pvpType]
|
return child:colorize(txt, colorlist[pvpType])
|
||||||
elseif(pvpType == "hostile" or pvpType == "combat" or pvpType=="contested") then
|
|
||||||
col = faction == select(2,UnitFactionGroup('player')) and "886600" or "ff0000"
|
|
||||||
else
|
|
||||||
return txt
|
|
||||||
end
|
end
|
||||||
return child:colorize(txt, col)
|
return txt
|
||||||
end
|
end
|
||||||
local function OnDataUpdate()
|
local function OnDataUpdate()
|
||||||
setPlayerCoords()
|
setPlayerCoords()
|
||||||
|
@ -60,7 +58,7 @@ local function OnDataUpdate()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function zzCoords_MinimapToggle()
|
local function zzCoords_MinimapToggle()
|
||||||
if(MinimapCluster:IsVisible()) then
|
if(MinimapCluster:IsVisible()) then
|
||||||
MinimapCluster:Hide()
|
MinimapCluster:Hide()
|
||||||
else
|
else
|
||||||
|
@ -122,8 +120,11 @@ child['specs'] = {
|
||||||
}
|
}
|
||||||
function events:PLAYER_ENTERING_WORLD(event)
|
function events:PLAYER_ENTERING_WORLD(event)
|
||||||
child:UnregisterEvent('PLAYER_ENTERING_WORLD')
|
child:UnregisterEvent('PLAYER_ENTERING_WORLD')
|
||||||
BINDING_HEADER_COORDS = childName
|
local m = CreateFrame("BUTTON", "zzCoords_MinimapToggleFrame")
|
||||||
BINDING_NAME_COORDS_TOGGLE = L["Toggle Minimap"]
|
m:SetScript("OnClick", zzCoords_MinimapToggle)
|
||||||
|
if(db['toggleMap'] and db['toggleMap'] ~= '') then
|
||||||
|
SetBinding(db['toggleMap'], "CLICK zzCoords_MinimapToggleFrame:LeftButton")
|
||||||
|
end
|
||||||
child:RegisterEvent({"ZONE_CHANGED_NEW_AREA","ZONE_CHANGED","ZONE_CHANGED_INDOORS","NEW_WMO_CHUNK"}, child.ZoneEvent)
|
child:RegisterEvent({"ZONE_CHANGED_NEW_AREA","ZONE_CHANGED","ZONE_CHANGED_INDOORS","NEW_WMO_CHUNK"}, child.ZoneEvent)
|
||||||
child:RegisterEvent({"PLAYER_STARTED_MOVING", "PLAYER_STOPPED_MOVING"}, child.MoveEvent)
|
child:RegisterEvent({"PLAYER_STARTED_MOVING", "PLAYER_STOPPED_MOVING"}, child.MoveEvent)
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,6 +1,10 @@
|
||||||
local addonName, addon = ...
|
local addonName, addon = ...
|
||||||
addon['childName'] = "zz_Coords"
|
addon['childName'] = "zz_Coords"
|
||||||
addon['callbacks'] = addon['callbacks'] or LibStub("CallbackHandler-1.0"):New(addon)
|
addon['callbacks'] = addon['callbacks'] or LibStub("CallbackHandler-1.0"):New(addon)
|
||||||
|
local loaded, finished = IsAddOnLoaded("BrokerPack")
|
||||||
|
if(finished) then
|
||||||
|
addonName = "BrokerPack"
|
||||||
|
end
|
||||||
addon[addon['childName']] = {
|
addon[addon['childName']] = {
|
||||||
['parentName'] = addonName ~= addon['childName'] and addonName or nil,
|
['parentName'] = addonName ~= addon['childName'] and addonName or nil,
|
||||||
['events'] = {}
|
['events'] = {}
|
||||||
|
|
|
@ -17,7 +17,7 @@ if L then
|
||||||
L['HINT4'] = "|c0000ff00Shift-Rechtsklick|r |c00ffffffschaltet Minimap an/aus|r"
|
L['HINT4'] = "|c0000ff00Shift-Rechtsklick|r |c00ffffffschaltet Minimap an/aus|r"
|
||||||
L['Show Zone'] = "Zeige Zone"
|
L['Show Zone'] = "Zeige Zone"
|
||||||
L['Show Subzone'] = "Zeige Subzone"
|
L['Show Subzone'] = "Zeige Subzone"
|
||||||
L["Toggle Minimap"] = "Minimap ein-/ausschalten"
|
L["Toggle Minimap"] = "Minimap ein-/ausblenden"
|
||||||
L['Max Length'] = "Max. L\195\164nge"
|
L['Max Length'] = "Max. L\195\164nge"
|
||||||
L['Limits the maximum length of the zone'] = "Limitiert die Anzeigel\195\164nge der Zone"
|
L['Limits the maximum length of the zone'] = "Limitiert die Anzeigel\195\164nge der Zone"
|
||||||
L['Mapcoords Screen'] = "Kartenkoordinaten Vollbild"
|
L['Mapcoords Screen'] = "Kartenkoordinaten Vollbild"
|
||||||
|
@ -34,10 +34,11 @@ if L then
|
||||||
L['This hides the coords-display in your broker display'] = "Zeigt die Koordinaten im Display-Broker nicht an"
|
L['This hides the coords-display in your broker display'] = "Zeigt die Koordinaten im Display-Broker nicht an"
|
||||||
L['Colorized Zone'] = "Farbige Zone"
|
L['Colorized Zone'] = "Farbige Zone"
|
||||||
L['Show PvP informations about current area'] = "Zeigt PvP Informationen zur Zone farblich an"
|
L['Show PvP informations about current area'] = "Zeigt PvP Informationen zur Zone farblich an"
|
||||||
|
L['Set keybind'] = "Setze Tastaturbelegung"
|
||||||
end
|
end
|
||||||
|
|
||||||
-- ö \195\182 ß \195\159
|
-- <EFBFBD> \195\182 <20> \195\159
|
||||||
-- ü \195\188 ä \195\164
|
-- <EFBFBD> \195\188 <20> \195\164
|
||||||
-- Ä \195\132
|
-- <EFBFBD> \195\132
|
||||||
-- ö \195\182
|
-- <EFBFBD> \195\182
|
||||||
-- Ü \195\156
|
-- <EFBFBD> \195\156
|
|
@ -34,4 +34,5 @@ if L then
|
||||||
L['This hides the coords-display in your broker display'] = true
|
L['This hides the coords-display in your broker display'] = true
|
||||||
L['Colorized Zone'] = true
|
L['Colorized Zone'] = true
|
||||||
L['Show PvP informations about current area'] = true
|
L['Show PvP informations about current area'] = true
|
||||||
|
L['Set keybind'] = true
|
||||||
end
|
end
|
|
@ -2,7 +2,13 @@ local addonName, addon = ...
|
||||||
local childName = addon['childName']
|
local childName = addon['childName']
|
||||||
local child = addon[childName]
|
local child = addon[childName]
|
||||||
local L = LibStub("AceLocale-3.0"):GetLocale(childName, true)
|
local L = LibStub("AceLocale-3.0"):GetLocale(childName, true)
|
||||||
function child:PrefChanged()
|
function child:PrefChanged(info, value, oldvalue)
|
||||||
|
if(info[#info] == 'toggleMap' and value ~= oldvalue) then
|
||||||
|
if(oldvalue) then
|
||||||
|
SetBinding(oldvalue)
|
||||||
|
end
|
||||||
|
SetBinding(value, "CLICK zzCoords_MinimapToggleFrame:LeftButton")
|
||||||
|
end
|
||||||
child:ZoneEvent()
|
child:ZoneEvent()
|
||||||
end
|
end
|
||||||
local init = {
|
local init = {
|
||||||
|
@ -20,6 +26,7 @@ local init = {
|
||||||
config:AddConfigEntry(main,'windowXY',"header",L['Mapcoords Window'],nil,6)
|
config:AddConfigEntry(main,'windowXY',"header",L['Mapcoords Window'],nil,6)
|
||||||
config:AddConfigEntry(main,"windowX","range",L['Window X'],L['Adjusts the X-Offset on windowed map'],7,-512,512,1)
|
config:AddConfigEntry(main,"windowX","range",L['Window X'],L['Adjusts the X-Offset on windowed map'],7,-512,512,1)
|
||||||
config:AddConfigEntry(main,"windowY","range",L['Window Y'],L['Adjusts the Y-Offset on windowed map'],8,-512,512,1)
|
config:AddConfigEntry(main,"windowY","range",L['Window Y'],L['Adjusts the Y-Offset on windowed map'],8,-512,512,1)
|
||||||
|
config:AddConfigEntry(main,"toggleMap","keybinding",L['Toggle Minimap'],L['Set keybind'],5)
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
addon.RegisterCallback(init, format("Init%s", childName), 'Setup')
|
addon.RegisterCallback(init, format("Init%s", childName), 'Setup')
|
|
@ -0,0 +1,9 @@
|
||||||
|
## Interface: 11403
|
||||||
|
## Title: Coords
|
||||||
|
## OptionalDeps: zzLib, Ace3, BrokerPack
|
||||||
|
## SavedVariables: zz_CoordsDB
|
||||||
|
## X-Repository: https://git.grml.de/rilgamon/zz_Coords.git
|
||||||
|
## X-WoWI-ID: 15431
|
||||||
|
## X-Curse-Project-ID: 22760
|
||||||
|
Libs\embeds.xml
|
||||||
|
pack.xml
|
|
@ -0,0 +1,9 @@
|
||||||
|
## Interface: 30400
|
||||||
|
## Title: Coords
|
||||||
|
## OptionalDeps: zzLib, Ace3, BrokerPack
|
||||||
|
## SavedVariables: zz_CoordsDB
|
||||||
|
## X-Repository: https://git.grml.de/rilgamon/zz_Coords.git
|
||||||
|
## X-WoWI-ID: 15431
|
||||||
|
## X-Curse-Project-ID: 22760
|
||||||
|
Libs\embeds.xml
|
||||||
|
pack.xml
|
|
@ -1,10 +1,9 @@
|
||||||
## Interface: 90005
|
## Interface: 100002
|
||||||
## Title: Coords
|
## Title: Coords
|
||||||
## OptionalDeps: zzLib, Ace3, BrokerPack
|
## OptionalDeps: zzLib, Ace3, BrokerPack
|
||||||
## SavedVariables: zz_CoordsDB
|
## SavedVariables: zz_CoordsDB
|
||||||
## X-Repository: https://git.grml.de/rilgamon/zz_Coords.git
|
## X-Repository: https://git.grml.de/rilgamon/zz_Coords.git
|
||||||
## X-WoWI-ID: 15431
|
## X-WoWI-ID: 15431
|
||||||
## X-Curse-Project-ID: 22760
|
## X-Curse-Project-ID: 22760
|
||||||
## X-TOC-Classic: 11302
|
|
||||||
Libs\embeds.xml
|
Libs\embeds.xml
|
||||||
pack.xml
|
pack.xml
|
Loading…
Reference in New Issue