diff --git a/ElvUI_SLE/defaults/profile.lua b/ElvUI_SLE/defaults/profile.lua index 489f018..4417aff 100644 --- a/ElvUI_SLE/defaults/profile.lua +++ b/ElvUI_SLE/defaults/profile.lua @@ -13,6 +13,7 @@ P['sle'] = { ['yoffset'] = 0, ['pethide'] = true, ['template'] = "Default", + ['alpha'] = 1, }, ['left'] = { ['enabled'] = false, @@ -24,6 +25,7 @@ P['sle'] = { ['yoffset'] = 0, ['pethide'] = true, ['template'] = "Default", + ['alpha'] = 1, }, ['right'] = { ['enabled'] = false, @@ -35,6 +37,7 @@ P['sle'] = { ['yoffset'] = 0, ['pethide'] = true, ['template'] = "Default", + ['alpha'] = 1, }, ['action'] = { ['enabled'] = false, @@ -46,6 +49,7 @@ P['sle'] = { ['yoffset'] = 0, ['pethide'] = true, ['template'] = "Default", + ['alpha'] = 1, }, }, @@ -106,53 +110,64 @@ P['sle'] = { ['enabled'] = false, ['width'] = E.screenwidth/5, ['pethide'] = true, + ['alpha'] = 1, }, ['dp2'] = { ['enabled'] = false, ['width'] = E.screenwidth/5, ['pethide'] = true, + ['alpha'] = 1, }, ['top'] = { ['enabled'] = true, ['width'] = E.screenwidth/5 - 4, ['pethide'] = true, + ['alpha'] = 1, }, ['dp3'] = { ['enabled'] = false, ['width'] = E.screenwidth/5, ['pethide'] = true, + ['alpha'] = 1, }, ['dp4'] = { ['enabled'] = false, ['width'] = E.screenwidth/5, ['pethide'] = true, + ['alpha'] = 1, }, ['dp5'] = { ['enabled'] = false, ['width'] = E.screenwidth/4 - 60, ['pethide'] = true, + ['alpha'] = 1, }, ['bottom'] = { ['enabled'] = false, ['width'] = E.screenwidth/10 - 4, ['pethide'] = true, + ['alpha'] = 1, }, ['dp6'] = { ['enabled'] = false, ['width'] = E.screenwidth/4 - 60, ['pethide'] = true, + ['alpha'] = 1, }, ['chatleft'] = { ['enabled'] = true, ['width'] = 396, + ['alpha'] = 1, }, ['chatright'] = { ['enabled'] = true, ['width'] = 396, + ['alpha'] = 1, }, ['dashboard'] = { ['enable'] = false, ['width'] = 100, + ['alpha'] = 1, }, ['chathandle'] = false, }, @@ -319,8 +334,15 @@ P['sle'] = { --PvP Auto release ['pvpautorelease'] = true, + --Tooltip + ['tooltip'] = { + ['enable'] = false, + ['showFaction'] = false, + ['xOffset'] = 0, + ['yOffset'] = 0, + }, --Tooltip Faction Icon - ["tooltipicon"] = false, + --["tooltipicon"] = false, --UI Buttons ['uibuttons'] = { diff --git a/ElvUI_SLE/modules/backgrounds.lua b/ElvUI_SLE/modules/backgrounds.lua index 74edbc0..938cc62 100644 --- a/ElvUI_SLE/modules/backgrounds.lua +++ b/ElvUI_SLE/modules/backgrounds.lua @@ -24,15 +24,15 @@ local function CreateFrames() v[1]:Hide() end + --Make EnableMouse and option b/c of drunk russian BGb:EnableMouse(true) --Maybe add an option to actually allow change this click catching? + BGa:EnableMouse(true) BGb.tex:SetAlpha(0.5) + --Also the problem. As long as bottom bg can be transparent it's no good in keeping fixed transparency for the texture. --Maybe add an option to change this from using Elv's trnsparency to additional user-set one? BGl.tex:SetAlpha(E.db.general.backdropfadecolor.a - 0.7 > 0 and E.db.general.backdropfadecolor.a - 0.7 or 0.5) - BGr.tex:SetAlpha(E.db.general.backdropfadecolor.a - 0.7 > 0 and E.db.general.backdropfadecolor.a - 0.7 or 0.5) - - BGa:EnableMouse(true) BGa.tex:SetAlpha(E.db.general.backdropfadecolor.a - 0.7 > 0 and E.db.general.backdropfadecolor.a - 0.7 or 0.5) end @@ -83,6 +83,7 @@ function BG:UpdateFrames() local db = E.db.sle.backgrounds for _,v in pairs(Fr) do v[1]:SetTemplate(db[v[2]].template, true) + v[1]:SetAlpha(db[v[2]].alpha) end FramesSize() BG:FramesVisibility() diff --git a/ElvUI_SLE/modules/datatexts.lua b/ElvUI_SLE/modules/datatexts.lua index 3592c63..f0517ce 100644 --- a/ElvUI_SLE/modules/datatexts.lua +++ b/ElvUI_SLE/modules/datatexts.lua @@ -13,6 +13,9 @@ local bottom = CreateFrame('Frame', "Bottom_Panel", E.UIParent) local rchat = CreateFrame('Frame', "Right_Chat_SLE", E.UIParent) local lchat = CreateFrame('Frame', "Left_Chat_SLE", E.UIParent) +-- Move Elv's Datatext Panel Transparency Option to our section +-- Make Drunk Russian handle elvs dt panel transparency + local panels = { --Panel = short, name, point, x, panel, slot DP_1 = {"dp1", "DP_1", "TOPLEFT", 0, DP_1, 3}, @@ -55,7 +58,11 @@ end function DTP:ChatResize() LeftChatDataPanel:Point('TOPRIGHT', LeftChatPanel, 'BOTTOMLEFT', 16 + E.db.sle.datatext.chatleft.width, (E.PixelMode and 1 or -1)) + LeftChatDataPanel:SetAlpha(E.db.sle.datatext.chatleft.alpha) + LeftChatToggleButton:SetAlpha(E.db.sle.datatext.chatleft.alpha) RightChatDataPanel:Point('BOTTOMLEFT', RightChatPanel, 'BOTTOMRIGHT', - E.db.sle.datatext.chatright.width - 16, (E.PixelMode and -19 or -21)) + RightChatDataPanel:SetAlpha(E.db.sle.datatext.chatright.alpha) + RightChatToggleButton:SetAlpha(E.db.sle.datatext.chatright.alpha) end --Showing panels @@ -68,6 +75,7 @@ function DTP:ExtraDataBarSetup() v[5]:Hide() end if not E.private.sle.datatext[v[1].."hide"] then + v[5]:SetAlpha(E.db.sle.datatext[v[1]].alpha) if db[v[1]].transparent then v[5]:SetTemplate("Transparent") else @@ -97,6 +105,7 @@ end function DTP:PLAYER_ENTERING_WORLD(...) DTP:ExtraDataBarSetup() DTP:RegisterHide() + DTP:ChatResize() self:UnregisterEvent("PLAYER_ENTERING_WORLD"); end diff --git a/ElvUI_SLE/modules/unitframes.lua b/ElvUI_SLE/modules/unitframes.lua index 0643b46..7a59554 100644 --- a/ElvUI_SLE/modules/unitframes.lua +++ b/ElvUI_SLE/modules/unitframes.lua @@ -60,6 +60,13 @@ local function AddTags() end end + ElvUF.Tags.Events['resolve:current-percent:sl'] = 'UNIT_AURA' + ElvUF.Tags.Methods['resolve:current-percent:sl'] = function(unit) + local SPELL_RESOLVE_NAME = GetSpellInfo(158300) + --/run print(GetSpellInfo(158300)) + --/run print(UnitAura('player', 'Resolve', nil, 'HELPFUL')) + end + ElvUF.Tags.Methods['range:sl'] = function(unit) local name, server = UnitName(unit) local rangeText = '' diff --git a/ElvUI_SLE/options/backgrounds_c.lua b/ElvUI_SLE/options/backgrounds_c.lua index 175ac7f..e1c6aae 100644 --- a/ElvUI_SLE/options/backgrounds_c.lua +++ b/ElvUI_SLE/options/backgrounds_c.lua @@ -153,6 +153,15 @@ local function configTable() desc = L["Show/Hide this frame during Pet Battles."], set = function(info, value) E.db.sle.backgrounds[v[1]].pethide = value; BG:RegisterHide() end }, + alpha = { + order = 12, + type = 'range', + name = L['Alpha'], + isPercent = true, + min = 0, max = 1, step = 0.01, + get = function(info) return E.db.sle.backgrounds[v[1]].alpha end, + set = function(info, value) E.db.sle.backgrounds[v[1]].alpha = value; BG:UpdateFrames() end, + }, }, } end diff --git a/ElvUI_SLE/options/datatexts_c.lua b/ElvUI_SLE/options/datatexts_c.lua index 04907f1..a1e8124 100644 --- a/ElvUI_SLE/options/datatexts_c.lua +++ b/ElvUI_SLE/options/datatexts_c.lua @@ -132,6 +132,15 @@ local function configTable() desc = L['Show/Hide this frame during Pet Battles.'], set = function(info, value) E.db.sle.datatext[v[1]].pethide = value; DTP:RegisterHide() end, }, + alpha = { + order = 12, + type = 'range', + name = L['Alpha'], + isPercent = true, + min = 0, max = 1, step = 0.01, + --get = function(info) return E.db.sle.backgrounds[v[1]].alpha end, + set = function(info, value) E.db.sle.datatext[v[1]].alpha = value; DTP:Update() end, + }, }, } end @@ -169,6 +178,15 @@ local function configTable() get = function(info) return E.db.sle.datatext[v[1]].width end, set = function(info, value) E.db.sle.datatext[v[1]].width = value; DTP:ChatResize() end, }, + alpha = { + order = 12, + type = 'range', + name = L['Alpha'], + isPercent = true, + min = 0, max = 1, step = 0.01, + get = function(info) return E.db.sle.datatext[v[1]].alpha end, + set = function(info, value) E.db.sle.datatext[v[1]].alpha = value; DTP:ChatResize() end, + }, }, }