a296877 - Add option to iterate over UnitAura instead of aura list

[wowui.git] / OmaUF / Auras.lua

diff --git a/OmaUF/Auras.lua b/OmaUF/Auras.lua
index 499bd77..5e6de47 100644 (file)
--- a/OmaUF/Auras.lua
+++ b/OmaUF/Auras.lua
@@ -2,7 +2,7 @@
 local _;
 local CreateFrame = CreateFrame;
 local UnitAura = UnitAura;
-local GameTooltip = nil;
+local GameTooltip = GameTooltip;
 
 local auraFilters = {"HELPFUL", "HARMFUL"};
 
@@ -18,7 +18,7 @@ local function updateTooltip(frame)
 end
 
 local function showTooltip(frame)
-    -- tooltip handling from TargetFrame.xml
+    -- tooltip handling from FrameXML/TargetFrame.xml
     GameTooltip:SetOwner(frame, "ANCHOR_BOTTOMRIGHT", 15, -25);
     GameTooltip:SetUnitAura(frame.unit, frame.index, frame.filter);
     frame:SetScript("OnUpdate", updateTooltip);
@@ -29,13 +29,19 @@ local function hideTooltip(frame)
     frame:SetScript("OnUpdate", nil);
 end
 
+function M.UpdateAuraTooltips()
+    GameTooltip = _G["GameTooltip"];
+end
+
 local function createAura(parent, prev, anchor, name, unit)
     local aura = CreateFrame("Frame", name, parent);
     aura:SetPoint("TOPLEFT", prev, anchor);
-    aura:SetWidth(16);
-    aura:SetHeight(16);
+    aura:SetWidth(20);
+    aura:SetHeight(20);
     aura.icon = aura:CreateTexture(nil, "ARTWORK");
     aura.icon:SetAllPoints();
+    aura.stack = aura:CreateFontString(nil, "OVERLAY", "NumberFontNormalSmall");
+    aura.stack:SetPoint("BOTTOMRIGHT");
     aura.cd = CreateFrame("Cooldown", name.."CD", aura, "CooldownFrameTemplate");
     aura.cd:SetReverse(true);
     aura.cd:SetHideCountdownNumbers(true);
@@ -48,7 +54,6 @@ local function createAura(parent, prev, anchor, name, unit)
 end
 
 function M.CreateAuraFrame(parent, unit)
-    GameTooltip = _G["GameTooltip"];
     local name = parent:GetName().."Auras";
     parent.auras = CreateFrame("Frame", name, parent);
     parent.auras:SetPoint("TOPLEFT", parent, "BOTTOMLEFT", 0, -8);
@@ -66,7 +71,7 @@ function M.CreateAuraFrame(parent, unit)
         i = i + 1;
     end
     -- max rows
-    for y=0,1 do
+    for y=0,0 do
         for x=1,10 do
             local auraName = name..i;
             parent.auras[i] = createAura(parent.auras, parent.auras[y*10+x], "BOTTOMLEFT", auraName, unit);
@@ -93,6 +98,12 @@ function M.UpdateAuras(frame, unit)
             aura.icon:SetTexture(icon);
             aura.index = i;
             aura.filter = filter;
+            if count > 1 then
+                aura.stack:SetText(count);
+                aura.stack:Show();
+            else
+                aura.stack:Hide();
+            end
             if expires > 0 then
                 aura.cd:SetCooldown(expires - duration, duration);
             else