Commit 966a7016 authored by Simpy's avatar Simpy 🐹

12.00

parents 3b6bfede 3ea99068
...@@ -30,7 +30,6 @@ local UnitIsMercenary = UnitIsMercenary ...@@ -30,7 +30,6 @@ local UnitIsMercenary = UnitIsMercenary
local UnitStat = UnitStat local UnitStat = UnitStat
local C_PetBattles_IsInBattle = C_PetBattles.IsInBattle local C_PetBattles_IsInBattle = C_PetBattles.IsInBattle
local C_PvP_IsRatedBattleground = C_PvP.IsRatedBattleground local C_PvP_IsRatedBattleground = C_PvP.IsRatedBattleground
local C_UIWidgetManager_GetStatusBarWidgetVisualizationInfo = C_UIWidgetManager.GetStatusBarWidgetVisualizationInfo
local FACTION_HORDE = FACTION_HORDE local FACTION_HORDE = FACTION_HORDE
local FACTION_ALLIANCE = FACTION_ALLIANCE local FACTION_ALLIANCE = FACTION_ALLIANCE
local ERR_NOT_IN_COMBAT = ERR_NOT_IN_COMBAT local ERR_NOT_IN_COMBAT = ERR_NOT_IN_COMBAT
...@@ -48,7 +47,7 @@ function E:ClassColor(class, usePriestColor) ...@@ -48,7 +47,7 @@ function E:ClassColor(class, usePriestColor)
color.colorStr = 'ff'..color.colorStr color.colorStr = 'ff'..color.colorStr
end end
if (usePriestColor and class == 'PRIEST') and tonumber(color.colorStr, 16) > tonumber(E.PriestColors.colorStr, 16) then if usePriestColor and class == 'PRIEST' and tonumber(color.colorStr, 16) > tonumber(E.PriestColors.colorStr, 16) then
return E.PriestColors return E.PriestColors
else else
return color return color
...@@ -206,36 +205,6 @@ do ...@@ -206,36 +205,6 @@ do
end end
end end
do
function E:GetWidgetInfoID(guid)
return E.global.nameplate.widgetMap[guid]
end
function E:SetWidgetInfoID(guid, widgetID)
if widgetID then
E.global.nameplate.widgetMap[guid] = widgetID
end
end
E.MaxWidgetInfoRank = 30
function E:GetWidgetInfoBase(widgetID)
local widget = widgetID and C_UIWidgetManager_GetStatusBarWidgetVisualizationInfo(widgetID)
if not widget then return end
local cur = widget.barValue - widget.barMin
local toNext = widget.barMax - widget.barMin
local total = widget.barValue
local rank, maxRank
if widget.overrideBarText then
rank = tonumber(strmatch(widget.overrideBarText, '%d+'))
maxRank = rank == E.MaxWidgetInfoRank
end
return cur, toNext, total, rank, maxRank
end
end
do do
local Masque = E.Libs.Masque local Masque = E.Libs.Masque
local MasqueGroupState = {} local MasqueGroupState = {}
...@@ -320,7 +289,7 @@ do ...@@ -320,7 +289,7 @@ do
if module == 'all' then if module == 'all' then
for moduName, modu in pairs(self.modules) do for moduName, modu in pairs(self.modules) do
for funcName, func in pairs(modu) do for funcName, func in pairs(modu) do
if (funcName ~= 'GetModule') and (type(func) == 'function') then if funcName ~= 'GetModule' and type(func) == 'function' then
CPU_USAGE[moduName..':'..funcName] = GetFunctionCPUUsage(func, true) CPU_USAGE[moduName..':'..funcName] = GetFunctionCPUUsage(func, true)
end end
end end
......
...@@ -21,14 +21,14 @@ end ...@@ -21,14 +21,14 @@ end
--TEST --TEST
--[[local t = UIParent:CreateFontString(nil, 'OVERLAY', 'GameTooltipText') --[[local t = UIParent:CreateFontString(nil, 'OVERLAY', 'GameTooltipText')
t:SetText(0) t:SetText(0)
t:SetPoint('CENTER') t:Point('CENTER')
t:FontTemplate(nil, 20) t:FontTemplate(nil, 20)
E:SetUpAnimGroup(t, 'Number', 10, 5) E:SetUpAnimGroup(t, 'Number', 10, 5)
local b = CreateFrame('BUTTON', nil, UIParent) local b = CreateFrame('BUTTON', nil, UIParent)
b:SetPoint('CENTER', 0, -100) b:Point('CENTER', 0, -100)
b:SetTemplate() b:SetTemplate()
b:SetSize(40,30) b:Size(40,30)
b:EnableMouse(true) b:EnableMouse(true)
b:SetScript('OnClick', function() b:SetScript('OnClick', function()
if t:GetText() == 10 then if t:GetText() == 10 then
......
...@@ -124,19 +124,19 @@ do ...@@ -124,19 +124,19 @@ do
end end
local function OnUpdate(self, elapsed) local function OnUpdate(self, elapsed)
if(self.elapsed and self.elapsed > 0.1) then if self.elapsed and self.elapsed > 0.1 then
self.tex:SetTexCoord((self.curFrame - 1) * 0.1, 0, (self.curFrame - 1) * 0.1, 1, self.curFrame * 0.1, 0, self.curFrame * 0.1, 1) self.tex:SetTexCoord((self.curFrame - 1) * 0.1, 0, (self.curFrame - 1) * 0.1, 1, self.curFrame * 0.1, 0, self.curFrame * 0.1, 1)
if(self.countUp) then if self.countUp then
self.curFrame = self.curFrame + 1 self.curFrame = self.curFrame + 1
else else
self.curFrame = self.curFrame - 1 self.curFrame = self.curFrame - 1
end end
if(self.curFrame > 10) then if self.curFrame > 10 then
self.countUp = false self.countUp = false
self.curFrame = 9 self.curFrame = 9
elseif(self.curFrame < 1) then elseif self.curFrame < 1 then
self.countUp = true self.countUp = true
self.curFrame = 2 self.curFrame = 2
end end
...@@ -154,7 +154,7 @@ do ...@@ -154,7 +154,7 @@ do
--Store old settings --Store old settings
local t = self.db.tempSettings local t = self.db.tempSettings
local c = self.db.general.backdropcolor local c = self.db.general.backdropcolor
if(self:HelloKittyFixCheck()) then if self:HelloKittyFixCheck() then
E:HelloKittyFix() E:HelloKittyFix()
else else
self.oldEnableAllSound = GetCVar('Sound_EnableAllSound') self.oldEnableAllSound = GetCVar('Sound_EnableAllSound')
...@@ -216,13 +216,13 @@ do ...@@ -216,13 +216,13 @@ do
function E:RestoreHelloKitty() function E:RestoreHelloKitty()
--Store old settings --Store old settings
self.db.general.kittys = false self.db.general.kittys = false
if(_G.HelloKittyLeft) then if _G.HelloKittyLeft then
_G.HelloKittyLeft:Hide() _G.HelloKittyLeft:Hide()
_G.HelloKittyRight:Hide() _G.HelloKittyRight:Hide()
end end
if not(self.db.tempSettings) then return end if not(self.db.tempSettings) then return end
if(self:HelloKittyFixCheck()) then if self:HelloKittyFixCheck() then
self:HelloKittyFix() self:HelloKittyFix()
self.db.tempSettings = nil self.db.tempSettings = nil
return return
...@@ -260,17 +260,17 @@ do ...@@ -260,17 +260,17 @@ do
end end
function E:CreateKittys() function E:CreateKittys()
if(_G.HelloKittyLeft) then if _G.HelloKittyLeft then
_G.HelloKittyLeft:Show() _G.HelloKittyLeft:Show()
_G.HelloKittyRight:Show() _G.HelloKittyRight:Show()
return return
end end
local helloKittyLeft = CreateFrame('Frame', 'HelloKittyLeft', _G.UIParent) local helloKittyLeft = CreateFrame('Frame', 'HelloKittyLeft', _G.UIParent)
helloKittyLeft:SetSize(120, 128) helloKittyLeft:Size(120, 128)
helloKittyLeft:SetMovable(true) helloKittyLeft:SetMovable(true)
helloKittyLeft:EnableMouse(true) helloKittyLeft:EnableMouse(true)
helloKittyLeft:RegisterForDrag('LeftButton') helloKittyLeft:RegisterForDrag('LeftButton')
helloKittyLeft:SetPoint('BOTTOMLEFT', _G.LeftChatPanel, 'BOTTOMRIGHT', 2, -4) helloKittyLeft:Point('BOTTOMLEFT', _G.LeftChatPanel, 'BOTTOMRIGHT', 2, -4)
helloKittyLeft.tex = helloKittyLeft:CreateTexture(nil, 'OVERLAY') helloKittyLeft.tex = helloKittyLeft:CreateTexture(nil, 'OVERLAY')
helloKittyLeft.tex:SetAllPoints() helloKittyLeft.tex:SetAllPoints()
helloKittyLeft.tex:SetTexture(E.Media.Textures.HelloKitty) helloKittyLeft.tex:SetTexture(E.Media.Textures.HelloKitty)
...@@ -283,11 +283,11 @@ do ...@@ -283,11 +283,11 @@ do
helloKittyLeft:SetScript('OnUpdate', OnUpdate) helloKittyLeft:SetScript('OnUpdate', OnUpdate)
local helloKittyRight = CreateFrame('Frame', 'HelloKittyRight', _G.UIParent) local helloKittyRight = CreateFrame('Frame', 'HelloKittyRight', _G.UIParent)
helloKittyRight:SetSize(120, 128) helloKittyRight:Size(120, 128)
helloKittyRight:SetMovable(true) helloKittyRight:SetMovable(true)
helloKittyRight:EnableMouse(true) helloKittyRight:EnableMouse(true)
helloKittyRight:RegisterForDrag('LeftButton') helloKittyRight:RegisterForDrag('LeftButton')
helloKittyRight:SetPoint('BOTTOMRIGHT', _G.RightChatPanel, 'BOTTOMLEFT', -2, -4) helloKittyRight:Point('BOTTOMRIGHT', _G.RightChatPanel, 'BOTTOMLEFT', -2, -4)
helloKittyRight.tex = helloKittyRight:CreateTexture(nil, 'OVERLAY') helloKittyRight.tex = helloKittyRight:CreateTexture(nil, 'OVERLAY')
helloKittyRight.tex:SetAllPoints() helloKittyRight.tex:SetAllPoints()
helloKittyRight.tex:SetTexture(E.Media.Textures.HelloKitty) helloKittyRight.tex:SetTexture(E.Media.Textures.HelloKitty)
...@@ -303,8 +303,8 @@ do ...@@ -303,8 +303,8 @@ do
--When it bugged out for a user the command '/hellokittyfix' attempted to restore the changed settings to default --When it bugged out for a user the command '/hellokittyfix' attempted to restore the changed settings to default
function E:HelloKittyFixCheck(secondCheck) function E:HelloKittyFixCheck(secondCheck)
local t = self.db.tempSettings local t = self.db.tempSettings
if(not t and not secondCheck) then t = self.db.general end if not t and not secondCheck then t = self.db.general end
if(t and t.backdropcolor)then if t and t.backdropcolor then
return self:Round(t.backdropcolor.r, 2) == 0.87 and self:Round(t.backdropcolor.g, 2) == 0.3 and self:Round(t.backdropcolor.b, 2) == 0.74 return self:Round(t.backdropcolor.r, 2) == 0.87 and self:Round(t.backdropcolor.g, 2) == 0.3 and self:Round(t.backdropcolor.b, 2) == 0.74
end end
end end
...@@ -336,7 +336,7 @@ do ...@@ -336,7 +336,7 @@ do
self.db.unitframe.colors.auraBarBuff = {r = c.r, g = c.g, b = c.b} self.db.unitframe.colors.auraBarBuff = {r = c.r, g = c.g, b = c.b}
self.db.unitframe.colors.transparentAurabars = false self.db.unitframe.colors.transparentAurabars = false
if(_G.HelloKittyLeft) then if _G.HelloKittyLeft then
_G.HelloKittyLeft:Hide() _G.HelloKittyLeft:Hide()
_G.HelloKittyRight:Hide() _G.HelloKittyRight:Hide()
self.db.general.kittys = nil self.db.general.kittys = nil
...@@ -348,7 +348,7 @@ do ...@@ -348,7 +348,7 @@ do
end end
function E:HelloKittyToggle() function E:HelloKittyToggle()
if(_G.HelloKittyLeft and _G.HelloKittyLeft:IsShown()) then if _G.HelloKittyLeft and _G.HelloKittyLeft:IsShown() then
self:RestoreHelloKitty() self:RestoreHelloKitty()
else else
self:StaticPopup_Show('HELLO_KITTY') self:StaticPopup_Show('HELLO_KITTY')
......
...@@ -19,9 +19,9 @@ local GetNumGuildMembers = GetNumGuildMembers ...@@ -19,9 +19,9 @@ local GetNumGuildMembers = GetNumGuildMembers
local GuildControlGetNumRanks = GuildControlGetNumRanks local GuildControlGetNumRanks = GuildControlGetNumRanks
local GuildControlGetRankName = GuildControlGetRankName local GuildControlGetRankName = GuildControlGetRankName
local GuildUninvite = GuildUninvite local GuildUninvite = GuildUninvite
local ReloadUI = ReloadUI
local ResetCPUUsage = ResetCPUUsage local ResetCPUUsage = ResetCPUUsage
local SendChatMessage = SendChatMessage local SendChatMessage = SendChatMessage
local ReloadUI = ReloadUI
local SetCVar = SetCVar local SetCVar = SetCVar
local UpdateAddOnCPUUsage = UpdateAddOnCPUUsage local UpdateAddOnCPUUsage = UpdateAddOnCPUUsage
-- GLOBALS: ElvUIGrid, ElvDB -- GLOBALS: ElvUIGrid, ElvDB
...@@ -43,7 +43,7 @@ function E:LuaError(msg) ...@@ -43,7 +43,7 @@ function E:LuaError(msg)
if switch == 'on' or switch == '1' then if switch == 'on' or switch == '1' then
for i=1, GetNumAddOns() do for i=1, GetNumAddOns() do
local name = GetAddOnInfo(i) local name = GetAddOnInfo(i)
if (name ~= 'ElvUI' and name ~= 'ElvUI_OptionsUI') and E:IsAddOnEnabled(name) then if name ~= 'ElvUI' and name ~= 'ElvUI_OptionsUI' and E:IsAddOnEnabled(name) then
DisableAddOn(name, E.myname) DisableAddOn(name, E.myname)
ElvDB.LuaErrorDisabledAddOns[name] = i ElvDB.LuaErrorDisabledAddOns[name] = i
end end
...@@ -77,7 +77,7 @@ end ...@@ -77,7 +77,7 @@ end
function E:DelayScriptCall(msg) function E:DelayScriptCall(msg)
local secs, command = msg:match('^(%S+)%s+(.*)$') local secs, command = msg:match('^(%S+)%s+(.*)$')
secs = tonumber(secs) secs = tonumber(secs)
if (not secs) or (#command == 0) then if not secs or (#command == 0) then
self:Print('usage: /in <seconds> <command>') self:Print('usage: /in <seconds> <command>')
self:Print('example: /in 1.5 /say hi') self:Print('example: /in 1.5 /say hi')
else else
......
This diff is collapsed.
local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB local E, L, V, P, G = unpack(select(2, ...)); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local AB = E:GetModule('ActionBars') local AB = E:GetModule('ActionBars')
local LSM = E.Libs.LSM
local next, ipairs, pairs = next, ipairs, pairs local next, ipairs, pairs = next, ipairs, pairs
local floor, tinsert = floor, tinsert local floor, tinsert = floor, tinsert
...@@ -150,7 +151,7 @@ function E:Cooldown_Options(timer, db, parent) ...@@ -150,7 +151,7 @@ function E:Cooldown_Options(timer, db, parent)
end end
if fonts and fonts.enable then if fonts and fonts.enable then
timer.customFont = E.Libs.LSM:Fetch('font', fonts.font) timer.customFont = LSM:Fetch('font', fonts.font)
timer.customFontSize = fonts.fontSize timer.customFontSize = fonts.fontSize
timer.customFontOutline = fonts.fontOutline timer.customFontOutline = fonts.fontOutline
else else
...@@ -169,7 +170,7 @@ function E:CreateCooldownTimer(parent) ...@@ -169,7 +170,7 @@ function E:CreateCooldownTimer(parent)
parent.timer = timer parent.timer = timer
local text = timer:CreateFontString(nil, 'OVERLAY') local text = timer:CreateFontString(nil, 'OVERLAY')
text:SetPoint('CENTER', 1, 1) text:Point('CENTER', 1, 1)
text:SetJustifyH('CENTER') text:SetJustifyH('CENTER')
timer.text = text timer.text = text
...@@ -205,7 +206,7 @@ end ...@@ -205,7 +206,7 @@ end
E.RegisteredCooldowns = {} E.RegisteredCooldowns = {}
function E:OnSetCooldown(start, duration) function E:OnSetCooldown(start, duration)
if (not self.forceDisabled) and (start and duration) and (duration > MIN_DURATION) then if not self.forceDisabled and (start and duration) and (duration > MIN_DURATION) then
local timer = self.timer or E:CreateCooldownTimer(self) local timer = self.timer or E:CreateCooldownTimer(self)
timer.start = start timer.start = start
timer.duration = duration timer.duration = duration
...@@ -265,7 +266,7 @@ end ...@@ -265,7 +266,7 @@ end
function E:UpdateCooldownOverride(module) function E:UpdateCooldownOverride(module)
local cooldowns = (module and E.RegisteredCooldowns[module]) local cooldowns = (module and E.RegisteredCooldowns[module])
if (not cooldowns) or not next(cooldowns) then return end if not cooldowns or not next(cooldowns) then return end
local blizzText local blizzText
for _, parent in ipairs(cooldowns) do for _, parent in ipairs(cooldowns) do
...@@ -290,7 +291,7 @@ function E:UpdateCooldownOverride(module) ...@@ -290,7 +291,7 @@ function E:UpdateCooldownOverride(module)
cd.text:FontTemplate(cd.customFont, cd.customFontSize, cd.customFontOutline) cd.text:FontTemplate(cd.customFont, cd.customFontSize, cd.customFontOutline)
elseif parent.CooldownOverride == 'auras' then elseif parent.CooldownOverride == 'auras' then
-- parent.auraType defined in `A:UpdateHeader` and `A:CreateIcon` -- parent.auraType defined in `A:UpdateHeader` and `A:CreateIcon`
local font = E.Libs.LSM:Fetch('font', db.font) local font = LSM:Fetch('font', db.font)
if font and parent.auraType then if font and parent.auraType then
local fontSize = db[parent.auraType] and db[parent.auraType].durationFontSize local fontSize = db[parent.auraType] and db[parent.auraType].durationFontSize
if fontSize then if fontSize then
......
This diff is collapsed.
...@@ -5,7 +5,7 @@ local LibCompress = E.Libs.Compress ...@@ -5,7 +5,7 @@ local LibCompress = E.Libs.Compress
local LibBase64 = E.Libs.Base64 local LibBase64 = E.Libs.Base64
local _G = _G local _G = _G
local tonumber, type, gsub, pcall, loadstring = tonumber, type, gsub, pcall, loadstring local tonumber, type, gsub, pairs, pcall, loadstring = tonumber, type, gsub, pairs, pcall, loadstring
local len, format, split, find = strlen, format, strsplit, strfind local len, format, split, find = strlen, format, strsplit, strfind
local CreateFrame = CreateFrame local CreateFrame = CreateFrame
...@@ -34,10 +34,10 @@ function D:Initialize() ...@@ -34,10 +34,10 @@ function D:Initialize()
self.statusBar:CreateBackdrop() self.statusBar:CreateBackdrop()
self.statusBar:SetStatusBarTexture(E.media.normTex) self.statusBar:SetStatusBarTexture(E.media.normTex)
self.statusBar:SetStatusBarColor(0.95, 0.15, 0.15) self.statusBar:SetStatusBarColor(0.95, 0.15, 0.15)
self.statusBar:SetSize(250, 18) self.statusBar:Size(250, 18)
self.statusBar.text = self.statusBar:CreateFontString(nil, 'OVERLAY') self.statusBar.text = self.statusBar:CreateFontString(nil, 'OVERLAY')
self.statusBar.text:FontTemplate() self.statusBar.text:FontTemplate()
self.statusBar.text:SetPoint('CENTER') self.statusBar.text:Point('CENTER')
self.statusBar:Hide() self.statusBar:Hide()
E:RegisterStatusBar(self.statusBar) E:RegisterStatusBar(self.statusBar)
end end
......
...@@ -59,28 +59,28 @@ function E:DropDown(list, frame, xOffset, yOffset) ...@@ -59,28 +59,28 @@ function E:DropDown(list, frame, xOffset, yOffset)
end end
frame.buttons[i]:Show() frame.buttons[i]:Show()
frame.buttons[i]:SetHeight(BUTTON_HEIGHT) frame.buttons[i]:Height(BUTTON_HEIGHT)
frame.buttons[i]:SetWidth(BUTTON_WIDTH) frame.buttons[i]:Width(BUTTON_WIDTH)
frame.buttons[i].text:SetText(list[i].text) frame.buttons[i].text:SetText(list[i].text)
frame.buttons[i].func = list[i].func frame.buttons[i].func = list[i].func
frame.buttons[i]:SetScript('OnClick', OnClick) frame.buttons[i]:SetScript('OnClick', OnClick)
if i == 1 then if i == 1 then
frame.buttons[i]:SetPoint('TOPLEFT', frame, 'TOPLEFT', PADDING, -PADDING) frame.buttons[i]:Point('TOPLEFT', frame, 'TOPLEFT', PADDING, -PADDING)
else else
frame.buttons[i]:SetPoint('TOPLEFT', frame.buttons[i-1], 'BOTTOMLEFT') frame.buttons[i]:Point('TOPLEFT', frame.buttons[i-1], 'BOTTOMLEFT')
end end
end end
frame:SetHeight((#list * BUTTON_HEIGHT) + PADDING * 2) frame:Height((#list * BUTTON_HEIGHT) + PADDING * 2)
frame:SetWidth(BUTTON_WIDTH + PADDING * 2) frame:Width(BUTTON_WIDTH + PADDING * 2)
local UIScale = _G.UIParent:GetScale() local UIScale = _G.UIParent:GetScale()
local x, y = GetCursorPosition() local x, y = GetCursorPosition()
x = x/UIScale x = x/UIScale
y = y/UIScale y = y/UIScale
frame:ClearAllPoints() frame:ClearAllPoints()
frame:SetPoint('TOPLEFT', _G.UIParent, 'BOTTOMLEFT', x + xOffset, y + yOffset) frame:Point('TOPLEFT', _G.UIParent, 'BOTTOMLEFT', x + xOffset, y + yOffset)
ToggleFrame(frame) ToggleFrame(frame)
end end
...@@ -5,6 +5,7 @@ local _G = _G ...@@ -5,6 +5,7 @@ local _G = _G
local strmatch = strmatch local strmatch = strmatch
local function SetFont(obj, font, size, style, sr, sg, sb, sa, sox, soy, r, g, b) local function SetFont(obj, font, size, style, sr, sg, sb, sa, sox, soy, r, g, b)
if not obj then return end
obj:SetFont(font, size, style) obj:SetFont(font, size, style)
if sr and sg and sb then obj:SetShadowColor(sr, sg, sb, sa) end if sr and sg and sb then obj:SetShadowColor(sr, sg, sb, sa) end
if sox and soy then obj:SetShadowOffset(sox, soy) end if sox and soy then obj:SetShadowOffset(sox, soy) end
...@@ -27,11 +28,9 @@ function E:UpdateBlizzardFonts() ...@@ -27,11 +28,9 @@ function E:UpdateBlizzardFonts()
if E.private.general.replaceNameFont then _G.UNIT_NAME_FONT = NAMEFONT end if E.private.general.replaceNameFont then _G.UNIT_NAME_FONT = NAMEFONT end
if E.private.general.replaceCombatFont then _G.DAMAGE_TEXT_FONT = COMBAT end if E.private.general.replaceCombatFont then _G.DAMAGE_TEXT_FONT = COMBAT end
if E.private.general.replaceBlizzFonts then if E.private.general.replaceBlizzFonts then
--_G.NAMEPLATE_FONT = NAMEFONT
_G.STANDARD_TEXT_FONT = NORMAL _G.STANDARD_TEXT_FONT = NORMAL
--_G.NAMEPLATE_FONT = NAMEFONT
--SetFont(_G.NumberFontNormal, LSM:Fetch('font', 'Homespun'), 10, 'MONOCHROMEOUTLINE', 1, 1, 1, 0, 0, 0)
--SetFont(_G.GameFontNormalSmall, NORMAL, 12, nil, nil, nil, nil, nil, nil, nil, unpack(E.media.rgbvaluecolor))
SetFont(_G.AchievementFont_Small, NORMAL, E.db.general.fontSize) -- Achiev dates SetFont(_G.AchievementFont_Small, NORMAL, E.db.general.fontSize) -- Achiev dates
SetFont(_G.BossEmoteNormalHuge, NORMAL, 24) -- Talent Title SetFont(_G.BossEmoteNormalHuge, NORMAL, 24) -- Talent Title
SetFont(_G.ChatBubbleFont, BUBBLE, E.private.general.chatBubbleFontSize, E.private.general.chatBubbleFontOutline) SetFont(_G.ChatBubbleFont, BUBBLE, E.private.general.chatBubbleFontSize, E.private.general.chatBubbleFontOutline)
...@@ -51,8 +50,9 @@ function E:UpdateBlizzardFonts() ...@@ -51,8 +50,9 @@ function E:UpdateBlizzardFonts()
SetFont(_G.Game15Font_o1, NORMAL, 15) -- CharacterStatsPane (ItemLevelFrame) SetFont(_G.Game15Font_o1, NORMAL, 15) -- CharacterStatsPane (ItemLevelFrame)
SetFont(_G.Game16Font, NORMAL, 16) -- Added in 7.3.5 used for ? SetFont(_G.Game16Font, NORMAL, 16) -- Added in 7.3.5 used for ?
SetFont(_G.Game18Font, NORMAL, 18) -- MissionUI Bonus Chance SetFont(_G.Game18Font, NORMAL, 18) -- MissionUI Bonus Chance
SetFont(_G.Game24Font, NORMAL, 24) -- Garrison Mission level (in detail frame) SetFont(_G.Game24Font, NORMAL, 24) -- Garrison Mission level (in detail frame)
SetFont(_G.Game30Font, NORMAL, 30) -- Mission Level SetFont(_G.Game30Font, NORMAL, 30) -- Mission Level
SetFont(_G.Game40Font, NORMAL, 40)
SetFont(_G.Game42Font, NORMAL, 42) -- PVP Stuff SetFont(_G.Game42Font, NORMAL, 42) -- PVP Stuff
SetFont(_G.Game46Font, NORMAL, 46) -- Added in 7.3.5 used for ? SetFont(_G.Game46Font, NORMAL, 46) -- Added in 7.3.5 used for ?
SetFont(_G.Game48Font, NORMAL, 48) SetFont(_G.Game48Font, NORMAL, 48)
...@@ -64,6 +64,7 @@ function E:UpdateBlizzardFonts() ...@@ -64,6 +64,7 @@ function E:UpdateBlizzardFonts()
SetFont(_G.GameFontHighlightMedium, NORMAL, 15) -- Fix QuestLog Title mouseover SetFont(_G.GameFontHighlightMedium, NORMAL, 15) -- Fix QuestLog Title mouseover
SetFont(_G.GameFontHighlightSmall2, NORMAL, E.db.general.fontSize) -- Skill or Recipe description on TradeSkill frame SetFont(_G.GameFontHighlightSmall2, NORMAL, E.db.general.fontSize) -- Skill or Recipe description on TradeSkill frame
SetFont(_G.GameFontNormalHuge2, NORMAL, 24) -- Mythic weekly best dungeon name SetFont(_G.GameFontNormalHuge2, NORMAL, 24) -- Mythic weekly best dungeon name
SetFont(_G.GameFontNormalLarge, NORMAL, 16)
SetFont(_G.GameFontNormalLarge2, NORMAL, 15) -- Garrison Follower Names SetFont(_G.GameFontNormalLarge2, NORMAL, 15) -- Garrison Follower Names
SetFont(_G.GameFontNormalMed1, NORMAL, 14) -- WoW Token Info SetFont(_G.GameFontNormalMed1, NORMAL, 14) -- WoW Token Info
SetFont(_G.GameFontNormalMed2, NORMAL, E.db.general.fontSize*1.1) -- Quest tracker SetFont(_G.GameFontNormalMed2, NORMAL, E.db.general.fontSize*1.1) -- Quest tracker
...@@ -97,7 +98,7 @@ function E:UpdateBlizzardFonts() ...@@ -97,7 +98,7 @@ function E:UpdateBlizzardFonts()
SetFont(_G.SubZoneTextFont, NORMAL, 24, MONOCHROME..'OUTLINE') -- World Map(SubZone) SetFont(_G.SubZoneTextFont, NORMAL, 24, MONOCHROME..'OUTLINE') -- World Map(SubZone)
SetFont(_G.SubZoneTextString, NORMAL, 25, MONOCHROME..'OUTLINE') SetFont(_G.SubZoneTextString, NORMAL, 25, MONOCHROME..'OUTLINE')
SetFont(_G.SystemFont_Huge1, NORMAL, 20) -- Garrison Mission XP SetFont(_G.SystemFont_Huge1, NORMAL, 20) -- Garrison Mission XP
SetFont(_G.SystemFont_Huge1_Outline, NORMAL, 18, MONOCHROME..'OUTLINE') -- Garrison Mission Chance SetFont(_G.SystemFont_Huge1_Outline, NORMAL, 18, MONOCHROME..'OUTLINE') -- Garrison Mission Chance
SetFont(_G.SystemFont_Large, NORMAL, 15) SetFont(_G.SystemFont_Large, NORMAL, 15)
SetFont(_G.SystemFont_Med1, NORMAL, E.db.general.fontSize) SetFont(_G.SystemFont_Med1, NORMAL, E.db.general.fontSize)
SetFont(_G.SystemFont_Med3, NORMAL, E.db.general.fontSize*1.1) SetFont(_G.SystemFont_Med3, NORMAL, E.db.general.fontSize*1.1)
...@@ -114,7 +115,6 @@ function E:UpdateBlizzardFonts() ...@@ -114,7 +115,6 @@ function E:UpdateBlizzardFonts()
SetFont(_G.SystemFont_Shadow_Med2, NORMAL, 13 * 1.1) -- Shows Order resourses on OrderHallTalentFrame SetFont(_G.SystemFont_Shadow_Med2, NORMAL, 13 * 1.1) -- Shows Order resourses on OrderHallTalentFrame
SetFont(_G.SystemFont_Shadow_Med3, NORMAL, 13 * 1.1) SetFont(_G.SystemFont_Shadow_Med3, NORMAL, 13 * 1.1)
SetFont(_G.SystemFont_Shadow_Med3, NORMAL, E.db.general.fontSize*1.1) SetFont(_G.SystemFont_Shadow_Med3, NORMAL, E.db.general.fontSize*1.1)