WeakAuras · emptyrivers · Sep 10, 2020 · Sep 11, 2020 · Oct 5, 2020 · Oct 5, 2020
diff --git a/WeakAuras/RegionTypes/DynamicGroup.lua b/WeakAuras/RegionTypes/DynamicGroup.lua
diff --git a/WeakAuras/RegionTypes/DynamicGroupOld.lua b/WeakAuras/RegionTypes/DynamicGroupOld.lua
diff --git a/WeakAuras/RegionTypes/RegionPrototype.lua b/WeakAuras/RegionTypes/RegionPrototype.lua
@@ -553,7 +553,7 @@ function WeakAuras.regionPrototype.modify(parent, region, data)
     region.customAnchorFunc = nil
   end
 
-  if not parent or parent.regionType ~= "dynamicgroup" then
+  if not parent or not parent.regionType or not parent.regionType:find("dynamicgroup") then
     if
       -- Don't anchor single Auras that with custom anchoring,
       -- these will be anchored in expand
@@ -564,8 +564,7 @@ function WeakAuras.regionPrototype.modify(parent, region, data)
       )
       -- Group Auras that will never be expanded, so those need
       -- to be always anchored here
-      or data.regionType == "dynamicgroup"
-      or data.regionType == "group"
+      or data.regionType:find("group")
     then
       Private.AnchorFrame(data, region, parent);
     end
@@ -731,7 +730,7 @@ end
 function WeakAuras.regionPrototype.AddExpandFunction(data, region, cloneId, parent, parentRegionType)
   local uid = data.uid
   local id = data.id
-  local inDynamicGroup = parentRegionType == "dynamicgroup";
+  local inDynamicGroup = parentRegionType and parentRegionType:find("dynamicgroup");
   local inGroup = parentRegionType == "group";
 
   local startMainAnimation = function()

diff --git a/WeakAuras/Transmission.lua b/WeakAuras/Transmission.lua
@@ -582,7 +582,7 @@ local function importPendingData()
       tinsert(parentData.controlledChildren, installedChild.id)
       WeakAuras.NewDisplayButton(installedChild)
       local childButton = WeakAuras.GetDisplayButton(installedChild.id)
-      childButton:SetGroup(parentData.id, parentData.regionType == "dynamicgroup")
+      childButton:SetGroup(parentData.id)
       childButton:SetGroupOrder(index, #parentData.controlledChildren)
       coroutine.yield()
     end

diff --git a/WeakAuras/Types.lua b/WeakAuras/Types.lua
@@ -68,6 +68,14 @@ Private.group_sort_types = {
   custom = L["Custom"]
 }
 
+Private.group_distribute_types = {
+  -- TODO: bikeshed these strings
+  self = L["None"],
+  nameplate = L["Nameplate Unit"],
+  unit = L["Unit Frames"],
+  custom = L["Custom"],
+}
+
 Private.group_hybrid_position_types = {
   hybridFirst = L["Marked First"],
   hybridLast = L["Marked Last"]

diff --git a/WeakAuras/WeakAuras.lua b/WeakAuras/WeakAuras.lua
@@ -2347,12 +2347,12 @@ function WeakAuras.AddMany(table, takeSnapshots)
   local groups = {}
   for id, data in pairs(idtable) do
     load(id, {});
-    if data.regionType == "dynamicgroup" or data.regionType == "group" then
+    if data.controlledChildren then
       groups[data] = true
     end
   end
   for data in pairs(groups) do
-    if data.type == "dynamicgroup" then
+    if data.regionType:find("dynamicgroup", 1, true) then
       regions[data.id].region:ReloadControlledChildren()
     else
       WeakAuras.Add(data)
@@ -2866,11 +2866,11 @@ function WeakAuras.SetRegion(data, cloneId)
             regionType = regionType,
             region = region
           };
-          if regionType ~= "dynamicgroup" and regionType ~= "group" then
+          if data.controlledChildren then
+            region.toShow = true
+          else
             region.toShow = false
             region:Hide()
-          else
-            region.toShow = true
           end
         else
           region = regions[id].region;
@@ -5001,7 +5001,7 @@ local anchorFrameDeferred = {}
 
 function Private.AnchorFrame(data, region, parent)
   if data.anchorFrameType == "CUSTOM"
-  and (data.regionType == "group" or data.regionType == "dynamicgroup")
+  and data.controlledChildren
   and not WeakAuras.IsLoginFinished()
   and not anchorFrameDeferred[data.id]
   then

diff --git a/WeakAuras/WeakAuras.toc b/WeakAuras/WeakAuras.toc
@@ -64,6 +64,7 @@ RegionTypes\Icon.lua
 RegionTypes\Text.lua
 RegionTypes\Group.lua
 RegionTypes\DynamicGroup.lua
+RegionTypes\DynamicGroupOld.lua
 RegionTypes\StopMotion.lua
 RegionTypes\Model.lua
 

diff --git a/WeakAurasOptions/AceGUI-Widgets/AceGUIWidget-WeakAurasDisplayButton.lua b/WeakAurasOptions/AceGUI-Widgets/AceGUIWidget-WeakAurasDisplayButton.lua
@@ -14,7 +14,7 @@ local fullName;
 local clipboard = {};
 
 local function IsRegionAGroup(data)
-  return data and (data.regionType == "group" or data.regionType == "dynamicgroup");
+  return data and data.controlledChildren;
 end
 
 local ignoreForCopyingDisplay = {
@@ -599,7 +599,7 @@ local methods = {
           if childData.parent then
             childButton:Ungroup();
           end
-          childButton:SetGroup(data.id, data.regionType == "dynamicgroup");
+          childButton:SetGroup(data.id);
           childButton:SetGroupOrder(#data.controlledChildren, #data.controlledChildren);
           childData.parent = data.id;
           WeakAuras.Add(childData);
@@ -608,13 +608,13 @@ local methods = {
       else
         tinsert(data.controlledChildren, self.grouping.id);
         local childButton = WeakAuras.GetDisplayButton(self.grouping.id);
-        childButton:SetGroup(data.id, data.regionType == "dynamicgroup");
+        childButton:SetGroup(data.id);
         childButton:SetGroupOrder(#data.controlledChildren, #data.controlledChildren);
         self.grouping.parent = data.id;
         WeakAuras.Add(self.grouping);
         WeakAuras.ClearAndUpdateOptions(self.grouping.id);
       end
-      if (data.regionType == "dynamicgroup") then
+      if (data.regionType:find("dynamicgroup", 1, true)) then
         self.grouping.xOffset = 0;
         self.grouping.yOffset = 0;
       end
@@ -910,7 +910,7 @@ local methods = {
     if (not data.controlledChildren) then
       local convertMenu = {};
       for regionType, regionData in pairs(WeakAuras.regionOptions) do
-        if(regionType ~= "group" and regionType ~= "dynamicgroup" and regionType ~= "timer" and regionType ~= data.regionType) then
+        if(regionType ~= data.regionType) then
           tinsert(convertMenu, {
             text = regionData.displayName,
             notCheckable = true,
@@ -1107,7 +1107,7 @@ local methods = {
         self.frame:SetScript("OnClick", self.callbacks.OnClickGroupingSelf);
         self:SetDescription(L["Cancel"], L["Do not group this display"]);
       else
-        if(self.data.regionType == "group" or self.data.regionType == "dynamicgroup") then
+        if(self.data.controlledChildren) then
           self.frame:SetScript("OnClick", self.callbacks.OnClickGrouping);
           self:SetDescription(self.data.id, L["Add to group %s"]:format(self.data.id));
         else
@@ -1359,7 +1359,7 @@ local methods = {
     return self.frame.dgroup;
   end,
   ["IsGroup"] = function(self)
-    return self.data.regionType == "group" or self.data.regionType == "dynamicgroup"
+    return self.data.controlledChildren
   end,
   ["SetData"] = function(self, data)
     self.data = data;

diff --git a/WeakAurasOptions/AnimationOptions.lua b/WeakAurasOptions/AnimationOptions.lua
@@ -23,7 +23,7 @@ local function filterAnimPresetTypes(intable, id)
     for key, value in pairs(intable) do
       local preset = OptionsPrivate.Private.anim_presets[key];
       if(preset) then
-        if(regionType == "group" or regionType == "dynamicgroup") then
+        if(data.controlledChildren) then
           local valid = true;
           for index, childId in pairs(data.controlledChildren) do
             local childRegion = WeakAuras.regions[childId] and WeakAuras.regions[childId].region

diff --git a/WeakAurasOptions/CommonOptions.lua b/WeakAurasOptions/CommonOptions.lua
@@ -972,7 +972,7 @@ local function PositionOptions(id, data, _, hideWidthHeight, disableSelfPoint, g
   local function IsParentDynamicGroup()
     if data.parent then
       local parentData = WeakAuras.GetData(data.parent)
-      return parentData and parentData.regionType == "dynamicgroup"
+      return parentData and parentData.regionType:find("dynamicgroup", 1, true)
     end
   end
 
@@ -1065,7 +1065,7 @@ local function PositionOptions(id, data, _, hideWidthHeight, disableSelfPoint, g
       name = L["Anchored To"],
       order = 72,
       hidden = IsParentDynamicGroup,
-      values = (data.regionType == "group" or data.regionType == "dynamicgroup") and OptionsPrivate.Private.anchor_frame_types_group or OptionsPrivate.Private.anchor_frame_types,
+      values = data.controlledChildren and OptionsPrivate.Private.anchor_frame_types_group or OptionsPrivate.Private.anchor_frame_types,
     },
     -- Input field to select frame to anchor on
     anchorFrameFrame = {

diff --git a/WeakAurasOptions/ExternalAddons.lua b/WeakAurasOptions/ExternalAddons.lua
@@ -61,7 +61,7 @@ function OptionsPrivate.CreateImportButtons()
             if(data) then
               for index, childId in pairs(data.controlledChildren) do
                 local childButton = WeakAuras.GetDisplayButton(childId);
-                childButton:SetGroup(groupId, data.regionType == "dynamicgroup");
+                childButton:SetGroup(groupId);
                 childButton:SetGroupOrder(index, #data.controlledChildren);
               end
 
@@ -163,7 +163,7 @@ function OptionsPrivate.CreateImportButtons()
             if(data) then
               for index, childId in pairs(data.controlledChildren) do
                 local childButton = WeakAuras.GetDisplayButton(childId);
-                childButton:SetGroup(id, data.regionType == "dynamicgroup");
+                childButton:SetGroup(id);
                 childButton:SetGroupOrder(index, #data.controlledChildren);
               end
 

diff --git a/WeakAurasOptions/InformationOptions.lua b/WeakAurasOptions/InformationOptions.lua
@@ -125,27 +125,24 @@ function OptionsPrivate.GetInformationOptions(data)
     end
   end
 
-  -- Show warnings only for single selection for now
-  if not isGroup then
-    local icon, title, message = OptionsPrivate.Private.AuraWarnings.FormatWarnings(data.uid)
-    if title and message then
-      args.warningTitle = {
-        type = "header",
-        name = title,
-        width = WeakAuras.doubleWidth,
-        order = order,
-      }
-      order = order + 1
+  local icon, title, messages = OptionsPrivate.Private.AuraWarnings.FormatWarnings(data.uid)
+  if title and messages then
+    args.warningTitle = {
+      type = "header",
+      name = title,
+      width = WeakAuras.doubleWidth,
+      order = order,
+    }
+    order = order + 1
 
-      args.warnings = {
-        type = "description",
-        name = message,
-        width = WeakAuras.doubleWidth,
-        order = order,
-        fontSize = "medium"
-      }
-      order = order + 1
-    end
+    args.warnings = {
+      type = "description",
+      name = messages,
+      width = WeakAuras.doubleWidth,
+      order = order,
+      fontSize = "medium"
+    }
+    order = order + 1
   end
 
   -- compatibility Options

diff --git a/WeakAurasOptions/OptionsFrames/FrameChooser.lua b/WeakAurasOptions/OptionsFrames/FrameChooser.lua
@@ -54,7 +54,7 @@ function OptionsPrivate.StartFrameChooser(data, path)
           local focusIsGroup = false;
           for id, regionData in pairs(WeakAuras.regions) do
             if(regionData.region:IsVisible() and MouseIsOver(regionData.region)) then
-              local isGroup = regionData.regionType == "group" or regionData.regionType == "dynamicgroup";
+              local isGroup = regionData.data.controlledChildren;
               if (not focusName or (not isGroup and focusIsGroup)) then
                 focus = regionData.region;
                 focusName = "WeakAuras:"..id;

diff --git a/WeakAurasOptions/OptionsFrames/MoverSizer.lua b/WeakAurasOptions/OptionsFrames/MoverSizer.lua
@@ -669,7 +669,7 @@ local function ConstructMoverSizer(parent)
       frame.lineX:Hide()
     end
 
-    if data.parent and db.displays[data.parent] and db.displays[data.parent].regionType == "dynamicgroup" then
+    if data.parent and db.displays[data.parent] and db.displays[data.parent].regionType:find("dynamicgroup", 1, true) then
       mover:SetScript("OnMouseDown", nil)
       mover:SetScript("OnMouseUp", nil)
       mover:SetScript("OnEvent", nil)
@@ -903,7 +903,7 @@ local function ConstructMoverSizer(parent)
     self.anchorPointIcon:SetPoint("CENTER", self.anchor, self.anchorPoint)
     local anchorX, anchorY = self.anchorPointIcon:GetCenter()
     anchorX, anchorY = anchorX or 0, anchorY or 0
-    if data.parent and db.displays[data.parent] and db.displays[data.parent].regionType == "dynamicgroup" then
+    if data.parent and db.displays[data.parent] and db.displays[data.parent].regionType:find("dynamicgroup", 1, true) then
       self.selfPointIcon:Hide()
       self.anchorPointIcon:Hide()
     else

diff --git a/WeakAurasOptions/OptionsFrames/OptionsFrame.lua b/WeakAurasOptions/OptionsFrames/OptionsFrame.lua
@@ -1138,7 +1138,7 @@ function OptionsPrivate.CreateFrame()
 
     for index, regionType in ipairs(regionTypesSorted) do
       local regionData = regionOptions[regionType]
-      if (not (fromGroup and (regionType == "group" or regionType == "dynamicgroup"))) then
+      if (not (fromGroup and (regionType:find("group")))) then
         local button = AceGUI:Create("WeakAurasNewButton")
         button:SetTitle(regionData.displayName)
         if(type(regionData.icon) == "string" or type(regionData.icon) == "table") then

diff --git a/WeakAurasOptions/RegionOptions/DynamicGroup.lua b/WeakAurasOptions/RegionOptions/DynamicGroup.lua
@@ -129,33 +129,6 @@ local function createOptions(id, data)
         OptionsPrivate.ResetMoverSizer()
       end,
     },
-    useAnchorPerUnit = {
-      type = "toggle",
-      order = 1.5,
-      width = WeakAuras.normalWidth,
-      name = L["Group by Frame"],
-      desc = L[
-[[Group and anchor each auras by frame.
-
-- Nameplates: attach to nameplates per unit.
-- Unit Frames: attach to unit frame buttons per unit.
-- Custom Frames: choose which frame each region should be anchored to.]]
-      ],
-      hidden = function() return data.grow == "CUSTOM" end,
-    },
-    anchorPerUnit = {
-      type = "select",
-      width = WeakAuras.normalWidth,
-      name = L["Group by Frame"],
-      order = 1.6,
-      values = {
-        ["UNITFRAME"] = L["Unit Frames"],
-        ["NAMEPLATE"] = L["Nameplates"],
-        ["CUSTOM"] = L["Custom Frames"],
-      },
-      hidden = function() return data.grow == "CUSTOM" end,
-      disabled = function() return not data.useAnchorPerUnit end
-    },
     -- custom grow option added below
     align = {
       type = "select",
@@ -397,17 +370,24 @@ local function createOptions(id, data)
       disabled = function() return not data.useLimit end,
       hidden = function() return data.grow == "CUSTOM" end,
     },
+    distribute = {
+      type = "select",
+      width = WeakAuras.doubleWidth,
+      name = L["Distribute"], -- TODO: bikeshed
+      order = 27,
+      values = OptionsPrivate.Private.group_distribute_types
+    },
     animate = {
       type = "toggle",
       width = WeakAuras.normalWidth,
       name = L["Animated Expand and Collapse"],
-      order = 27
+      order = 28
     },
     scale = {
       type = "range",
       width = WeakAuras.normalWidth,
       name = L["Group Scale"],
-      order = 28,
+      order = 29,
       min = 0.05,
       softMax = 2,
       max = 10,
@@ -436,8 +416,8 @@ local function createOptions(id, data)
                           2, function() return data.grow ~= "CUSTOM" end, {"customGrow"}, false, { setOnParent = true })
   OptionsPrivate.commonOptions.AddCodeOption(options, data, L["Custom Sort"], "custom_sort", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#custom-sort",
                           21, function() return data.sort ~= "custom" end, {"customSort"}, false, { setOnParent = true })
-  OptionsPrivate.commonOptions.AddCodeOption(options, data, L["Custom Anchor"], "custom_anchor_per_unit", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#group-by-frame",
-                          1.7, function() return not(data.grow ~= "CUSTOM" and data.useAnchorPerUnit and data.anchorPerUnit == "CUSTOM") end, {"customAnchorPerUnit"}, false, { setOnParent = true })
+  OptionsPrivate.commonOptions.AddCodeOption(options, data, L["Custom Distribute"], "custom_distribute", "https://github.com/WeakAuras/WeakAuras2/wiki/Custom-Code-Blocks#group-by-frame",
+                          27.5, function() return data.distribute ~= "custom" end, {"customDistribute"}, false, { setOnParent = true })
 
   local borderHideFunc = function() return data.useAnchorPerUnit or data.grow == "CUSTOM" end
   local disableSelfPoint = function() return data.grow ~= "CUSTOM" and data.grow ~= "GRID" and not data.useAnchorPerUnit end
@@ -553,4 +533,4 @@ local function createIcon()
   return thumbnail
 end
 
-WeakAuras.RegisterRegionOptions("dynamicgroup", createOptions, createIcon, L["Dynamic Group"], createThumbnail, modifyThumbnail, L["A group that dynamically controls the positioning of its children"]);
+WeakAuras.RegisterRegionOptions("dynamicgroup2", createOptions, createIcon, L["Dynamic Group"], createThumbnail, modifyThumbnail, L["A group that dynamically controls the positioning of its children"]);