9fdbbb8 - Move role icon above health bar overlays

[wowui.git] / OmaUF / BossFrames.lua

diff --git a/OmaUF/BossFrames.lua b/OmaUF/BossFrames.lua
index a66b862..dd6b2aa 100644 (file)
--- a/OmaUF/BossFrames.lua
+++ b/OmaUF/BossFrames.lua
@@ -6,6 +6,8 @@ local GameTooltip = nil;
 local GameTooltip_SetDefaultAnchor = nil;
 
 local registerUnitEvents = OmaUFEvents.RegisterUnitEvents;
+local registerCastEvents = OmaUFCastBar.RegisterCastEvents;
+local unregisterCastEvents = OmaUFCastBar.UnregisterCastEvents;
 local unitEvent = OmaUFEvents.UnitEvent;
 
 local Settings = OmaUFSettings;
@@ -22,6 +24,7 @@ local anchorX, anchorY = Settings.Boss.AnchorX, Settings.Boss.AnchorY;
 local attributes = {};
 
 local inheritedFrames = "SecureUnitButtonTemplate,SecureHandlerStateTemplate";
+local barTexture = "Interface\\AddOns\\OmaRF\\images\\minimalist";
 
 local function frameShow(frame)
     frame:RegisterEvent("PLAYER_ENTERING_WORLD");
@@ -29,11 +32,13 @@ local function frameShow(frame)
     frame:RegisterEvent("UNIT_TARGETABLE_CHANGED");
     frame:RegisterUnitEvent("UNIT_LEVEL", frame.unit);
     registerUnitEvents(frame);
+    registerCastEvents(frame.castbar);
     unitEvent(frame, "UPDATE_ALL_BARS");
 end
 
 local function frameHide(frame)
     frame:UnregisterAllEvents();
+    unregisterCastEvents(frame.castbar);
 end
 
 local function showTooltip(secure)
@@ -69,32 +74,32 @@ local function createFrame(framename, securename, parent, unit, anchorX, anchorY
     frame.healthback = frame:CreateTexture(nil, "BACKGROUND", nil, 1);
     frame.healthback:SetPoint("TOPLEFT", frame, "TOPLEFT", 1, -1);
     frame.healthback:SetPoint("BOTTOMRIGHT", frame, "RIGHT", -1, -5);
-    frame.healthback:SetTexture("Interface\\RaidFrame\\Raid-Bar-Hp-Fill");
+    frame.healthback:SetTexture(barTexture);
     frame.healthback:SetVertexColor(unpack(bgColor));
     frame.health = frame:CreateTexture(nil, "BORDER");
     frame.health:SetPoint("TOPLEFT", frame.healthback, "TOPLEFT");
     frame.health:SetPoint("BOTTOMLEFT", frame.healthback, "BOTTOMLEFT");
-    frame.health:SetTexture("Interface\\RaidFrame\\Raid-Bar-Hp-Fill");
+    frame.health:SetTexture(barTexture);
     frame.health:SetVertexColor(unpack(healthColor));
     frame.healthText = frame:CreateFontString(nil, "ARTWORK", "GameFontHighlight");
-    frame.healthText:SetPoint("RIGHT", frame.healthback, "RIGHT", -2, 0);
+    frame.healthText:SetPoint("RIGHT", frame.healthback, "RIGHT", -2, 1);
     frame.healthText.percent = true;
     frame.manaback = frame:CreateTexture(nil, "BACKGROUND", nil, 1);
     frame.manaback:SetPoint("TOPLEFT", frame, "LEFT", 1, -5);
     frame.manaback:SetPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT", -1, 1);
-    frame.manaback:SetTexture("Interface\\RaidFrame\\Raid-Bar-Hp-Fill");
+    frame.manaback:SetTexture(barTexture);
     frame.manaback:SetVertexColor(unpack(bgColor));
     frame.mana = frame:CreateTexture(nil, "BORDER");
     frame.mana:SetPoint("TOPLEFT", frame.manaback, "TOPLEFT");
     frame.mana:SetPoint("BOTTOMLEFT", frame.manaback, "BOTTOMLEFT");
-    frame.mana:SetTexture("Interface\\RaidFrame\\Raid-Bar-Hp-Fill");
+    frame.mana:SetTexture(barTexture);
     frame.manaText = frame:CreateFontString(nil, "ARTWORK", "GameFontWhiteTiny");
     frame.manaText:SetPoint("RIGHT", frame.manaback, "RIGHT", -2, 0);
     frame.manaText:Hide();
     frame.shield = frame:CreateTexture(nil, "BORDER");
     frame.shield:SetPoint("TOPLEFT", frame.health, "TOPRIGHT");
     frame.shield:SetPoint("BOTTOMLEFT", frame.health, "BOTTOMRIGHT");
-    frame.shield:SetTexture("Interface\\RaidFrame\\Shield-Fill");
+    frame.shield:SetTexture(barTexture);
     frame.shield:SetVertexColor(unpack(shieldColor));
     frame.shield:Hide();
     frame.shieldhl = frame:CreateTexture(nil, "ARTWORK");
@@ -111,13 +116,14 @@ local function createFrame(framename, securename, parent, unit, anchorX, anchorY
     frame.name:SetPoint("LEFT", frame.healthback, "LEFT", 2, 1);
     frame.name.count = 10;
     frame.level = frame:CreateFontString(nil, "OVERLAY", "GameFontWhiteTiny");
-    frame.level:SetPoint("LEFT", frame.manaback, "LEFT", 2, 1);
+    frame.level:SetPoint("LEFT", frame.manaback, "LEFT", 2, 0);
     frame.targeticon = frame:CreateTexture(nil, "OVERLAY");
     frame.targeticon:SetPoint("CENTER", frame.healthback, "TOP");
     frame.targeticon:SetWidth(16);
     frame.targeticon:SetHeight(16);
     frame.targeticon:SetTexture("Interface\\TARGETINGFRAME\\UI-RaidTargetingIcons");
     frame.targeticon:Hide();
+    frame.castbar = OmaUFCastBar.CreateCastBar(frame, unit, -height-24);
     -- set scripts
     frame:SetScript("OnShow", frameShow);
     frame:SetScript("OnHide", frameHide);
@@ -145,13 +151,13 @@ function OmaUnitFrames.InitializeBoss(parent)
 
     createFrame("OmaBoss1", "OmaBossSecure1", parent, "boss1", anchorX, anchorY);
     for i = 2,MAX_BOSS_FRAMES do
-        createFrame("OmaBoss"..i, "OmaBossSecure"..i, _G["OmaBoss"..(i-1)], "boss"..i, 0, -height-15);
+        createFrame("OmaBoss"..i, "OmaBossSecure"..i, _G["OmaBoss"..(i-1)], "boss"..i, 0, -height-26);
     end
     -- Arena frames are in the same spot
     createFrame("OmaArena1", "OmaArenaSecure1", parent, "arena1", anchorX, anchorY);
     -- MAX_ARENA_ENEMIES from AddOns/Blizzard_ArenaUI/Blizzard_ArenaUI.lua not available
     -- as the addon is not loaded yet, update manually if it changes
     for i = 2,5 do
-        createFrame("OmaArena"..i, "OmaArenaSecure"..i, _G["OmaArena"..(i-1)], "arena"..i, 0, -height-15);
+        createFrame("OmaArena"..i, "OmaArenaSecure"..i, _G["OmaArena"..(i-1)], "arena"..i, 0, -height-26);
     end
 end