Raid Pets and Optimized Chat Bubble Styling

commit f19d7402810637fc32460864104cb792ac5af863 Author: Brues <5278969+brues-code@users.noreply.github.com> Date: Wed Jul 22 01:05:52 2026 -0500 remove comment commit 60f4968f06d19d42bdc6347f98ff4d5a34785e97 Author: Brues <5278969+brues-code@users.noreply.github.com> Date: Wed Jul 22 01:05:06 2026 -0500 Bump ClassicAPI minimum version to 10705 Update the minimum required ClassicAPI version from 10704 (1.7.4) to 10705 (1.7.5). commit 088dba4c23f4aa7ce98b9ce9d75bc5892cd40520 Author: Brues <5278969+brues-code@users.noreply.github.com> Date: Wed Jul 22 01:04:04 2026 -0500 Add raid-pet frames: an independent, roster-driven pet grid New "raidpet" unitframe type that shows raid members' pets (raidpet1..40) in their own movable block (pfRaidPetCluster), off by default. It's a flat pool of frames laid out by pfUI.uf.raid:LayoutPets straight from the raid roster -- cell N shows raidpet<N> -- so it's fully decoupled from how the raid grid arranges its own slots. Layout is independent of the raid grid: raidpet carries its own width/height plus a Layout section (raidlayout / raidpadding / raidfill), and its own Collapse Empty Slots toggle that packs only the pets that exist into the leading cells. The raid grid gets the same collapse option (sequential slot assignment in AddUnitToGroup instead of by subgroup). Collapsed pets re-pack on roster changes and on UNIT_PET so summons and dismisses track live without polling. Also: - unitframes: a "raidpet" branch in UpdateVisibility (hide when the pet is out of range or its raid<N> owner is gone), and fix cache_raid so the "pfRaid" prefix check doesn't misread pfRaidPet<n> frames (char 7 is non-numeric -> nil compare crash). - New "Owner Name" text option: on any pet frame (raidpet/partypet/pet) it shows the owner's class-colored name so you can tell whose pet it is. - unlock: a pfRaidPet drag cluster, a numeric-suffix guard so pfRaid no longer matches (and crashes on) pet frames, and RaidPet config mappings. - config/gui/translations for all of the above. commit 52f02c8963fe7ec90f36100ebe069c7807529301 Author: Brues <5278969+brues-code@users.noreply.github.com> Date: Mon Jul 20 23:09:06 2026 -0500 Enumerate chat bubbles via ClassicAPI instead of scanning WorldFrame ClassicAPI's C_ChatBubbles.GetAllChatBubbles() walks the engine's own bubble list and returns the exact set of live bubble frames, with real GetRegions(), so the decoration idiom works unchanged. Replace the WorldFrame:GetChildren() sweep and drop the IsBubble heuristic (unnamed frame whose first region is the ChatBubble-Background texture) -- the API only ever hands back bubbles, so that guess is both redundant and more fragile than the engine list. Cheaper too: it iterates only live bubbles rather than every world child on each chat event.
2026-10-05 05:00:02 +00:00 · 2026-07-23 23:08:05 -05:00
parent fa1dc5637e
commit 5ed1d98ecc
15 changed files with 194 additions and 22 deletions
@@ -17,12 +17,6 @@ pfUI:RegisterModule("bubbles", function ()
    RunNextFrame(function() pfUI.bubbles:ScanBubbles() end)
  end)

-  function pfUI.bubbles:IsBubble(f)
-      if f:GetName() then return end
-      if not f:GetRegions() then return end
-      return f:GetRegions().GetTexture and f:GetRegions():GetTexture() == "Interface\\Tooltips\\ChatBubble-Background"
-  end
-
  function pfUI.bubbles:ProcessBubble(f)
    f.text:Hide()
    f.text:SetFont(pfUI.font_default, tonumber(C.global.font_size) * UIParent:GetScale(), "OUTLINE")
@@ -34,9 +28,8 @@ pfUI:RegisterModule("bubbles", function ()
  end

  function pfUI.bubbles:ScanBubbles()
-    local childs = { WorldFrame:GetChildren() }
-    for _, f in pairs(childs) do
-        if not f.frame and pfUI.bubbles:IsBubble(f) then
+    for _, f in ipairs(C_ChatBubbles.GetAllChatBubbles()) do
+        if not f.frame then
          local textures = {f:GetRegions()}
          for _, object in pairs(textures) do
            if object:GetObjectType() == "Texture" then
@@ -1068,6 +1068,7 @@ pfUI:RegisterModule("gui", function ()
        "unitrev:" .. T["Unit String (Reverse)"],
        "name:" .. T["Name"],
        "nameshort:" .. T["Name (Short)"],
+        "ownername:" .. T["Owner Name"],
        "level:" .. T["Level"],
        "class:" .. T["Class"],
        "namehealth:" .. T["Name | Health Missing"],
@@ -2184,6 +2185,7 @@ pfUI:RegisterModule("gui", function ()
      [10] = { "grouptarget", T["Group-Target"]},
      [11] = { "grouppet",   T["Group-Pet"] },
      [12] = { "raid",       T["Raid"] },
+      [13] = { "raidpet",    T["Raid-Pet"] },
    }

    CreateGUIEntry(T["Unit Frames"], T["Click Casting"], function()
@@ -2233,6 +2235,7 @@ pfUI:RegisterModule("gui", function ()
        U.ptarget     = U["pettarget"]
        U.grouptarget = U["group"]
        U.grouppet    = U["group"]
+        U.raidpet     = U["raid"]

        -- build config entries
        CreateConfig(U[c], T["Display Frame"] .. ": " .. t, C.unitframes[c], "visible", "checkbox")
@@ -2277,6 +2280,13 @@ pfUI:RegisterModule("gui", function ()
          CreateConfig(U["raid"], T["Raid Padding"], C.unitframes[c], "raidpadding")
          CreateConfig(U["raid"], T["Raid Layout"], C.unitframes[c], "raidlayout", "dropdown", pfUI.gui.dropdowns.uf_raidlayout)
          CreateConfig(U["raid"], T["Raid Fill Direction"], C.unitframes[c], "raidfill", "dropdown", pfUI.gui.dropdowns.orientation)
+          CreateConfig(U["raid"], T["Collapse Empty Slots"], C.unitframes[c], "collapse", "checkbox")
+        elseif c == "raidpet" then
+          CreateConfig(U[c], T["Layout"], nil, nil, "header")
+          CreateConfig(U["raid"], T["Raid Padding"], C.unitframes[c], "raidpadding")
+          CreateConfig(U["raid"], T["Raid Layout"], C.unitframes[c], "raidlayout", "dropdown", pfUI.gui.dropdowns.uf_raidlayout)
+          CreateConfig(U["raid"], T["Raid Fill Direction"], C.unitframes[c], "raidfill", "dropdown", pfUI.gui.dropdowns.orientation)
+          CreateConfig(U["raid"], T["Collapse Empty Slots"], C.unitframes[c], "collapse", "checkbox")
        end

        CreateConfig(U[c], T["Healthbar"], nil, nil, "header")
@@ -13,11 +13,32 @@ pfUI:RegisterModule("raid", function ()
  local rawborder, default_border = GetBorderSize("chat")
  local cluster = CreateFrame("Frame", "pfRaidCluster", UIParent)
  cluster:SetFrameLevel(20)
-  cluster:SetWidth(120)
-  cluster:SetHeight(10)
+  cluster:SetSize(120, 10)
  cluster:SetPoint("BOTTOMLEFT", UIParent, "BOTTOMLEFT", default_border*2, C.chat.left.height + default_border*5)
  UpdateMovable(cluster)

+  -- Separate, independently-movable block that mirrors the raid grid layout
+  -- for pet frames (raidpet1..40). Defaults to the right of the raid grid.
+  local petcluster = CreateFrame("Frame", "pfRaidPetCluster", UIParent)
+  petcluster:SetFrameLevel(20)
+  petcluster:SetSize(120, 10)
+  petcluster:SetPoint("BOTTOMLEFT", UIParent, "BOTTOMLEFT", default_border*2 + 300, C.chat.left.height + default_border*5)
+  UpdateMovable(petcluster)
+
+  -- flat pool of pet frames, laid out by LayoutPets (mirror or collapsed)
+  pfUI.uf.raid.pets = {}
+
+  -- 1-based grid slot -> (row, col) for the current fill direction, matching
+  -- the raid grid's own fill loops.
+  local function SlotToCoord(slot, fill, x, y)
+    slot = slot - 1
+    if fill == "VERTICAL" then
+      return floor(slot / y) + 1, mod(slot, y) + 1
+    else
+      return mod(slot, x) + 1, floor(slot / x) + 1
+    end
+  end
+
  pfUI.uf.raid.tanksfirst = {
    ["PF_TANK_TOGGLE"] = { T["Toggle as Tank"], "toggleTank" }
  }
@@ -28,6 +49,8 @@ pfUI:RegisterModule("raid", function ()
  function pfUI.uf.raid:UpdateConfig()
    local rawborder, default_border = GetBorderSize("unitframes")
    maxraid = tonumber(C.unitframes.maxraid)
+    local showpets = C.unitframes.raidpet.visible == "1"
+    self.showpets = showpets

    for i=1,maxraid do
      pfUI.uf.raid[i] = pfUI.uf.raid[i] or pfUI.uf:CreateUnitFrame("Raid", i, C.unitframes.raid)
@@ -36,6 +59,18 @@ pfUI:RegisterModule("raid", function ()

      pfUI.uf.raid[i]:UpdateConfig()
      pfUI.uf.raid[i]:UpdateFrameSize()
+
+      if showpets then
+        self.pets[i] = self.pets[i] or pfUI.uf:CreateUnitFrame("RaidPet", i, C.unitframes.raidpet, 0.5)
+        self.pets[i]:SetParent(petcluster)
+        self.pets[i]:SetFrameLevel(5)
+        self.pets[i]:UpdateConfig()
+        self.pets[i]:UpdateFrameSize()
+      elseif self.pets[i] then
+        self.pets[i]:UpdateConfig()
+        self.pets[i]:Hide()
+        RemoveMovable(self.pets[i])
+      end
    end

    local i = 1
@@ -47,6 +82,17 @@ pfUI:RegisterModule("raid", function ()
    local _, _, x, y = string.find(layout,"(.+)x(.+)")
    x, y = tonumber(x), tonumber(y)

+    if showpets then
+      local petcfg = C.unitframes.raidpet
+      local _, _, px, py = string.find(petcfg.raidlayout, "(.+)x(.+)")
+      self.petgrid = {
+        fill = petcfg.raidfill, x = tonumber(px), y = tonumber(py),
+        pad = tonumber(petcfg.raidpadding) * GetPerfectPixel(),
+        w = self.pets[1]:GetWidth()+2*default_border,
+        h = self.pets[1]:GetHeight()+2*default_border,
+      }
+    end
+
    if fill == "VERTICAL" then
      for r=1, x do for g=1, y do
        if pfUI.uf.raid[i] then
@@ -66,6 +112,43 @@ pfUI:RegisterModule("raid", function ()
        i = i + 1
      end end
    end
+
+    self:LayoutPets()
+
+    self:Show()
+  end
+
+  function pfUI.uf.raid:LayoutPets()
+    if not self.showpets or not self.petgrid then return end
+    local grid = self.petgrid
+
+    local function place(pet, cell, id)
+      pet.id = id
+      local r, g = SlotToCoord(cell, grid.fill, grid.x, grid.y)
+      pet:ClearAllPoints()
+      pet:SetPoint("BOTTOMLEFT", petcluster, "BOTTOMLEFT", (r-1)*(grid.pad+grid.w), (g-1)*(grid.pad+grid.h))
+      UpdateMovable(pet, true)
+      pet:UpdateVisibility()
+    end
+
+    if C.unitframes.raidpet.collapse == "1" then
+      -- Pack the pets that exist into the leading cells, no gaps.
+      local k = 0
+      for id = 1, maxraid do
+        if UnitExists("raidpet"..id) and self.pets[k+1] then
+          k = k + 1
+          place(self.pets[k], k, id)
+        end
+      end
+      for j = k+1, maxraid do
+        if self.pets[j] then self.pets[j].id = 0 self.pets[j]:Hide() end
+      end
+    else
+      -- Mirror: cell N always shows raidpet<N> at a fixed position.
+      for id = 1, maxraid do
+        if self.pets[id] then place(self.pets[id], id, id) end
+      end
+    end
  end

  pfUI.uf.raid:UpdateConfig()
@@ -76,13 +159,22 @@ pfUI:RegisterModule("raid", function ()
    frame:UpdateVisibility()
  end

-  -- add units to the beginning of their groups
+  -- add units to their groups; collapse packs everyone into the leading slots
  function pfUI.uf.raid:AddUnitToGroup(index, group)
-    for subindex = 1, 5 do
-      local ids = subindex + 5*(group-1)
-      if pfUI.uf.raid[ids] and pfUI.uf.raid[ids].id == 0 and pfUI.uf.raid[ids].config.visible == "1" then
-        SetRaidIndex(pfUI.uf.raid[ids], index)
-        return
+    if C.unitframes.raid.collapse == "1" then
+      for ids = 1, maxraid do
+        if pfUI.uf.raid[ids] and pfUI.uf.raid[ids].id == 0 and pfUI.uf.raid[ids].config.visible == "1" then
+          SetRaidIndex(pfUI.uf.raid[ids], index)
+          return
+        end
+      end
+    else
+      for subindex = 1, 5 do
+        local ids = subindex + 5*(group-1)
+        if pfUI.uf.raid[ids] and pfUI.uf.raid[ids].id == 0 and pfUI.uf.raid[ids].config.visible == "1" then
+          SetRaidIndex(pfUI.uf.raid[ids], index)
+          return
+        end
      end
    end
  end
@@ -92,7 +184,14 @@ pfUI:RegisterModule("raid", function ()
  pfUI.uf.raid:RegisterEvent("PARTY_MEMBERS_CHANGED")
  pfUI.uf.raid:RegisterEvent("PARTY_LEADER_CHANGED")
  pfUI.uf.raid:RegisterEvent("VARIABLES_LOADED")
+  pfUI.uf.raid:RegisterEvent("UNIT_PET")
  pfUI.uf.raid:SetScript("OnEvent", function()
+    if event == "UNIT_PET" then
+      if this.showpets and C.unitframes.raidpet.collapse == "1" then
+        this:LayoutPets()
+      end
+      return
+    end
    this:Show()
    -- Debounce: delay update by 0.5s to batch rapid roster changes (mass swaps)
    this.pendingUpdate = GetTime() + 0.5
@@ -127,6 +226,8 @@ pfUI:RegisterModule("raid", function ()
      end
    end

+    this:LayoutPets()
+
    -- Smart GUID-based updates: only refresh frames where unit changed
    if pfUI.uf.guidTracker then
      local tracker = pfUI.uf.guidTracker
@@ -6,6 +6,7 @@ pfUI:RegisterModule("unlock", function ()
    -- Name            Shift  Ctrl
    { "pfCombo",          5       },
    { "pfRaid",           40,   5 },
+    { "pfRaidPet",        40,   5 },
    { "pfGroup",          4       },
    { "pfLootRollFrame",  4       },
  }
@@ -35,6 +36,8 @@ pfUI:RegisterModule("unlock", function ()
    -- groupframes
    ["Raid%d"]        = { T["Group Frames"], T["Raid"] },
    ["Raid%d%d"]      = { T["Group Frames"], T["Raid"] },
+    ["RaidPet%d"]     = { T["Group Frames"], T["Raid-Pet"] },
+    ["RaidPet%d%d"]   = { T["Group Frames"], T["Raid-Pet"] },
    ["Group%d"]       = { T["Group Frames"], T["Group"] },
    ["Party%dTarget"] = { T["Group Frames"], T["Group-Target"] },
    ["PartyPet%d"]    = { T["Group Frames"], T["Group-Pet"] },
@@ -98,7 +101,8 @@ pfUI:RegisterModule("unlock", function ()
      -- search and add clustered frames
      for id, cluster in pairs(clusters) do
        local len = strlen(cluster[1])
-        if strsub(frame:GetName(),0,len) == cluster[1] then
+        local fid = tonumber(strsub(frame:GetName(),len+1,len+2))
+        if fid and strsub(frame:GetName(),0,len) == cluster[1] then
          if IsShiftKeyDown() and cluster[2] then
            for i = 1, cluster[2] do
              if _G[cluster[1] .. i] ~= frame then
@@ -106,7 +110,7 @@ pfUI:RegisterModule("unlock", function ()
              end
            end
          elseif IsControlKeyDown() and cluster[3] then
-            local id = tonumber(strsub(frame:GetName(),len+1,len+2))
+            local id = fid

            local b = 1
            for i = cluster[3]+1, cluster[2], cluster[3] do