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

update numberPrefixStyle and add decimalLength

Browse Source
This commit is contained in:
Crum
2018-01-21 22:18:33 -06:00
parent 92bb08fc4a
commit dabfbfc067
12 changed files with 86 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2/3/4/5/6/7/ElvUI/Core/Math.lua
+51 -28
View File
@@ -5,39 +5,62 @@ 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, byte, len, sub, upper, split, utf8sub = string.format, string.byte, string.len, string.sub, string.upper, string.split, string.utf8sub
local find, format, byte, len, sub, gsub, upper, split, utf8sub = string.find, string.format, string.byte, string.len, string.sub, string.gsub, string.upper, string.split, string.utf8sub
--WoW API / Variables
local GetScreenWidth, GetScreenHeight = GetScreenWidth, GetScreenHeight
local CreateFrame = CreateFrame
--Return short value of a number
local shortValueDec
function E:ShortValue(v)
shortValueDec = format("%%.%df", E.db.general.decimalLength or 1)
if E.db.general.numberPrefixStyle == "METRIC" then
if abs(v) >= 1e9 then
return format("%.1fG", v / 1e9)
return format(shortValueDec.."G", v / 1e9)
elseif abs(v) >= 1e6 then
return format("%.1fM", v / 1e6)
return format(shortValueDec.."M", v / 1e6)
elseif abs(v) >= 1e3 then
return format("%.1fk", v / 1e3)
return format(shortValueDec.."k", v / 1e3)
else
return format("%d", v)
return format("%s", v)
end
elseif E.db.general.numberPrefixStyle == "CHINESE" then
if abs(v) >= 1e8 then
return format("%.1fY", v / 1e8)
elseif(abs(v) >= 1e4) then
return format("%.1fW", v / 1e4)
return format(shortValueDec.."Y", v / 1e8)
elseif abs(v) >= 1e4 then
return format(shortValueDec.."W", v / 1e4)
else
return format("%d", v)
return format("%s", v)
end
elseif E.db.general.numberPrefixStyle == "KOREAN" then
if abs(v) >= 1e8 then
return format(shortValueDec.."억", v / 1e8)
elseif abs(v) >= 1e4 then
return format(shortValueDec.."만", v / 1e4)
elseif abs(v) >= 1e3 then
return format(shortValueDec.."천", v / 1e3)
else
return format("%s", v)
end
elseif E.db.general.numberPrefixStyle == "GERMAN" then
if abs(v) >= 1e9 then
return format(shortValueDec.."Mrd", v / 1e9)
elseif abs(v) >= 1e6 then
return format(shortValueDec.."Mio", v / 1e6)
elseif abs(v) >= 1e3 then
return format(shortValueDec.."Tsd", v / 1e3)
else
return format("%s", v)
end
else
if abs(v) >= 1e9 then
return format("%.1fB", v / 1e9)
return format(shortValueDec.."B", v / 1e9)
elseif abs(v) >= 1e6 then
return format("%.1fM", v / 1e6)
return format(shortValueDec.."M", v / 1e6)
elseif abs(v) >= 1e3 then
return format("%.1fK", v / 1e3)
return format(shortValueDec.."K", v / 1e3)
else
return format("%d", v)
return format("%s", v)
end
end
end
@@ -168,6 +191,8 @@ function E:GetXYOffset(position, override)
end
local styles = {
-- keep percents in this table with `PERCENT` in the key, and `%.1f%%` in the value somewhere.
-- we use these two things to follow our setting for decimal length. they need to be EXACT.
["CURRENT"] = "%s",
["CURRENT_MAX"] = "%s - %s",
["CURRENT_PERCENT"] = "%s - %.1f%%",
@@ -183,28 +208,26 @@ function E:GetFormattedText(style, min, max)
if max == 0 then max = 1 end
local useStyle = styles[style]
gftDec = E.db.general.decimalLength or 1
if gftDec ~= 1 and find(style, "PERCENT") then
gftUseStyle = gsub(styles[style], "%%%.1f%%%%", "%%."..gftDec.."f%%%%")
else
gftUseStyle = styles[style]
end
if style == "DEFICIT" then
local deficit = max - min
if deficit <= 0 then
return ""
else
return format(useStyle, E:ShortValue(deficit))
end
gftDeficit = max - min
return ((gftDeficit > 0) and format(gftUseStyle, E:ShortValue(gftDeficit))) or ""
elseif style == "PERCENT" then
local s = format(useStyle, min / max * 100)
return s
return format(gftUseStyle, min / max * 100)
elseif style == "CURRENT" or ((style == "CURRENT_MAX" or style == "CURRENT_MAX_PERCENT" or style == "CURRENT_PERCENT") and min == max) then
return format(styles["CURRENT"], E:ShortValue(min))
return format(styles["CURRENT"], E:ShortValue(min))
elseif style == "CURRENT_MAX" then
return format(useStyle, E:ShortValue(min), E:ShortValue(max))
return format(gftUseStyle, E:ShortValue(min), E:ShortValue(max))
elseif style == "CURRENT_PERCENT" then
local s = format(useStyle, E:ShortValue(min), min / max * 100)
return s
return format(gftUseStyle, E:ShortValue(min), min / max * 100)
elseif style == "CURRENT_MAX_PERCENT" then
local s = format(useStyle, E:ShortValue(min), E:ShortValue(max), min / max * 100)
return s
return format(gftUseStyle, E:ShortValue(min), E:ShortValue(max), min / max * 100)
end
end
2/3/4/5/6/7/ElvUI/Settings/Profile.lua
+2
View File
@@ -18,6 +18,8 @@ P["general"] = {
["afk"] = true,
["enhancedPvpMessages"] = true,
["numberPrefixStyle"] = "ENGLISH",
["decimalLength"] = 1,
["fontSize"] = 12,
["font"] = "PT Sans Narrow",