X-Git-Url: https://www.aleksib.fi/git/wowui.git/blobdiff_plain/0973648bffbf36772a40bbc76d6c7c786189a900..4a66dd6d6fe87c9e881b0c7d62ca339907619d4d:/OmaRF/RaidFrame.lua diff --git a/OmaRF/RaidFrame.lua b/OmaRF/RaidFrame.lua index 5d94ff0..ebadfef 100644 --- a/OmaRF/RaidFrame.lua +++ b/OmaRF/RaidFrame.lua @@ -34,6 +34,7 @@ local barTexture = "Interface\\AddOns\\OmaRF\\images\\minimalist"; local class = nil; local party = {}; local raid = {}; +local updaters = {}; local M = {}; OmaRaidFrame = M; @@ -41,33 +42,40 @@ OmaRaidFrame = M; local function unitUpdate(frame) -- there's no in/out of range event, have to check each frame -- from FrameXML/CompactUnitFrame.lua - local inRange, checked = UnitInRange(frame.displayed); - if checked and not inRange then - frame:SetAlpha(0.55); - else - frame:SetAlpha(1); + if frame.updating then + local inRange, checked = UnitInRange(frame.displayed); + if checked and not inRange then + frame:SetAlpha(0.55); + else + frame:SetAlpha(1); + end + CTimerAfter(0.20, updaters[frame]); end end local function frameShow(frame) registerEvents(frame); registerUnitEvents(frame); - frame:SetScript("OnUpdate", unitUpdate); + frame.updating = true; + CTimerAfter(0.20, updaters[frame]); unitEvent(frame, "UPDATE_ALL_BARS"); end local function frameHide(frame) frame:UnregisterAllEvents(); - frame:SetScript("OnUpdate", nil); + frame.updating = nil; end local function showTooltip(secure) - GameTooltip_SetDefaultAnchor(GameTooltip, secure); - GameTooltip:SetUnit(secure:GetAttribute("unit")); + -- only show raid frame tooltips out of combat + if not InCombatLockdown() then + GameTooltip_SetDefaultAnchor(GameTooltip, secure); + GameTooltip:SetUnit(secure:GetAttribute("unit")); + end end local function hideTooltip(secure) - GameTooltip:FadeOut(); + if GameTooltip:IsOwned(secure) then GameTooltip:FadeOut() end end local function setupFrame(frame, secure, unit) @@ -139,11 +147,6 @@ local function setupFrame(frame, secure, unit) frame.text:SetFont(STANDARD_TEXT_FONT, 13); frame.text:SetPoint("CENTER", frame.background, "CENTER", 0, -1); frame.text:Hide(); - frame.rez = frame:CreateTexture(nil, "OVERLAY"); - frame.rez:SetPoint("TOPLEFT", frame.background, "CENTER", -12, 12); - frame.rez:SetPoint("BOTTOMRIGHT", frame.background, "CENTER", 12, -12); - frame.rez:SetTexture("Interface\\RaidFrame\\Raid-Icon-Rez"); - frame.rez:Hide(); frame.ready = frame:CreateTexture(nil, "OVERLAY"); frame.ready:SetPoint("TOPLEFT", frame.background, "BOTTOMLEFT", 0, 14); frame.ready:SetPoint("BOTTOMRIGHT", frame.background, "BOTTOMLEFT", 14, 0); @@ -162,6 +165,8 @@ local function setupFrame(frame, secure, unit) frame:SetScript("OnEvent", unitEvent); secure:SetScript("OnEnter", showTooltip); secure:SetScript("OnLeave", hideTooltip); + -- set up periodic updates + updaters[frame] = function() return unitUpdate(frame) end -- set attributes secure:RegisterForClicks("AnyDown"); for attr, val in pairs(attributes) do