Commit 8679cef3 authored by Benik's avatar Benik

Merge remote-tracking branch 'origin/development' into PTR

parents 8011ee7f b1f6adb7
3.62
*Fix the portrait health issue #73. Also the `Overlayed Portraits Alpha` BenikUI option won't apply if ElvUI 'Full Overlay' Portrait option is enabled.
*Added Valentina K. in the donor list. Thank you
3.61
*Fixed an error with portrait style color
*Better portrait styling
......
## Interface: 80100
## Author: Benik
## Version: 3.61
## Version: 3.62
## Title: |cff1784d1ElvUI|r |cff00c0faBenikUI|r
## Notes: an ElvUI 11+ decorative/enhancement edit
## RequiredDeps: ElvUI
......
......@@ -33,7 +33,8 @@ local DONATORS = {
'Frisko',
'Robert D.',
'Shannon B.',
'Joseph L.'
'Joseph L.',
'Valentina K.',
}
tsort(DONATORS, function(a, b) return a < b end)
local DONATOR_STRING = tconcat(DONATORS, ", ")
......
......@@ -9,24 +9,42 @@ function UFB:Configure_Portrait(frame, isPlayer)
if frame.USE_PORTRAIT then
if frame.USE_PORTRAIT_OVERLAY then
if db.portrait.style == '3D' then
portrait:SetFrameLevel(frame.Health:GetFrameLevel())
else
if db.portrait.style == '2D' then
portrait:SetParent(frame.Health)
else
portrait:SetFrameLevel(frame.Health:GetFrameLevel())
end
portrait:SetAllPoints(frame.Health)
portrait:SetAlpha(0.3)
portrait:SetAlpha(0.35)
if not dontHide then
portrait:Show()
end
portrait.backdrop:Hide()
portrait:ClearAllPoints()
if db.portrait.fullOverlay then
portrait:SetAllPoints(frame.Health)
else
local healthTex = frame.Health:GetStatusBarTexture()
if db.health.reverseFill then
portrait:Point("TOPLEFT", healthTex, "TOPLEFT")
portrait:Point("BOTTOMLEFT", healthTex, "BOTTOMLEFT")
portrait:Point("BOTTOMRIGHT", frame.Health, "BOTTOMRIGHT")
else
portrait:Point("TOPLEFT", frame.Health, "TOPLEFT")
portrait:Point("BOTTOMRIGHT", healthTex, "BOTTOMRIGHT")
portrait:Point("BOTTOMLEFT", healthTex, "BOTTOMLEFT")
end
end
else
portrait:SetAlpha(1)
portrait.backdrop:ClearAllPoints()
portrait.backdrop:Show()
if db.portrait.style == '3D' then
portrait:SetFrameLevel(frame.Health:GetFrameLevel() -4) --Make sure portrait is behind Health and Power
else
if db.portrait.style == '2D' then
portrait:SetParent(frame)
else
portrait:SetFrameLevel(frame.Health:GetFrameLevel())
end
if frame.PORTRAIT_TRANSPARENCY then
......@@ -98,10 +116,10 @@ function UFB:Configure_Portrait(frame, isPlayer)
else
portrait:SetAlpha(1)
portrait.backdrop:Show()
if db.portrait.style == '3D' then
portrait.backdrop:SetFrameStrata(frame:GetFrameStrata())
portrait:SetFrameStrata(portrait.backdrop:GetFrameStrata())
portrait:SetFrameLevel(frame.Health:GetFrameLevel() -4) --Make sure portrait is behind Health and Power
if db.portrait.style == '2D' then
portrait:SetParent(frame)
else
portrait:SetFrameLevel(frame.Health:GetFrameLevel())
end
if frame.ORIENTATION == "LEFT" then
......@@ -131,12 +149,17 @@ end
-- Portrait Alpha setting. Idea: Vxt, Credit: Blazeflack
local function OnConfigure_Portrait(self, frame)
--local frame = self:GetParent()
local db = frame.db
if not db then return end
if BUI.SLE then return end
if frame.USE_PORTRAIT then
local portrait = frame.Portrait
if frame.USE_PORTRAIT_OVERLAY then
if frame.USE_PORTRAIT_OVERLAY and not db.portrait.fullOverlay then
portrait:SetAlpha(E.db.benikui.unitframes.misc.portraitTransparency)
else
portrait:SetAlpha(1)
portrait:SetAlpha(0.35)
end
end
end
......@@ -146,10 +169,11 @@ local function OnPortraitUpdate(self)
local db = frame.db
if not db then return end
if frame.USE_PORTRAIT_OVERLAY and not BUI.SLE then
if BUI.SLE then return end
if frame.USE_PORTRAIT_OVERLAY and not db.portrait.fullOverlay then
self:SetAlpha(E.db.benikui.unitframes.misc.portraitTransparency)
else
self:SetAlpha(1)
self:SetAlpha(0.35)
end
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment