Commit ca7c38f1 authored by Simpy's avatar Simpy 🐹
Browse files

Merge branch 'beta' into ptr

parents 35983813 70de5d70
......@@ -4,7 +4,8 @@ local Misc = E:GetModule('Misc')
local Layout = E:GetModule('Layout')
local Totems = E:GetModule('Totems')
local Blizzard = E:GetModule('Blizzard')
local Threat = E:GetModule('Threat')
local NP = E:GetModule('NamePlates')
local UF = E:GetModule('UnitFrames')
local AFK = E:GetModule('AFK')
local ACH = E.Libs.ACH
......@@ -384,17 +385,9 @@ E.Options.args.general = {
desc = L["The texture that will be used mainly for statusbars."],
values = AceGUIWidgetLSMlists.statusbar,
set = function(info, value)
local previousValue = E.private.general[info[#info]]
E.private.general[info[#info]] = value;
if(E.db.unitframe.statusbar == previousValue) then
E.db.unitframe.statusbar = value
E:StaggeredUpdateAll(nil, true)
else
E:UpdateMedia()
E:UpdateStatusBars()
end
E:UpdateMedia()
E:UpdateStatusBars()
end
},
glossTex = {
......@@ -416,10 +409,10 @@ E.Options.args.general = {
desc = L["Replaces the StatusBar texture setting on Unitframes and Nameplates with the primary texture."],
func = function()
E.db.unitframe.statusbar = E.private.general.normTex
E:UpdateUnitFrames()
UF:Update_StatusBars()
E.db.nameplates.statusbar = E.private.general.normTex
E:UpdateNamePlates()
NP:ConfigureAll()
end,
},
},
......
......@@ -3474,7 +3474,10 @@ E.Options.args.unitframe = {
order = 2,
name = L["Smooth Bars"],
desc = L["Bars will transition smoothly."],
set = function(info, value) E.db.unitframe[info[#info]] = value; UF:Update_AllFrames(); end,
set = function(info, value)
E.db.unitframe[info[#info]] = value
UF:Update_AllFrames()
end,
},
statusbar = {
type = 'select', dialogControl = 'LSM30_Statusbar',
......@@ -3482,7 +3485,10 @@ E.Options.args.unitframe = {
name = L["StatusBar Texture"],
desc = L["Main statusbar texture."],
values = _G.AceGUIWidgetLSMlists.statusbar,
set = function(info, value) E.db.unitframe[info[#info]] = value; UF:Update_StatusBars() end,
set = function(info, value)
E.db.unitframe[info[#info]] = value
UF:Update_StatusBars()
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