Update Libs
This commit is contained in:
parent
39cf3218a5
commit
c09e25d2db
|
@ -1,4 +1,4 @@
|
||||||
local lib = LibStub:NewLibrary("zzHelper", 3)
|
local lib = LibStub:NewLibrary("zzHelper", 4)
|
||||||
if not lib then return end
|
if not lib then return end
|
||||||
lib['targets'] = lib['targets'] or {}
|
lib['targets'] = lib['targets'] or {}
|
||||||
local mixins = {'colorize', 'round', 'sortArray', 'IsTwink', 'classcolor', 'MoneyString', 'MoneyStringSetString', 'MoneyStringSetSize'}
|
local mixins = {'colorize', 'round', 'sortArray', 'IsTwink', 'classcolor', 'MoneyString', 'MoneyStringSetString', 'MoneyStringSetSize'}
|
||||||
|
@ -34,7 +34,7 @@ function lib:MoneyStringSetSize(size)
|
||||||
iconSize = size
|
iconSize = size
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
function lib:MoneyString(money, color, abrevK, abrevM, noicon, noiconcolor, size)
|
function lib:MoneyString(money, color, abrevK, abrevM, noicon, noiconcolor, size, seperate)
|
||||||
local iconSize = size or iconSize
|
local iconSize = size or iconSize
|
||||||
local goldicon = noicon and (noiconcolor and moneyText['goldColor'] or moneyText['gold']) or format(iconbase, 'Gold', iconSize, iconSize)
|
local goldicon = noicon and (noiconcolor and moneyText['goldColor'] or moneyText['gold']) or format(iconbase, 'Gold', iconSize, iconSize)
|
||||||
local silvericon = noicon and (noiconcolor and moneyText['silverColor'] or moneyText['silver']) or format(iconbase, 'Silver', iconSize, iconSize)
|
local silvericon = noicon and (noiconcolor and moneyText['silverColor'] or moneyText['silver']) or format(iconbase, 'Silver', iconSize, iconSize)
|
||||||
|
@ -66,6 +66,9 @@ function lib:MoneyString(money, color, abrevK, abrevM, noicon, noiconcolor, size
|
||||||
end
|
end
|
||||||
if(money > 0) then
|
if(money > 0) then
|
||||||
if(g>0) then
|
if(g>0) then
|
||||||
|
if(seperate) then
|
||||||
|
g = BreakUpLargeNumbers(g)
|
||||||
|
end
|
||||||
moneystring = format("%s%s%s", color and lib:colorize(g, neg and "ff0000" or "44dd44") or g,abrev, goldicon)
|
moneystring = format("%s%s%s", color and lib:colorize(g, neg and "ff0000" or "44dd44") or g,abrev, goldicon)
|
||||||
end
|
end
|
||||||
if(s>0) then
|
if(s>0) then
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
local lib = LibStub:NewLibrary("zzLDB", 5)
|
local lib = LibStub:NewLibrary("zzLDB", 6)
|
||||||
if not lib then return end
|
if not lib then return end
|
||||||
local ldb = LibStub:GetLibrary("LibDataBroker-1.1")
|
local ldb = LibStub:GetLibrary("LibDataBroker-1.1")
|
||||||
local ldbicon = LibStub:GetLibrary("LibDBIcon-1.0")
|
local ldbicon = LibStub:GetLibrary("LibDBIcon-1.0")
|
||||||
|
@ -25,7 +25,8 @@ function lib:DefaultOnClick(_, button, addon, childName)
|
||||||
if(not InCombatLockdown()) then
|
if(not InCombatLockdown()) then
|
||||||
if(SettingsPanel) then
|
if(SettingsPanel) then
|
||||||
if(SettingsPanel:IsVisible()) then
|
if(SettingsPanel:IsVisible()) then
|
||||||
SettingsPanel:Hide()
|
HideUIPanel(SettingsPanel)
|
||||||
|
HideUIPanel(GameMenuFrame)
|
||||||
else
|
else
|
||||||
Settings.OpenToCategory(childName)
|
Settings.OpenToCategory(childName)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue