This commit is contained in:
Bunny67
2017-12-16 21:01:46 +03:00
parent 273a5e6832
commit 33f78eb057
6 changed files with 32 additions and 37 deletions
+1 -1
View File
@@ -5,7 +5,7 @@ local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, Profi
local select, unpack, assert, tonumber, type, pairs = select, unpack, assert, tonumber, type, pairs
local getn, tinsert, tremove = table.getn, tinsert, tremove
local abs, ceil, floor, modf, mod = math.abs, math.ceil, math.floor, math.modf, math.mod
local format, sub, upper, split, utf8sub = string.format, string.sub, string.upper, string.split, string.utf8sub
local format, byte, len, sub, upper, split, utf8sub = string.format, string.byte, string.len, string.sub, string.upper, string.split, string.utf8sub
--WoW API / Variables
local GetScreenWidth, GetScreenHeight = GetScreenWidth, GetScreenHeight
local CreateFrame = CreateFrame
+4 -4
View File
@@ -1039,9 +1039,9 @@ function E:InitializeInitialModules()
end
function E:RefreshModulesDB()
-- local UF = self:GetModule("UnitFrames");
-- twipe(UF.db);
-- UF.db = self.db.unitframe;
local UF = self:GetModule("UnitFrames");
twipe(UF.db);
UF.db = self.db.unitframe;
end
function E:InitializeModules()
@@ -1199,7 +1199,7 @@ function E:Initialize()
self:Tutorials();
self:GetModule("Minimap"):UpdateSettings()
-- self:RefreshModulesDB()
self:RefreshModulesDB()
-- collectgarbage("collect");
if(self.db.general.loginmessage) then
+2 -2
View File
@@ -28,14 +28,14 @@ local function GetTemplate(t, isUnitFrameElement)
end
elseif t == "Transparent" then
if isUnitFrameElement then
borderr, borderg, borderb = unpack(E["media"].unitframeBorderColor)
borderr, borderg, borderb = unpack(E["media"].bordercolor)
else
borderr, borderg, borderb = unpack(E["media"].bordercolor)
end
backdropr, backdropg, backdropb, backdropa = unpack(E["media"].backdropfadecolor)
else
if isUnitFrameElement then
borderr, borderg, borderb = unpack(E["media"].unitframeBorderColor)
borderr, borderg, borderb = unpack(E["media"].bordercolor)
else
borderr, borderg, borderb = unpack(E["media"].bordercolor)
end
+1 -4
View File
@@ -1,12 +1,9 @@
--Cache global variables
_G = getfenv(0)
local pairs, unpack = pairs, unpack
BINDING_HEADER_ELVUI = GetAddOnMetadata("ElvUI", "Title")
ElvUI = {}
local AddOnName, Engine = "ElvUI", ElvUI
local AddOnName, Engine = "ElvUI", {}
local AddOn = LibStub("AceAddon-3.0"):NewAddon(AddOnName, "AceConsole-3.0", "AceEvent-3.0", "AceTimer-3.0", "AceHook-3.0")
AddOn.callbacks = AddOn.callbacks or
LibStub("CallbackHandler-1.0"):New(AddOn)
@@ -6,7 +6,7 @@ local S = E:GetModule("Skins");
local _G = _G
local select = select
local unpack = unpack
local find, split = string.find, string.split
local match, split = string.match, string.split
--WoW API / Variables
local GetBuybackItemInfo = GetBuybackItemInfo
local GetItemInfo = GetItemInfo
@@ -90,17 +90,17 @@ local function LoadSkin()
if index <= numMerchantItems then
local itemLink = GetMerchantItemLink(index)
if itemLink then
local itemString = select(3, find(itemLink, "|H(.+)|h"))
local itemID = select(2, split(":", itemString))
local quality = select(3, GetItemInfo(itemID))
local _, _, quality = GetItemInfo(match(itemLink, "item:(%d+)"))
if quality then
itemName:SetTextColor(GetItemQualityColor(quality))
if quality > 1 then
if quality then
itemButton:SetBackdropBorderColor(GetItemQualityColor(quality))
else
itemButton:SetBackdropBorderColor(unpack(E["media"].bordercolor))
end
end
else
itemButton:SetBackdropBorderColor(unpack(E["media"].bordercolor))
end
end
@@ -108,12 +108,10 @@ local function LoadSkin()
if buybackName then
local itemLink = GetItemLinkByName(buybackName)
if itemLink then
local itemString = select(3, find(itemLink, "|H(.+)|h"))
local itemID = select(2, split(":", itemString))
local quality = select(3, GetItemInfo(itemID))
local _, _, quality = GetItemInfo(match(itemLink, "item:(%d+)"))
if quality then
MerchantBuyBackItemName:SetTextColor(GetItemQualityColor(quality))
if quality > 1 then
if quality then
MerchantBuyBackItemItemButton:SetBackdropBorderColor(GetItemQualityColor(quality))
else
MerchantBuyBackItemItemButton:SetBackdropBorderColor(unpack(E["media"].bordercolor))
@@ -137,16 +135,16 @@ local function LoadSkin()
if buybackName then
local itemLink = GetItemLinkByName(buybackName)
if itemLink then
local itemString = select(3, find(itemLink, "|H(.+)|h"))
local itemID = select(2, split(":", itemString))
local quality = select(3, GetItemInfo(itemID))
local _, _, quality = GetItemInfo(match(itemLink, "item:(%d+)"))
if quality then
itemName:SetTextColor(GetItemQualityColor(quality))
if quality > 1 then
if quality then
itemButton:SetBackdropBorderColor(GetItemQualityColor(quality))
else
itemButton:SetBackdropBorderColor(unpack(E["media"].bordercolor))
end
else
itemButton:SetBackdropBorderColor(unpack(E["media"].bordercolor))
end
end
end
@@ -967,7 +967,7 @@ function ElvUF:DisableBlizzard(unit)
HandleFrame("PartyMemberFrame"..id)
else
for i = 1, 4 do
HandleFrame(("PartyMemberFrame%d"):format(i))
HandleFrame(format("PartyMemberFrame%d", i))
end
end
HandleFrame(PartyMemberBackground)