X-Git-Url: https://www.aleksib.fi/git/wowui.git/blobdiff_plain/3e6730c2c495d9016dde6cbb76c2bd6f86b05cbe..baad4944825cc98bdf648578975715afc9c3ab7d:/OmaUF/Auras.lua

diff --git a/OmaUF/Auras.lua b/OmaUF/Auras.lua
index 90da28d..0341a4d 100644
--- 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"};
 
@@ -32,15 +32,17 @@ 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);
     aura.cd:SetAllPoints();
-    aura.unit = unit; -- TODO add aura.stack text
+    aura.unit = unit;
     aura:SetScript("OnEnter", showTooltip);
     aura:SetScript("OnLeave", hideTooltip);
     aura:Hide();
@@ -48,7 +50,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 +67,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 +94,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