X-Git-Url: https://www.aleksib.fi/git/wowui.git/blobdiff_plain/ac5ca8a9cb3cd9c2a6f5850ba5774bd81307fb51..d76a52e46fc339db35e6a068c0f1564db7b9cf46:/OmaUF/Events.lua

diff --git a/OmaUF/Events.lua b/OmaUF/Events.lua
index cd8bd7f..f745434 100644
--- a/OmaUF/Events.lua
+++ b/OmaUF/Events.lua
@@ -18,13 +18,16 @@ local UnitGroupRolesAssigned = UnitGroupRolesAssigned;
 local UnitLevel, UnitClassification = UnitLevel, UnitClassification;
 local RAID_CLASS_COLORS = RAID_CLASS_COLORS;
 
+local updateAuraFrames = OmaUFAuras.UpdateAuras;
+
 local Settings = OmaUFSettings;
 local baseColor = Settings.BaseColor;
+local healthColor = Settings.HealthColor;
 local overlayColorDispel = Settings.OverlayColorDispel;
 local overlayColorCharm = Settings.OverlayColorCharm;
 local overlayColorAlert = Settings.OverlayColorAlert;
 local powerColors = Settings.PowerColors;
-local width = 10;
+local width = Settings.Width;
 
 local M = {};
 OmaUFEvents = M;
@@ -144,10 +147,6 @@ local function updateName(frame, unit)
     local name = UnitName(unit);
     if not name then return end
     frame.name:SetText(ssub(name, 1, 10));
-
-    local _, class = UnitClass(unit);
-    local color = RAID_CLASS_COLORS[class];
-    if color then frame.name:SetVertexColor(color.r, color.g, color.b) end
 end
 
 local function updateHealPred(frame, unit)
@@ -201,6 +200,7 @@ local function updateHealAbsorb(frame, unit)
 end
 
 local function updateAuras(frame, unit)
+    updateAuraFrames(frame, unit);
     if UnitIsFriend("player", unit) and UnitDebuff(unit, 1, "RAID") ~= nil then
         -- something dispellable
         if frame.overlay.color ~= overlayColorDispel then
@@ -209,7 +209,7 @@ local function updateAuras(frame, unit)
             frame.overlay.color = overlayColorDispel;
         end
     -- don't overlay charmed when in vehicle
-    elseif UnitIsCharmed(unit) and unit == frame.unit then
+    elseif UnitIsCharmed(unit) and not frame.inVehicle then
         if frame.overlay.color ~= overlayColorCharm then
             frame.overlay:SetVertexColor(unpack(overlayColorCharm));
             frame.overlay:Show();
@@ -344,6 +344,24 @@ local function updateLeaderIcon(frame, unit)
     end
 end
 
+local function updateHealthColor(frame, unit)
+    if not UnitPlayerControlled(unit) and UnitIsTapDenied(unit) then
+        frame.health:SetVertexColor(0.5, 0.5, 0.5);
+    elseif UnitIsPlayer(unit) then
+        local _, class = UnitClass(unit);
+        local color = RAID_CLASS_COLORS[class];
+        if color then
+            frame.health:SetVertexColor(color.r, color.g, color.b)
+        else
+            frame.health:SetVertexColor(unpack(healthColor))
+        end
+    elseif UnitPlayerControlled(unit) then
+        frame.health:SetVertexColor(0, 1, 0);
+    else
+        frame.health:SetVertexColor(UnitSelectionColor(unit));
+    end
+end
+
 local eventFuncs = {
     ["UNIT_HEALTH"] = function(frame)
         updateHealth(frame, frame.displayed);
@@ -388,6 +406,7 @@ local eventFuncs = {
     end,
     ["UNIT_NAME_UPDATE"] = function(frame)
         updateName(frame, frame.displayed);
+        updateHealthColor(frame, frame.unit);
     end,
     ["UNIT_CONNECTION"] = function(frame)
         updateHealthText(frame, frame.displayed);
@@ -415,6 +434,7 @@ local eventFuncs = {
     end,
     ["UNIT_FACTION"] = function(frame)
         updatePVP(frame, frame.unit);
+        updateHealthColor(frame, frame.unit);
     end,
     ["PARTY_LEADER_CHANGED"] = function(frame)
         updateLeaderIcon(frame, frame.unit);
@@ -439,6 +459,7 @@ local eventFuncs = {
         updateStatus(frame, frame.unit);
         updatePVP(frame, frame.unit);
         updateLeaderIcon(frame, frame.unit);
+        updateHealthColor(frame, frame.unit);
     end,
 };
 eventFuncs["UNIT_HEALTH_FREQUENT"] = eventFuncs["UNIT_HEALTH"];
@@ -452,7 +473,3 @@ eventFuncs["PLAYER_TARGET_CHANGED"] = eventFuncs["UPDATE_ALL_BARS"];
 function M.UnitEvent(self, event, arg1)
     eventFuncs[event](self, arg1);
 end
-
-function M.LoadChar()
-    width = Settings.Character.Width;
-end