Bluewhale/ElvUIModernized
1
0
Fork 0
mirror of https://github.com/Bluewhale1337/ElvUIModernized.git synced 2026-07-27 08:24:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

3

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
2/3/4/5/6/7/ElvUI/Core/Math.lua
+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
2/3/4/5/6/7/ElvUI/Core/core.lua
+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/3/4/5/6/7/ElvUI/Core/toolkit.lua
+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
2/3/4/5/6/7/ElvUI/Init.lua
+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)
2/3/4/5/6/7/ElvUI/Modules/Skins/Blizzard/Merchant.lua
+23 -25
View File
@@ -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
@@ -26,11 +26,11 @@ local function LoadSkin()
S:HandleCloseButton(MerchantFrameCloseButton, MerchantFrame.backdrop)
for i = 1, 12 do
local item = _G["MerchantItem" .. i]
local itemButton = _G["MerchantItem" .. i .. "ItemButton"]
local iconTexture = _G["MerchantItem" .. i .. "ItemButtonIconTexture"]
local altCurrencyTex1 = _G["MerchantItem" .. i .. "AltCurrencyFrameItem1Texture"]
local altCurrencyTex2 = _G["MerchantItem" .. i .. "AltCurrencyFrameItem2Texture"]
local item = _G["MerchantItem"..i]
local itemButton = _G["MerchantItem"..i.."ItemButton"]
local iconTexture = _G["MerchantItem"..i.."ItemButtonIconTexture"]
local altCurrencyTex1 = _G["MerchantItem"..i.."AltCurrencyFrameItem1Texture"]
local altCurrencyTex2 = _G["MerchantItem"..i.."AltCurrencyFrameItem2Texture"]
E:StripTextures(item, true)
E:CreateBackdrop(item, "Default")
@@ -43,8 +43,8 @@ local function LoadSkin()
iconTexture:SetTexCoord(unpack(E.TexCoords))
E:SetInside(iconTexture)
_G["MerchantItem" .. i .. "MoneyFrame"]:ClearAllPoints()
_G["MerchantItem" .. i .. "MoneyFrame"]:SetPoint("BOTTOMLEFT", itemButton, "BOTTOMRIGHT", 3, 0)
_G["MerchantItem"..i.."MoneyFrame"]:ClearAllPoints()
_G["MerchantItem"..i.."MoneyFrame"]:SetPoint("BOTTOMLEFT", itemButton, "BOTTOMRIGHT", 3, 0)
end
S:HandleNextPrevButton(MerchantNextPageButton)
@@ -77,30 +77,30 @@ local function LoadSkin()
E:SetInside(MerchantBuyBackItemItemButtonIconTexture)
for i = 1, 2 do
S:HandleTab(_G["MerchantFrameTab" .. i])
S:HandleTab(_G["MerchantFrameTab"..i])
end
hooksecurefunc("MerchantFrame_UpdateMerchantInfo", function()
local numMerchantItems = GetMerchantNumItems()
for i = 1, MERCHANT_ITEMS_PER_PAGE do
local index = (((MerchantFrame.page - 1) * MERCHANT_ITEMS_PER_PAGE) + i)
local itemButton = _G["MerchantItem" .. i .. "ItemButton"]
local itemName = _G["MerchantItem" .. i .. "Name"]
local itemButton = _G["MerchantItem"..i.."ItemButton"]
local itemName = _G["MerchantItem"..i.."Name"]
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))
@@ -129,24 +127,24 @@ local function LoadSkin()
hooksecurefunc("MerchantFrame_UpdateBuybackInfo", function()
local numBuybackItems = GetNumBuybackItems()
for i = 1, BUYBACK_ITEMS_PER_PAGE do
local itemButton = _G["MerchantItem" .. i .. "ItemButton"]
local itemName = _G["MerchantItem" .. i .. "Name"]
local itemButton = _G["MerchantItem"..i.."ItemButton"]
local itemName = _G["MerchantItem"..i.."Name"]
if i <= numBuybackItems then
local buybackName = GetBuybackItemInfo(i)
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
2/3/4/5/6/7/ElvUI/Modules/UnitFrames/UnitFrames.lua
+1 -1
View File
@@ -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)