From a07d3d8e993bbef5c2befda9e8213c818edafad7 Mon Sep 17 00:00:00 2001 From: Crum Date: Fri, 21 Dec 2018 21:17:40 -0600 Subject: [PATCH] update --- ElvUI/Core/core.lua | 67 +++++++++++++++++++++------ ElvUI/Modules/ActionBars/Microbar.lua | 3 +- 2 files changed, 56 insertions(+), 14 deletions(-) diff --git a/ElvUI/Core/core.lua b/ElvUI/Core/core.lua index a00ac7d..3aa4999 100644 --- a/ElvUI/Core/core.lua +++ b/ElvUI/Core/core.lua @@ -892,24 +892,44 @@ function E:UpdateAll(ignoreInstall) Layout:TopPanelVisibility() Layout:SetDataPanelStyle() - ActionBars:UpdateButtonSettings() - ActionBars:UpdateMicroPositionDimensions() + if E.private.actionbar.enable then + ActionBars:UpdateButtonSettings() + ActionBars:UpdateMicroPositionDimensions() + end + AFK:Toggle() - Bags:Layout() - Bags:Layout(true) - Bags:SizeAndPositionBagBar() - Bags:UpdateCountDisplay() - Bags:UpdateItemLevelDisplay() - Chat:PositionChat(true) - Chat:SetupChat() - Chat:UpdateAnchors() + + if E.private.bags.enable then + Bags:Layout() + Bags:Layout(true) + Bags:SizeAndPositionBagBar() + Bags:UpdateCountDisplay() + Bags:UpdateItemLevelDisplay() + end + + if E.private.chat.enable then + Chat:PositionChat(true) + Chat:SetupChat() + Chat:UpdateAnchors() + end + DataBars:EnableDisable_ExperienceBar() DataBars:EnableDisable_ReputationBar() DataBars:UpdateDataBarDimensions() + DataTexts:LoadDataTexts() - Minimap:UpdateSettings() - NamePlates:ConfigureAll() - UnitFrames:Update_AllFrames() + + if E.private.general.minimap.enable then + Minimap:UpdateSettings() + end + + if E.private.nameplates.enable then + NamePlates:ConfigureAll() + end + + if E.private.unitframe.enable then + UnitFrames:Update_AllFrames() + end if E.RefreshGUI then E:RefreshGUI() @@ -1040,6 +1060,27 @@ end --DATABASE CONVERSIONS function E:DBConversions() + --Make sure default filters use the correct filter type + for filter, filterType in pairs(E.DEFAULT_FILTER) do + E.global.unitframe.aurafilters[filter].type = filterType + end + + --Combat & Resting Icon options update + if E.db.unitframe.units.player.combatIcon ~= nil then + E.db.unitframe.units.player.CombatIcon.enable = E.db.unitframe.units.player.combatIcon + E.db.unitframe.units.player.combatIcon = nil + end + if E.db.unitframe.units.player.restIcon ~= nil then + E.db.unitframe.units.player.RestIcon.enable = E.db.unitframe.units.player.restIcon + E.db.unitframe.units.player.restIcon = nil + end + + if not E.db.chat.panelColorConverted then + local color = E.db.general.backdropfadecolor + E.db.chat.panelColor = {r = color.r, g = color.g, b = color.b, a = color.a} + E.db.chat.panelColorConverted = true + end + --Vendor Greys option is now in bags table if E.db.general.vendorGrays then E.db.bags.vendorGrays.enable = E.db.general.vendorGrays diff --git a/ElvUI/Modules/ActionBars/Microbar.lua b/ElvUI/Modules/ActionBars/Microbar.lua index 68952b5..e2e67ef 100644 --- a/ElvUI/Modules/ActionBars/Microbar.lua +++ b/ElvUI/Modules/ActionBars/Microbar.lua @@ -51,6 +51,7 @@ function AB:HandleMicroButton(button) HookScript(button, "OnEnter", onEnter) HookScript(button, "OnLeave", onLeave) button:SetHitRectInsets(0, 0, 0, 0) + button:SetAlpha(self.db.microbar.alpha) button:Show() pushed:SetTexCoord(0.17, 0.87, 0.5, 0.908) @@ -130,5 +131,5 @@ function AB:SetupMicroBar() E:Kill(MainMenuBarPerformanceBarFrame) - E:CreateMover(ElvUI_MicroBar, 'MicrobarMover', L["Micro Bar"], nil, nil, nil, "ALL,ACTIONBARS", nil, "actionbar,microbar") + E:CreateMover(ElvUI_MicroBar, "MicrobarMover", L["Micro Bar"], nil, nil, nil, "ALL,ACTIONBARS", nil, "actionbar,microbar") end \ No newline at end of file