X-Git-Url: https://www.aleksib.fi/git/wowui.git/blobdiff_plain/d89467e02ca50fb6e77a6b39cf940c6de28a7bcc..d51d314274936814dec7d124c9ec5e5165666918:/OmaUF/UnitFrames.lua diff --git a/OmaUF/UnitFrames.lua b/OmaUF/UnitFrames.lua index d5ec0b7..76c2c7e 100644 --- a/OmaUF/UnitFrames.lua +++ b/OmaUF/UnitFrames.lua @@ -10,6 +10,7 @@ local GameTooltip_SetDefaultAnchor = nil; local registerEvents = OmaUFEvents.RegisterEvents; local unitEvent = OmaUFEvents.UnitEvent; +local createAuraFrame = OmaUFAuras.CreateAuraFrame; local Settings = OmaUFSettings; local indSize = Settings.IndSize; @@ -204,10 +205,10 @@ local function initializePlayer(parent) local secure = CreateFrame("Button", "OmaPlayerSecure", parent, inheritedFrames); local frame = CreateFrame("Frame", "OmaPlayer", parent); local unit = "player"; - secure:SetPoint("CENTER", parent, "CENTER", -320, -100); + secure:SetPoint("CENTER", parent, "CENTER", -300, -175); secure:SetWidth(width+2); secure:SetHeight(height+2); - frame:SetPoint("CENTER", parent, "CENTER", -320, -100); + frame:SetPoint("CENTER", parent, "CENTER", -300, -175); frame:SetWidth(width+2); frame:SetHeight(height+2); setupFrame(frame, secure, unit); @@ -221,14 +222,14 @@ local function initializeTarget(parent) local secure = CreateFrame("Button", "OmaTargetSecure", parent, inheritedFrames); local frame = CreateFrame("Frame", "OmaTarget", parent); local unit = "target"; - secure:SetPoint("CENTER", parent, "CENTER", 320, -100); + secure:SetPoint("CENTER", parent, "CENTER", 300, -175); secure:SetWidth(width+2); secure:SetHeight(height+2); - frame:SetPoint("CENTER", parent, "CENTER", 320, -100); + frame:SetPoint("CENTER", parent, "CENTER", 300, -175); frame:SetWidth(width+2); frame:SetHeight(height+2); setupFrame(frame, secure, unit); - -- TODO target frame buffs/debuffs + createAuraFrame(frame, unit); RegisterUnitWatch(frame); RegisterUnitWatch(secure); RegisterStateDriver(secure, "vehicleui", "[vehicleui] vehicle; no"); @@ -238,6 +239,7 @@ end local function initialize() initializePlayer(UIParent); initializeTarget(UIParent); + -- TODO boss frames, pet frame, (arena frames) end local function loadCharSettings() @@ -246,10 +248,44 @@ local function loadCharSettings() attributes = Settings.Character.Clickheal; end +local hidden = false; +local function hideBlizzardFrames() + if hidden then return end + hidden = true; + + for _, frame in pairs({PlayerFrame, TargetFrame, TargetFrameToT}) do + frame:UnregisterAllEvents(); + frame.healthbar:UnregisterAllEvents(); + frame.manabar:UnregisterAllEvents(); + if frame.spellbar then frame.spellbar:UnregisterAllEvents() end + if frame.powerBarAlt then frame.powerBarAlt:UnregisterAllEvents() end + frame:Hide(); + end + + -- TODO create frames for class powers, currently using Simple Holy Power + for _, frame in pairs({PlayerFrameAlternateManaBar, ComboFrame, + PriestBarFrame, RuneFrame, WarlockPowerFrame, MonkHarmonyBarFrame, + PaladinPowerBarFrame, MageArcaneChargesFrame}) do + frame:UnregisterAllEvents(); + frame:Hide(); + end + + -- from ShadowedUF, re-register vehicle events for default auras + PlayerFrame:RegisterEvent("PLAYER_ENTERING_WORLD"); + PlayerFrame:RegisterEvent("UNIT_ENTERING_VEHICLE"); + PlayerFrame:RegisterEvent("UNIT_ENTERED_VEHICLE"); + PlayerFrame:RegisterEvent("UNIT_EXITING_VEHICLE"); + PlayerFrame:RegisterEvent("UNIT_EXITED_VEHICLE"); + PlayerFrame:SetMovable(true); + PlayerFrame:SetUserPlaced(true); + PlayerFrame:SetDontSavePosition(true); +end + UnitFrames:RegisterEvent("ADDON_LOADED"); UnitFrames:RegisterEvent("PLAYER_LOGIN"); UnitFrames:SetScript("OnEvent", function(self, event) if event == "PLAYER_LOGIN" then + hideBlizzardFrames(); initialize(); elseif event == "ADDON_LOADED" then OmaUFLoadChar();