Skip to content
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

fix #4636

Merged
merged 1 commit into from
Oct 9, 2023
Merged

fix #4636

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions WeakAurasOptions/CommonOptions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1123,7 +1123,7 @@ local function PositionOptions(id, data, _, hideWidthHeight, disableSelfPoint, g
order = 72,
image = function() return "", 0, 0 end,
hidden = function()
return IsParentDynamicGroup() or not (data.anchorFrameType == "SCREEN" or data.anchorFrameType == "UIPARENT" or data.anchorFrameType == "MOUSE")
return IsParentDynamicGroup() or not (data.anchorFrameType == "SCREEN" or data.anchorFrameType == "UIPARENT" or data.anchorFrameType == "MOUSE" or IsGroupByFrame())
end,
},
-- Input field to select frame to anchor on
Expand All @@ -1133,7 +1133,7 @@ local function PositionOptions(id, data, _, hideWidthHeight, disableSelfPoint, g
name = L["Frame"],
order = 73,
hidden = function()
if (IsParentDynamicGroup()) then
if (IsParentDynamicGroup() or IsGroupByFrame()) then
return true;
end
return not (data.anchorFrameType == "SELECTFRAME")
Expand All @@ -1146,7 +1146,7 @@ local function PositionOptions(id, data, _, hideWidthHeight, disableSelfPoint, g
name = L["Choose"],
order = 74,
hidden = function()
if (IsParentDynamicGroup()) then
if (IsParentDynamicGroup() or IsGroupByFrame()) then
return true;
end
return not (data.anchorFrameType == "SELECTFRAME")
Expand Down Expand Up @@ -1287,7 +1287,7 @@ local function PositionOptions(id, data, _, hideWidthHeight, disableSelfPoint, g

OptionsPrivate.commonOptions.AddCodeOption(positionOptions, data, L["Custom Anchor"], "custom_anchor",
"https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#custom-anchor-function",
71.5, function() return not(data.anchorFrameType == "CUSTOM" and not IsParentDynamicGroup()) end,
71.5, function() return not(data.anchorFrameType == "CUSTOM" and not IsParentDynamicGroup() and not IsGroupByFrame()) end,
{"customAnchor"}, false, { setOnParent = group })
return positionOptions;
end
Expand Down