X-Git-Url: https://www.aleksib.fi/git/wowui.git/blobdiff_plain/3e6730c2c495d9016dde6cbb76c2bd6f86b05cbe..2b9e2c15c1f769b8f554e7c86a1ccb01dc9fedf5:/OmaUF/PlayerFrame.lua diff --git a/OmaUF/PlayerFrame.lua b/OmaUF/PlayerFrame.lua index 1ce80da..be92842 100644 --- a/OmaUF/PlayerFrame.lua +++ b/OmaUF/PlayerFrame.lua @@ -6,6 +6,8 @@ local GameTooltip = nil; local GameTooltip_SetDefaultAnchor = nil; local registerUnitEvents = OmaUFEvents.RegisterUnitEvents; +local registerCastEvents = OmaUFCastBar.RegisterCastEvents; +local unregisterCastEvents = OmaUFCastBar.UnregisterCastEvents; local unitEvent = OmaUFEvents.UnitEvent; local Settings = OmaUFSettings; @@ -22,6 +24,7 @@ local anchorX, anchorY = Settings.Player.AnchorX, Settings.Player.AnchorY; local attributes = {}; local inheritedFrames = "SecureUnitButtonTemplate,SecureHandlerStateTemplate"; +local barTexture = "Interface\\AddOns\\OmaRF\\images\\minimalist"; local function frameShow(frame) frame:RegisterEvent("UNIT_ENTERED_VEHICLE"); @@ -34,11 +37,13 @@ local function frameShow(frame) frame:RegisterEvent("PLAYER_UPDATE_RESTING"); frame:RegisterEvent("PARTY_LEADER_CHANGED"); registerUnitEvents(frame); + registerCastEvents(frame.castbar); unitEvent(frame, "UPDATE_ALL_BARS"); end local function frameHide(frame) frame:UnregisterAllEvents(); + unregisterCastEvents(frame.castbar); end local function showTooltip(secure) @@ -90,31 +95,31 @@ function OmaUnitFrames.InitializePlayer(parent) frame.healthback = frame:CreateTexture(nil, "BACKGROUND", nil, 1); frame.healthback:SetPoint("TOPLEFT", frame, "TOPLEFT", 1, -1); frame.healthback:SetPoint("BOTTOMRIGHT", frame, "RIGHT", -1, -5); - frame.healthback:SetTexture("Interface\\RaidFrame\\Raid-Bar-Hp-Fill"); + frame.healthback:SetTexture(barTexture); frame.healthback:SetVertexColor(unpack(bgColor)); frame.health = frame:CreateTexture(nil, "BORDER"); frame.health:SetPoint("TOPLEFT", frame.healthback, "TOPLEFT"); frame.health:SetPoint("BOTTOMLEFT", frame.healthback, "BOTTOMLEFT"); - frame.health:SetTexture("Interface\\RaidFrame\\Raid-Bar-Hp-Fill"); + frame.health:SetTexture(barTexture); frame.health:SetVertexColor(unpack(healthColor)); frame.healthText = frame:CreateFontString(nil, "ARTWORK", "GameFontHighlightLarge"); - frame.healthText:SetPoint("RIGHT", frame.healthback, "RIGHT", -2, 0); + frame.healthText:SetPoint("RIGHT", frame.healthback, "RIGHT", -2, 1); frame.manaback = frame:CreateTexture(nil, "BACKGROUND", nil, 1); frame.manaback:SetPoint("TOPLEFT", frame, "LEFT", 1, -5); frame.manaback:SetPoint("BOTTOMRIGHT", frame, "BOTTOMRIGHT", -1, 1); - frame.manaback:SetTexture("Interface\\RaidFrame\\Raid-Bar-Hp-Fill"); + frame.manaback:SetTexture(barTexture); frame.manaback:SetVertexColor(unpack(bgColor)); frame.mana = frame:CreateTexture(nil, "BORDER"); frame.mana:SetPoint("TOPLEFT", frame.manaback, "TOPLEFT"); frame.mana:SetPoint("BOTTOMLEFT", frame.manaback, "BOTTOMLEFT"); - frame.mana:SetTexture("Interface\\RaidFrame\\Raid-Bar-Hp-Fill"); + frame.mana:SetTexture(barTexture); frame.manaText = frame:CreateFontString(nil, "ARTWORK", "GameFontHighlight"); - frame.manaText:SetPoint("RIGHT", frame.manaback, "RIGHT", -2, 0); + frame.manaText:SetPoint("RIGHT", frame.manaback, "RIGHT", -2, 1); frame.manaText:Hide(); frame.shield = frame:CreateTexture(nil, "BORDER"); frame.shield:SetPoint("TOPLEFT", frame.health, "TOPRIGHT"); frame.shield:SetPoint("BOTTOMLEFT", frame.health, "BOTTOMRIGHT"); - frame.shield:SetTexture("Interface\\RaidFrame\\Shield-Fill"); + frame.shield:SetTexture(barTexture); frame.shield:SetVertexColor(unpack(shieldColor)); frame.shield:Hide(); frame.shieldhl = frame:CreateTexture(nil, "ARTWORK"); @@ -154,6 +159,7 @@ function OmaUnitFrames.InitializePlayer(parent) frame.targeticon:SetHeight(18); frame.targeticon:SetTexture("Interface\\TARGETINGFRAME\\UI-RaidTargetingIcons"); frame.targeticon:Hide(); + frame.castbar = OmaUFCastBar.CreateCastBar(frame, unit, 8); -- set scripts frame:SetScript("OnShow", frameShow); frame:SetScript("OnHide", frameHide);