From e1df715ae24d1dd98ef21b00f9d1ca78a949b998 Mon Sep 17 00:00:00 2001 From: Crum Date: Sun, 6 Jan 2019 23:53:32 -0600 Subject: [PATCH] update --- ElvUI/Libraries/LibItemSearch-1.2/LibItemSearch-1.2.lua | 4 ++-- ElvUI/Modules/ActionBars/ActionBars.lua | 5 +++-- ElvUI/Modules/Skins/Skins.lua | 1 + ElvUI_Config/ActionBars.lua | 2 -- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ElvUI/Libraries/LibItemSearch-1.2/LibItemSearch-1.2.lua b/ElvUI/Libraries/LibItemSearch-1.2/LibItemSearch-1.2.lua index 6d647df..804721b 100644 --- a/ElvUI/Libraries/LibItemSearch-1.2/LibItemSearch-1.2.lua +++ b/ElvUI/Libraries/LibItemSearch-1.2/LibItemSearch-1.2.lua @@ -147,7 +147,7 @@ Lib.Filters.tip = { match = function(self, link, _, search) if find(link, "item:") then scanner:SetOwner(UIParent, "ANCHOR_NONE"); - scanner:SetHyperlink(link) + scanner:SetHyperlink(match(link, "item[%-?%d:]+")) for i = 1, scanner:NumLines() do if(Search:Find(search, _G[scanner:GetName() .. "TextLeft" .. i]:GetText())) then @@ -187,7 +187,7 @@ Lib.Filters.tipPhrases = { end scanner:SetOwner(UIParent, "ANCHOR_NONE"); - scanner:SetHyperlink(link); + scanner:SetHyperlink(match(link, "item[%-?%d:]+")); local matches = false for i = 1, scanner:NumLines() do diff --git a/ElvUI/Modules/ActionBars/ActionBars.lua b/ElvUI/Modules/ActionBars/ActionBars.lua index fcfa94c..fe04e1a 100644 --- a/ElvUI/Modules/ActionBars/ActionBars.lua +++ b/ElvUI/Modules/ActionBars/ActionBars.lua @@ -265,6 +265,8 @@ end function AB:UpdateButtonSettings() if E.private.actionbar.enable ~= true then return end + LOCK_ACTIONBAR = (self.db.lockActionBars == true and "1" or "0") + for button, _ in pairs(self["handledButtons"]) do if button then self:StyleButton(button, button.noBackdrop) @@ -277,6 +279,7 @@ function AB:UpdateButtonSettings() self:PositionAndSizeBar("bar"..i) end + self:AdjustMaxStanceButtons() self:PositionAndSizeBarPet() self:PositionAndSizeBarShapeShift() end @@ -529,8 +532,6 @@ function AB:Initialize() self:SecureHook("PetActionBar_Update", "UpdatePet") - LOCK_ACTIONBAR = (self.db.lockActionBars == true and "1" or "0") - function _G.ActionButton_OnUpdate(elapsed) if not this.updateTooltip then return end diff --git a/ElvUI/Modules/Skins/Skins.lua b/ElvUI/Modules/Skins/Skins.lua index fd0aa55..cc2e668 100644 --- a/ElvUI/Modules/Skins/Skins.lua +++ b/ElvUI/Modules/Skins/Skins.lua @@ -12,6 +12,7 @@ local CreateFrame = CreateFrame local SetDesaturation = SetDesaturation local hooksecurefunc = hooksecurefunc local IsAddOnLoaded = IsAddOnLoaded +local GetCVar = GetCVar E.Skins = S S.addonsToLoad = {} diff --git a/ElvUI_Config/ActionBars.lua b/ElvUI_Config/ActionBars.lua index cfea814..8b3ca55 100644 --- a/ElvUI_Config/ActionBars.lua +++ b/ElvUI_Config/ActionBars.lua @@ -79,8 +79,6 @@ local function BuildABConfig() set = function(info, value) E.db.actionbar[ info[getn(info)] ] = value AB:UpdateButtonSettings() - LOCK_ACTIONBAR = (value == true and 1 or 0) - E:StaticPopup_Show("CONFIG_RL") end }, movementModifier = {