d9dbaac - Fix overlay back and hide power bar properly

diff --git a/OmaRF/Events.lua b/OmaRF/Events.lua
index c28ef44..26565ab 100644 (file)
--- a/OmaRF/Events.lua
+++ b/OmaRF/Events.lua
@@ -38,8 +38,6 @@ function M.RegisterEvents(frame)
     frame:RegisterEvent("PLAYER_ROLES_ASSIGNED");
     frame:RegisterEvent("READY_CHECK");
     frame:RegisterEvent("READY_CHECK_FINISHED");
     frame:RegisterEvent("PLAYER_ROLES_ASSIGNED");
     frame:RegisterEvent("READY_CHECK");
     frame:RegisterEvent("READY_CHECK_FINISHED");

-    frame:RegisterEvent("PARTY_MEMBER_ENABLE");
-    frame:RegisterEvent("PARTY_MEMBER_DISABLE");

     frame:RegisterEvent("GROUP_ROSTER_UPDATE");
     if frame.unit == "focus" then frame:RegisterEvent("PLAYER_FOCUS_CHANGED") end
 end
     frame:RegisterEvent("GROUP_ROSTER_UPDATE");
     if frame.unit == "focus" then frame:RegisterEvent("PLAYER_FOCUS_CHANGED") end
 end


@@ -48,6 +46,8 @@ local function unregisterPower(frame)
     frame.health:SetPoint("BOTTOMLEFT", frame.background, "BOTTOMLEFT");
     frame.overlay:SetPoint("BOTTOMRIGHT", frame.background, "BOTTOMRIGHT");
     frame.mana:Hide();
     frame.health:SetPoint("BOTTOMLEFT", frame.background, "BOTTOMLEFT");
     frame.overlay:SetPoint("BOTTOMRIGHT", frame.background, "BOTTOMRIGHT");
     frame.mana:Hide();

+    frame:UnregisterEvent("PARTY_MEMBER_ENABLE");
+    frame:UnregisterEvent("PARTY_MEMBER_DISABLE");

     frame:UnregisterEvent("UNIT_POWER");
     frame:UnregisterEvent("UNIT_MAXPOWER");
     frame:UnregisterEvent("UNIT_DISPLAYPOWER");
     frame:UnregisterEvent("UNIT_POWER");
     frame:UnregisterEvent("UNIT_MAXPOWER");
     frame:UnregisterEvent("UNIT_DISPLAYPOWER");


@@ -59,6 +59,8 @@ local function registerPower(frame)
     frame.health:SetPoint("BOTTOMLEFT", frame.background, "BOTTOMLEFT", 0, 2);
     frame.overlay:SetPoint("BOTTOMRIGHT", frame.background, "BOTTOMRIGHT", 0, 2);
     frame.mana:Show();
     frame.health:SetPoint("BOTTOMLEFT", frame.background, "BOTTOMLEFT", 0, 2);
     frame.overlay:SetPoint("BOTTOMRIGHT", frame.background, "BOTTOMRIGHT", 0, 2);
     frame.mana:Show();

+    frame:RegisterEvent("PARTY_MEMBER_ENABLE");
+    frame:RegisterEvent("PARTY_MEMBER_DISABLE");

     frame:RegisterUnitEvent("UNIT_POWER", frame.unit);
     frame:RegisterUnitEvent("UNIT_MAXPOWER", frame.unit);
     frame:RegisterUnitEvent("UNIT_DISPLAYPOWER", frame.unit);
     frame:RegisterUnitEvent("UNIT_POWER", frame.unit);
     frame:RegisterUnitEvent("UNIT_MAXPOWER", frame.unit);
     frame:RegisterUnitEvent("UNIT_DISPLAYPOWER", frame.unit);


@@ -397,15 +399,17 @@ local eventFuncs = {
         updateRole(frame, frame.unit);
         updateVehicle(frame);
         updateMaxHealth(frame, frame.displayed);
         updateRole(frame, frame.unit);
         updateVehicle(frame);
         updateMaxHealth(frame, frame.displayed);

-        updateMaxPower(frame, frame.displayed);

         updateHealth(frame, frame.displayed);
         updateText(frame, frame.displayed);
         updateHealth(frame, frame.displayed);
         updateText(frame, frame.displayed);

-        updatePower(frame, frame.displayed);
+        if frame.role.healer then
+            updateMaxPower(frame, frame.displayed);
+            updatePower(frame, frame.displayed);
+            updatePowerColor(frame, frame.displayed);
+        end

         updateAuras(frame, frame.displayed);
         updateShield(frame, frame.displayed);
         updateHealPred(frame, frame.displayed);
         updateHealAbsorb(frame, frame.displayed);
         updateAuras(frame, frame.displayed);
         updateShield(frame, frame.displayed);
         updateHealPred(frame, frame.displayed);
         updateHealAbsorb(frame, frame.displayed);

-        updatePowerColor(frame, frame.displayed);

         updateAggro(frame, frame.displayed);
         updateName(frame, frame.displayed);
         updateIncomingRes(frame, frame.unit);
         updateAggro(frame, frame.displayed);
         updateName(frame, frame.displayed);
         updateIncomingRes(frame, frame.unit);

diff --git a/OmaRF/RaidFrame.lua b/OmaRF/RaidFrame.lua
index 03d7ef5..f5db419 100644 (file)
--- a/OmaRF/RaidFrame.lua
+++ b/OmaRF/RaidFrame.lua
@@ -128,7 +128,7 @@ local function setupFrame(frame, secure, unit)
     frame.overlay = frame:CreateTexture(nil, "ARTWORK", nil, 1);
     frame.overlay:SetPoint("TOPLEFT", frame.background, "TOPLEFT");
     frame.overlay:SetPoint("BOTTOMRIGHT", frame.background, "BOTTOMRIGHT");
     frame.overlay = frame:CreateTexture(nil, "ARTWORK", nil, 1);
     frame.overlay:SetPoint("TOPLEFT", frame.background, "TOPLEFT");
     frame.overlay:SetPoint("BOTTOMRIGHT", frame.background, "BOTTOMRIGHT");

-    frame.overlay:SetTexture("Interface\\RaidFrame\\Raid-Bar-Hp-Fill");
+    frame.overlay:SetColorTexture(1, 1, 1);

     frame.overlay:Hide();
     frame.name = frame:CreateFontString(nil, "OVERLAY", "GameFontHighlight");
     frame.name:SetPoint("CENTER", frame.background, "CENTER", 0, 11);
     frame.overlay:Hide();
     frame.name = frame:CreateFontString(nil, "OVERLAY", "GameFontHighlight");
     frame.name:SetPoint("CENTER", frame.background, "CENTER", 0, 11);