f2bb494 - Change to coloring health bar instead of name in UF

[wowui.git] / OmaUF / UnitFrames.lua

diff --git a/OmaUF/UnitFrames.lua b/OmaUF/UnitFrames.lua
index 76c2c7e..c0fe00c 100644 (file)
--- a/OmaUF/UnitFrames.lua
+++ b/OmaUF/UnitFrames.lua
@@ -176,9 +176,6 @@ local function setupFrame(frame, secure, unit)
     frame:SetScript("OnShow", frameShow);
     frame:SetScript("OnHide", frameHide);
     frame:SetScript("OnEvent", unitEvent);
     frame:SetScript("OnShow", frameShow);
     frame:SetScript("OnHide", frameHide);
     frame:SetScript("OnEvent", unitEvent);

-    -- let other addons hook these to anchor tooltip elsewhere
-    GameTooltip = _G["GameTooltip"];
-    GameTooltip_SetDefaultAnchor = _G["GameTooltip_SetDefaultAnchor"];

     secure:SetScript("OnEnter", showTooltip);
     secure:SetScript("OnLeave", hideTooltip);
     -- set attributes
     secure:SetScript("OnEnter", showTooltip);
     secure:SetScript("OnLeave", hideTooltip);
     -- set attributes


@@ -236,18 +233,22 @@ local function initializeTarget(parent)
     secure:SetAttribute("_onstate-vehicleui", vehicletoggle);
 end
 
     secure:SetAttribute("_onstate-vehicleui", vehicletoggle);
 end
 

-local function initialize()
-    initializePlayer(UIParent);
-    initializeTarget(UIParent);
-    -- TODO boss frames, pet frame, (arena frames)
-end
-

 local function loadCharSettings()
     width, height = Settings.Character.Width, Settings.Character.Height;
     anchorX, anchorY = Settings.Character.AnchorX, Settings.Character.AnchorY;
     attributes = Settings.Character.Clickheal;
 end
 
 local function loadCharSettings()
     width, height = Settings.Character.Width, Settings.Character.Height;
     anchorX, anchorY = Settings.Character.AnchorX, Settings.Character.AnchorY;
     attributes = Settings.Character.Clickheal;
 end
 

+local function initialize()
+    loadCharSettings();
+    -- let other addons hook these to anchor tooltip elsewhere
+    GameTooltip = _G["GameTooltip"];
+    GameTooltip_SetDefaultAnchor = _G["GameTooltip_SetDefaultAnchor"];
+    initializePlayer(UIParent);
+    initializeTarget(UIParent);
+    -- TODO boss frames, pet frame, (arena frames)
+end
+

 local hidden = false;
 local function hideBlizzardFrames()
     if hidden then return end
 local hidden = false;
 local function hideBlizzardFrames()
     if hidden then return end


@@ -281,15 +282,12 @@ local function hideBlizzardFrames()
     PlayerFrame:SetDontSavePosition(true);
 end
 
     PlayerFrame:SetDontSavePosition(true);
 end
 

-UnitFrames:RegisterEvent("ADDON_LOADED");

 UnitFrames:RegisterEvent("PLAYER_LOGIN");
 UnitFrames:SetScript("OnEvent", function(self, event)
     if event == "PLAYER_LOGIN" then
 UnitFrames:RegisterEvent("PLAYER_LOGIN");
 UnitFrames:SetScript("OnEvent", function(self, event)
     if event == "PLAYER_LOGIN" then

-        hideBlizzardFrames();
-        initialize();
-    elseif event == "ADDON_LOADED" then

         OmaUFLoadChar();
         OmaUFLoadChar();

-        loadCharSettings();

         OmaUFEvents.LoadChar();
         OmaUFEvents.LoadChar();

+        hideBlizzardFrames();
+        initialize();

     end
 end);
     end
 end);