Skip to content

Smallpatches #6219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
InfusOnWoW merged 3 commits into from
May 31, 2026
Merged

Smallpatches #6219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ccd89ca
Fix lua error on creating a icon in a dynamic group
InfusOnWoW May 31, 2026
76070cb
Create a font string for each font on options first load
InfusOnWoW May 31, 2026
0d3c454
Custom Options: Fix regression in changing user settings on a group
InfusOnWoW May 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions WeakAurasOptions/AuthorOptions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ local function setUser(data, option)
OptionsPrivate.Private.TimeMachine:Append({
uid = childData.uid,
actionType = "set",
path = expandUserPath(data, optionData.path),
path = expandUserPath(childData, optionData.path),
payload = value
})
end
Expand Down Expand Up @@ -633,7 +633,7 @@ local function setUserNum(data, option)
OptionsPrivate.Private.TimeMachine:Append({
uid = childData.uid,
actionType = "set",
path = expandUserPath(data, optionData.path),
path = expandUserPath(childData, optionData.path),
payload = num
})
end
Expand Down Expand Up @@ -672,7 +672,7 @@ local function setUserColor(data, option)
OptionsPrivate.Private.TimeMachine:Append({
uid = childData.uid,
actionType = "set",
path = expandUserPath(data, optionData.path),
path = expandUserPath(childData, optionData.path),
payload = color
})
end
Expand Down Expand Up @@ -2656,7 +2656,7 @@ local function addUserModeOption(options, args, data, order, prefix, i)
OptionsPrivate.Private.TimeMachine:Append({
uid = childData.uid,
actionType = "set",
path = expandUserPath(data, optionData.path),
path = expandUserPath(childData, optionData.path),
payload = {},
})
end
Expand All @@ -2680,7 +2680,7 @@ local function addUserModeOption(options, args, data, order, prefix, i)
local childConfigList = optionData.config[childOption.key]
local childData = optionData.data
if childOption.limitType == "none" or #childConfigList < childOption.size then
local expandedPath = expandUserPath(data, optionData.path)
local expandedPath = expandUserPath(childData, optionData.path)
-- expandUserPath adds the page at the end, which we don't need here
expandedPath[#expandedPath] = nil
local insertPos = #childConfigList + 1
Expand Down Expand Up @@ -2731,7 +2731,7 @@ local function addUserModeOption(options, args, data, order, prefix, i)
local childData = optionData.data
local page = getPage(id, optionData.path)
if #childConfigList ~= 0 then
local expandedPath = expandUserPath(data, optionData.path)
local expandedPath = expandUserPath(childData, optionData.path)
-- expandUserPath adds the page at the end, which we don't need here
expandedPath[#expandedPath] = nil
OptionsPrivate.Private.TimeMachine:Append({
Expand Down Expand Up @@ -2768,7 +2768,7 @@ local function addUserModeOption(options, args, data, order, prefix, i)
local childData = optionData.data
local childPage = getPage(id, optionData.path, #childConfigList)
if childConfigList[childPage] then
local expandedPath = expandUserPath(data, optionData.path)
local expandedPath = expandUserPath(childData, optionData.path)
-- expandUserPath adds the page at the end, which we don't need here
expandedPath[#expandedPath] = nil
OptionsPrivate.Private.TimeMachine:Append({
Expand Down Expand Up @@ -2807,7 +2807,7 @@ local function addUserModeOption(options, args, data, order, prefix, i)
local childData = optionData.data
local childPage = getPage(id, optionData.path, #childConfigList)
if childConfigList[childPage] then
local expandedPath = expandUserPath(data, optionData.path)
local expandedPath = expandUserPath(childData, optionData.path)
-- expandUserPath adds the page at the end, which we don't need here
expandedPath[#expandedPath] = nil
OptionsPrivate.Private.TimeMachine:Append({
Expand Down
2 changes: 2 additions & 0 deletions WeakAurasOptions/RegionOptions/Text.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ end

local dynamicTextInputs = {}



local function createOptions(id, data)
local function hideCustomTextOption()
if OptionsPrivate.Private.ContainsCustomPlaceHolder(data.displayText) then
Expand Down
12 changes: 10 additions & 2 deletions WeakAurasOptions/WeakAurasOptions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,6 +896,12 @@ function WeakAuras.ShowOptions(msg)

if firstLoad then
frame:ShowTip()
for _, font in pairs(AceGUIWidgetLSMlists.font) do
local fs = frame:CreateFontString(nil, "OVERLAY", "GameFontWhite")
local _, size, outline= fs:GetFont()
fs:SetPoint("TOP", UIParent, "TOP")
fs:SetFont(font, size, outline)
end
end

end
Expand Down Expand Up @@ -1968,6 +1974,9 @@ function WeakAuras.NewAura(sourceData, regionType, targetId)
return
end

data.parent = group.data.id
WeakAuras.Add(data)

local children = group.data.controlledChildren;
local index = target:GetGroupOrder();
if (ensure(children, index, target.data.id)) then
Expand All @@ -1978,8 +1987,7 @@ function WeakAuras.NewAura(sourceData, regionType, targetId)
-- move source into group as the first child
tinsert(children, 1, data.id);
end
data.parent = group.data.id;
WeakAuras.Add(data);

WeakAuras.Add(group.data);
OptionsPrivate.Private.AddParents(group.data)
WeakAuras.NewDisplayButton(data);
Expand Down