Commit c056a3f1 authored by Simpy's avatar Simpy 🐹

11.22

parents bed1910c 48d49173
......@@ -40,7 +40,7 @@ do -- other non-english locales require this
for k,v in pairs(_G.LOCALIZED_CLASS_NAMES_FEMALE) do E.UnlocalizedClasses[v] = k end
function E:UnlocalizedClassName(className)
return (className and className ~= "") and E.UnlocalizedClasses[className]
return (className and className ~= '') and E.UnlocalizedClasses[className]
end
end
......@@ -51,7 +51,7 @@ end
function E:ScanTooltipTextures(clean, grabTextures)
local essenceTextureID, textures, essences = 2975691
for i = 1, 10 do
local tex = _G["ElvUI_ScanTooltipTexture"..i]
local tex = _G['ElvUI_ScanTooltipTexture'..i]
local texture = tex and tex:GetTexture()
if texture then
if grabTextures then
......@@ -166,7 +166,7 @@ do
local widget = widgetID and C_UIWidgetManager_GetStatusBarWidgetVisualizationInfo(widgetID)
if not widget then return end
local rank = tonumber(strmatch(widget.overrideBarText, "%d+"))
local rank = tonumber(strmatch(widget.overrideBarText, '%d+'))
if not rank then return end
local cur = widget.barValue - widget.barMin
......
......@@ -26,8 +26,8 @@ do
function E:StopHarlemShake()
E.isMassiveShaking = nil
StopMusic()
SetCVar("Sound_EnableAllSound", self.oldEnableAllSound)
SetCVar("Sound_EnableMusic", self.oldEnableMusic)
SetCVar('Sound_EnableAllSound', self.oldEnableAllSound)
SetCVar('Sound_EnableMusic', self.oldEnableMusic)
self:StopShakeHorizontal(ElvUI_StaticPopup1)
for _, object in pairs(self.massiveShakeObjects) do
......@@ -41,9 +41,9 @@ do
end
E.global.aprilFools = true
E:StaticPopup_Hide("HARLEM_SHAKE")
E:StaticPopup_Hide('HARLEM_SHAKE')
twipe(self.massiveShakeObjects)
DoEmote("Dance")
DoEmote('Dance')
end
function E:DoTheHarlemShake()
......@@ -56,21 +56,21 @@ do
end
end
E.massiveShakeTimer = E:ScheduleTimer("StopHarlemShake", 42.5)
SendChatMessage("DO THE HARLEM SHAKE!", "YELL")
E.massiveShakeTimer = E:ScheduleTimer('StopHarlemShake', 42.5)
SendChatMessage('DO THE HARLEM SHAKE!', 'YELL')
end
function E:BeginHarlemShake()
DoEmote("Dance")
DoEmote('Dance')
ElvUI_StaticPopup1Button1:Disable()
self:ShakeHorizontal(ElvUI_StaticPopup1)
self.oldEnableAllSound = GetCVar("Sound_EnableAllSound")
self.oldEnableMusic = GetCVar("Sound_EnableMusic")
self.oldEnableAllSound = GetCVar('Sound_EnableAllSound')
self.oldEnableMusic = GetCVar('Sound_EnableMusic')
SetCVar("Sound_EnableAllSound", 1)
SetCVar("Sound_EnableMusic", 1)
SetCVar('Sound_EnableAllSound', 1)
SetCVar('Sound_EnableMusic', 1)
PlayMusic(E.Media.Sounds.HarlemShake)
E:ScheduleTimer("DoTheHarlemShake", 15.5)
E:ScheduleTimer('DoTheHarlemShake', 15.5)
self.massiveShakeObjects = {}
tinsert(self.massiveShakeObjects, _G.GameTooltip)
......@@ -99,7 +99,7 @@ do
end
for i=1, NUM_PET_ACTION_SLOTS do
local button = _G["PetActionButton"..i]
local button = _G['PetActionButton'..i]
if button then
tinsert(self.massiveShakeObjects, button)
end
......@@ -107,7 +107,7 @@ do
end
function E:HarlemShakeToggle()
self:StaticPopup_Show("HARLEM_SHAKE")
self:StaticPopup_Show('HARLEM_SHAKE')
end
end
......@@ -158,8 +158,8 @@ do
if(self:HelloKittyFixCheck()) then
E:HelloKittyFix()
else
self.oldEnableAllSound = GetCVar("Sound_EnableAllSound")
self.oldEnableMusic = GetCVar("Sound_EnableMusic")
self.oldEnableAllSound = GetCVar('Sound_EnableAllSound')
self.oldEnableMusic = GetCVar('Sound_EnableMusic')
t.backdropcolor = {r = c.r, g = c.g, b = c.b}
c = self.db.general.backdropfadecolor
......@@ -202,10 +202,10 @@ do
self.db.unitframe.colors.health = {r = 223/255, g = 76/255, b = 188/255}
self.db.unitframe.colors.healthclass = false
SetCVar("Sound_EnableAllSound", 1)
SetCVar("Sound_EnableMusic", 1)
SetCVar('Sound_EnableAllSound', 1)
SetCVar('Sound_EnableMusic', 1)
PlayMusic(E.Media.Sounds.HelloKitty)
E:StaticPopup_Show("HELLO_KITTY_END")
E:StaticPopup_Show('HELLO_KITTY_END')
self.db.general.kittys = true
self:CreateKittys()
......@@ -266,42 +266,42 @@ do
_G.HelloKittyRight:Show()
return
end
local helloKittyLeft = CreateFrame("Frame", "HelloKittyLeft", _G.UIParent)
local helloKittyLeft = CreateFrame('Frame', 'HelloKittyLeft', _G.UIParent)
helloKittyLeft:SetSize(120, 128)
helloKittyLeft:SetMovable(true)
helloKittyLeft:EnableMouse(true)
helloKittyLeft:RegisterForDrag("LeftButton")
helloKittyLeft:Point("BOTTOMLEFT", _G.LeftChatPanel, "BOTTOMRIGHT", 2, -4)
helloKittyLeft.tex = helloKittyLeft:CreateTexture(nil, "OVERLAY")
helloKittyLeft:RegisterForDrag('LeftButton')
helloKittyLeft:Point('BOTTOMLEFT', _G.LeftChatPanel, 'BOTTOMRIGHT', 2, -4)
helloKittyLeft.tex = helloKittyLeft:CreateTexture(nil, 'OVERLAY')
helloKittyLeft.tex:SetAllPoints()
helloKittyLeft.tex:SetTexture(E.Media.Textures.HelloKitty)
helloKittyLeft.tex:SetTexCoord(0, 0, 0, 1, 0, 0, 0, 1)
helloKittyLeft.curFrame = 1
helloKittyLeft.countUp = true
helloKittyLeft:SetClampedToScreen(true)
helloKittyLeft:SetScript("OnDragStart", OnDragStart)
helloKittyLeft:SetScript("OnDragStop", OnDragStop)
helloKittyLeft:SetScript("OnUpdate", OnUpdate)
helloKittyLeft:SetScript('OnDragStart', OnDragStart)
helloKittyLeft:SetScript('OnDragStop', OnDragStop)
helloKittyLeft:SetScript('OnUpdate', OnUpdate)
local helloKittyRight = CreateFrame("Frame", "HelloKittyRight", _G.UIParent)
local helloKittyRight = CreateFrame('Frame', 'HelloKittyRight', _G.UIParent)
helloKittyRight:SetSize(120, 128)
helloKittyRight:SetMovable(true)
helloKittyRight:EnableMouse(true)
helloKittyRight:RegisterForDrag("LeftButton")
helloKittyRight:Point("BOTTOMRIGHT", _G.RightChatPanel, "BOTTOMLEFT", -2, -4)
helloKittyRight.tex = helloKittyRight:CreateTexture(nil, "OVERLAY")
helloKittyRight:RegisterForDrag('LeftButton')
helloKittyRight:Point('BOTTOMRIGHT', _G.RightChatPanel, 'BOTTOMLEFT', -2, -4)
helloKittyRight.tex = helloKittyRight:CreateTexture(nil, 'OVERLAY')
helloKittyRight.tex:SetAllPoints()
helloKittyRight.tex:SetTexture(E.Media.Textures.HelloKitty)
helloKittyRight.tex:SetTexCoord(0, 0, 0, 1, 0, 0, 0, 1)
helloKittyRight.curFrame = 10
helloKittyRight.countUp = false
helloKittyRight:SetClampedToScreen(true)
helloKittyRight:SetScript("OnDragStart", OnDragStart)
helloKittyRight:SetScript("OnDragStop", OnDragStop)
helloKittyRight:SetScript("OnUpdate", OnUpdate)
helloKittyRight:SetScript('OnDragStart', OnDragStart)
helloKittyRight:SetScript('OnDragStop', OnDragStop)
helloKittyRight:SetScript('OnUpdate', OnUpdate)
end
--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)
local t = self.db.tempSettings
if(not t and not secondCheck) then t = self.db.general end
......@@ -323,8 +323,8 @@ do
c = P.general.valuecolor
self.db.general.valuecolor = {r = c.r, g = c.g, b = c.b}
self.db.chat.panelBackdropNameLeft = ""
self.db.chat.panelBackdropNameRight = ""
self.db.chat.panelBackdropNameLeft = ''
self.db.chat.panelBackdropNameRight = ''
c = P.unitframe.colors.health
self.db.unitframe.colors.health = {r = c.r, g = c.g, b = c.b}
......@@ -352,7 +352,7 @@ do
if(_G.HelloKittyLeft and _G.HelloKittyLeft:IsShown()) then
self:RestoreHelloKitty()
else
self:StaticPopup_Show("HELLO_KITTY")
self:StaticPopup_Show('HELLO_KITTY')
end
end
end
This diff is collapsed.
This diff is collapsed.
......@@ -37,7 +37,7 @@ function E:Cooldown_OnUpdate(elapsed)
local value1, formatid, nextUpdate, value2 = E:GetTimeInfo(remain, timeThreshold, hhmmThreshold, mmssThreshold)
self.nextUpdate = nextUpdate
self.text:SetFormattedText(("%s%s|r"):format(timeColors[formatid], E.TimeFormats[formatid][2]), value1, value2)
self.text:SetFormattedText(('%s%s|r'):format(timeColors[formatid], E.TimeFormats[formatid][2]), value1, value2)
end
else
E:Cooldown_StopTimer(self)
......@@ -56,7 +56,7 @@ function E:Cooldown_OnSizeChanged(cd, width, force)
else
local text = cd.text or cd.time
if text then
local useCustomFont = (cd.timerOptions and cd.timerOptions.fontOptions and cd.timerOptions.fontOptions.enable) and E.Libs.LSM:Fetch("font", cd.timerOptions.fontOptions.font)
local useCustomFont = (cd.timerOptions and cd.timerOptions.fontOptions and cd.timerOptions.fontOptions.enable) and E.Libs.LSM:Fetch('font', cd.timerOptions.fontOptions.font)
if useCustomFont then
text:FontTemplate(useCustomFont, (fontScale * cd.timerOptions.fontOptions.fontSize), cd.timerOptions.fontOptions.fontOutline)
elseif fontScale then
......@@ -104,7 +104,7 @@ function E:CreateCooldownTimer(parent)
local text = timer:CreateFontString(nil, 'OVERLAY')
text:Point('CENTER', 1, 1)
text:SetJustifyH("CENTER")
text:SetJustifyH('CENTER')
timer.text = text
-- can be used to modify elements created from this function
......@@ -184,7 +184,7 @@ end
function E:RegisterCooldown(cooldown)
if not cooldown.isHooked then
hooksecurefunc(cooldown, "SetCooldown", E.OnSetCooldown)
hooksecurefunc(cooldown, 'SetCooldown', E.OnSetCooldown)
cooldown.isHooked = true
end
......@@ -271,14 +271,14 @@ function E:UpdateCooldownOverride(module)
if text then
if CD.timerOptions.fontOptions and CD.timerOptions.fontOptions.enable then
if not customFont then
customFont = E.Libs.LSM:Fetch("font", CD.timerOptions.fontOptions.font)
customFont = E.Libs.LSM:Fetch('font', CD.timerOptions.fontOptions.font)
end
if customFont then
text:FontTemplate(customFont, CD.timerOptions.fontOptions.fontSize, CD.timerOptions.fontOptions.fontOutline)
end
elseif cd.CooldownOverride then
if not customFont then
customFont = E.Libs.LSM:Fetch("font", E.db[cd.CooldownOverride].font)
customFont = E.Libs.LSM:Fetch('font', E.db[cd.CooldownOverride].font)
end
-- cd.auraType defined in `A:UpdateHeader` and `A:CreateIcon`
......@@ -317,7 +317,7 @@ end
function E:UpdateCooldownSettings(module)
local cooldownDB, timeColors = self.db.cooldown, E.TimeColors
-- update the module timecolors if the config called it but ignore "global" and "all":
-- update the module timecolors if the config called it but ignore 'global' and 'all':
-- global is the main call from config, all is the core file calls
local isModule = module and (module ~= 'global' and module ~= 'all') and self.db[module] and self.db[module].cooldown
if isModule then
......
local ElvUI = select(2, ...)
local gameLocale
do -- Locale doesn't exist yet, make it exist.
local convert = {enGB = 'enUS', esES = 'esMX', itIT = 'enUS'}
local lang = GetLocale()
gameLocale = convert[lang] or lang or 'enUS'
ElvUI[2] = ElvUI[1].Libs.ACL:GetLocale('ElvUI', gameLocale)
end
ElvUI[2] = ElvUI[1].Libs.ACL:GetLocale('ElvUI', ElvUI[1]:GetLocale()) -- Locale doesn't exist yet, make it exist.
local E, L, V, P, G = unpack(ElvUI); --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local ActionBars = E:GetModule('ActionBars')
local AFK = E:GetModule('AFK')
local Auras = E:GetModule('Auras')
local Bags = E:GetModule('Bags')
local Blizzard = E:GetModule('Blizzard')
local Chat = E:GetModule('Chat')
local DataBars = E:GetModule('DataBars')
local DataTexts = E:GetModule('DataTexts')
local Layout = E:GetModule('Layout')
local Minimap = E:GetModule('Minimap')
local NamePlates = E:GetModule('NamePlates')
local Threat = E:GetModule('Threat')
local Tooltip = E:GetModule('Tooltip')
local Totems = E:GetModule('Totems')
local UnitFrames = E:GetModule('UnitFrames')
local LSM = E.Libs.LSM
--Lua functions
local _G = _G
local tonumber, pairs, ipairs, error, unpack, select, tostring = tonumber, pairs, ipairs, error, unpack, select, tostring
......@@ -56,6 +30,24 @@ local LE_PARTY_CATEGORY_INSTANCE = LE_PARTY_CATEGORY_INSTANCE
local C_ChatInfo_SendAddonMessage = C_ChatInfo.SendAddonMessage
-- GLOBALS: ElvUIPlayerBuffs, ElvUIPlayerDebuffs
--Modules
local ActionBars = E:GetModule('ActionBars')
local AFK = E:GetModule('AFK')
local Auras = E:GetModule('Auras')
local Bags = E:GetModule('Bags')
local Blizzard = E:GetModule('Blizzard')
local Chat = E:GetModule('Chat')
local DataBars = E:GetModule('DataBars')
local DataTexts = E:GetModule('DataTexts')
local Layout = E:GetModule('Layout')
local Minimap = E:GetModule('Minimap')
local NamePlates = E:GetModule('NamePlates')
local Threat = E:GetModule('Threat')
local Tooltip = E:GetModule('Tooltip')
local Totems = E:GetModule('Totems')
local UnitFrames = E:GetModule('UnitFrames')
local LSM = E.Libs.LSM
--Constants
E.noop = function() end
E.title = format('|cfffe7b2c%s |r', 'ElvUI')
......@@ -75,6 +67,10 @@ E.isMacClient = IsMacClient()
E.NewSign = '|TInterface\\OptionsFrame\\UI-OptionsFrame-NewFeatureIcon:14:14|t' -- not used by ElvUI yet, but plugins like BenikUI and MerathilisUI use it.
E.InfoColor = '|cfffe7b2c'
-- oUF Defines
E.oUF.Tags.Vars.E = E
E.oUF.Tags.Vars.L = L
--Tables
E.media = {}
E.frames = {}
......@@ -348,7 +344,7 @@ end
do --Update font/texture paths when they are registered by the addon providing them
--This helps fix most of the issues with fonts or textures reverting to default because the addon providing them is loading after ElvUI.
--We use a wrapper to avoid errors in :UpdateMedia because "self" is passed to the function with a value other than ElvUI.
--We use a wrapper to avoid errors in :UpdateMedia because 'self' is passed to the function with a value other than ElvUI.
local function LSMCallback() E:UpdateMedia() end
LSM.RegisterCallback(E, 'LibSharedMedia_Registered', LSMCallback)
end
......@@ -716,7 +712,7 @@ do --The code in this function is from WeakAuras, credit goes to Mirrored and th
if not profileText then return end
twipe(lineStructureTable)
local ret = ""
local ret = ''
if inTable and profileType then
sameLine = false
ret = recurse(inTable, ret, profileText)
......@@ -828,7 +824,7 @@ function E:UpdateStart(skipCallback, skipUpdateDB)
E:UpdateUnitFrames()
if not skipCallback then
E.callbacks:Fire("StaggeredUpdate")
E.callbacks:Fire('StaggeredUpdate')
end
end
......@@ -857,7 +853,7 @@ end
function E:UpdateMoverPositions()
--The mover is positioned before it is resized, which causes issues for unitframes
--Allow movers to be "pushed" outside the screen, when they are resized they should be back in the screen area.
--Allow movers to be 'pushed' outside the screen, when they are resized they should be back in the screen area.
--We set movers to be clamped again at the bottom of this function.
E:SetMoversClampedToScreen(false)
E:SetMoversPositions()
......@@ -879,7 +875,7 @@ function E:UpdateMediaItems(skipCallback)
E:UpdateStatusBars()
if not skipCallback then
E.callbacks:Fire("StaggeredUpdate")
E.callbacks:Fire('StaggeredUpdate')
end
end
......@@ -890,7 +886,7 @@ function E:UpdateLayout(skipCallback)
Layout:SetDataPanelStyle()
if not skipCallback then
E.callbacks:Fire("StaggeredUpdate")
E.callbacks:Fire('StaggeredUpdate')
end
end
......@@ -903,7 +899,7 @@ function E:UpdateActionBars(skipCallback)
ActionBars:UpdatePetCooldownSettings()
if not skipCallback then
E.callbacks:Fire("StaggeredUpdate")
E.callbacks:Fire('StaggeredUpdate')
end
end
......@@ -912,7 +908,7 @@ function E:UpdateNamePlates(skipCallback)
NamePlates:StyleFilterInitialize()
if not skipCallback then
E.callbacks:Fire("StaggeredUpdate")
E.callbacks:Fire('StaggeredUpdate')
end
end
......@@ -928,7 +924,7 @@ function E:UpdateBags(skipCallback)
Bags:UpdateItemLevelDisplay()
if not skipCallback then
E.callbacks:Fire("StaggeredUpdate")
E.callbacks:Fire('StaggeredUpdate')
end
end
......@@ -938,7 +934,7 @@ function E:UpdateChat(skipCallback)
Chat:UpdateAnchors()
if not skipCallback then
E.callbacks:Fire("StaggeredUpdate")
E.callbacks:Fire('StaggeredUpdate')
end
end
......@@ -950,7 +946,7 @@ function E:UpdateDataBars(skipCallback)
DataBars:UpdateDataBarDimensions()
if not skipCallback then
E.callbacks:Fire("StaggeredUpdate")
E.callbacks:Fire('StaggeredUpdate')
end
end
......@@ -958,7 +954,7 @@ function E:UpdateDataTexts(skipCallback)
DataTexts:LoadDataTexts()
if not skipCallback then
E.callbacks:Fire("StaggeredUpdate")
E.callbacks:Fire('StaggeredUpdate')
end
end
......@@ -966,7 +962,7 @@ function E:UpdateMinimap(skipCallback)
Minimap:UpdateSettings()
if not skipCallback then
E.callbacks:Fire("StaggeredUpdate")
E.callbacks:Fire('StaggeredUpdate')
end
end
......@@ -975,7 +971,7 @@ function E:UpdateAuras(skipCallback)
if ElvUIPlayerDebuffs then Auras:UpdateHeader(ElvUIPlayerDebuffs) end
if not skipCallback then
E.callbacks:Fire("StaggeredUpdate")
E.callbacks:Fire('StaggeredUpdate')
end
end
......@@ -990,7 +986,7 @@ function E:UpdateMisc(skipCallback)
Totems:ToggleEnable()
if not skipCallback then
E.callbacks:Fire("StaggeredUpdate")
E.callbacks:Fire('StaggeredUpdate')
end
end
......@@ -1033,7 +1029,7 @@ do
E:Delay(nextDelay or staggerDelay, E[nextUpdate])
end
end
E:RegisterCallback("StaggeredUpdate", CallStaggeredUpdate)
E:RegisterCallback('StaggeredUpdate', CallStaggeredUpdate)
function E:StaggeredUpdateAll(event, installSetup)
if not self.initialized then
......@@ -1042,30 +1038,30 @@ do
end
self.installSetup = installSetup
if (installSetup or event and event == "OnProfileChanged" or event == "OnProfileCopied") and not self.staggerUpdateRunning then
tinsert(staggerTable, "UpdateLayout")
if (installSetup or event and event == 'OnProfileChanged' or event == 'OnProfileCopied') and not self.staggerUpdateRunning then
tinsert(staggerTable, 'UpdateLayout')
if E.private.actionbar.enable then
tinsert(staggerTable, "UpdateActionBars")
tinsert(staggerTable, 'UpdateActionBars')
end
if E.private.nameplates.enable then
tinsert(staggerTable, "UpdateNamePlates")
tinsert(staggerTable, 'UpdateNamePlates')
end
if E.private.bags.enable then
tinsert(staggerTable, "UpdateBags")
tinsert(staggerTable, 'UpdateBags')
end
if E.private.chat.enable then
tinsert(staggerTable, "UpdateChat")
tinsert(staggerTable, 'UpdateChat')
end
tinsert(staggerTable, "UpdateDataBars")
tinsert(staggerTable, "UpdateDataTexts")
tinsert(staggerTable, 'UpdateDataBars')
tinsert(staggerTable, 'UpdateDataTexts')
if E.private.general.minimap.enable then
tinsert(staggerTable, "UpdateMinimap")
tinsert(staggerTable, 'UpdateMinimap')
end
if ElvUIPlayerBuffs or ElvUIPlayerDebuffs then
tinsert(staggerTable, "UpdateAuras")
tinsert(staggerTable, 'UpdateAuras')
end
tinsert(staggerTable, "UpdateMisc")
tinsert(staggerTable, "UpdateEnd")
tinsert(staggerTable, 'UpdateMisc')
tinsert(staggerTable, 'UpdateEnd')
--Stagger updates
self.staggerUpdateRunning = true
......@@ -1279,10 +1275,6 @@ function E:DBConversions()
E.global.general.UIScale = G.general.UIScale
end
if gameLocale and E.global.general.locale == 'auto' then
E.global.general.locale = gameLocale
end
--Combat & Resting Icon options update
if E.db.unitframe.units.player.combatIcon ~= nil then
E.db.unitframe.units.player.CombatIcon.enable = E.db.unitframe.units.player.combatIcon
......@@ -1329,7 +1321,7 @@ function E:DBConversions()
end
end
--Convert old "Buffs and Debuffs" font size option to individual options
--Convert old 'Buffs and Debuffs' font size option to individual options
if E.db.auras.fontSize then
local fontSize = E.db.auras.fontSize
E.db.auras.buffs.countFontSize = fontSize
......
This diff is collapsed.
......@@ -29,7 +29,7 @@ end
function E:DropDown(list, frame, xOffset, yOffset)
if not frame.buttons then
frame.buttons = {}
frame:SetFrameStrata("DIALOG")
frame:SetFrameStrata('DIALOG')
frame:SetClampedToScreen(true)
tinsert(_G.UISpecialFrames, frame:GetName())
frame:Hide()
......@@ -44,21 +44,21 @@ function E:DropDown(list, frame, xOffset, yOffset)
for i=1, #list do
if not frame.buttons[i] then
frame.buttons[i] = CreateFrame("Button", nil, frame)
frame.buttons[i] = CreateFrame('Button', nil, frame)
frame.buttons[i].hoverTex = frame.buttons[i]:CreateTexture(nil, 'OVERLAY')
frame.buttons[i].hoverTex:SetAllPoints()
frame.buttons[i].hoverTex:SetTexture([[Interface\QuestFrame\UI-QuestTitleHighlight]])
frame.buttons[i].hoverTex:SetBlendMode("ADD")
frame.buttons[i].hoverTex:SetBlendMode('ADD')
frame.buttons[i].hoverTex:Hide()
frame.buttons[i].text = frame.buttons[i]:CreateFontString(nil, 'BORDER')
frame.buttons[i].text:SetAllPoints()
frame.buttons[i].text:FontTemplate(nil, nil, "")
frame.buttons[i].text:SetJustifyH("LEFT")
frame.buttons[i].text:FontTemplate(nil, nil, '')
frame.buttons[i].text:SetJustifyH('LEFT')
frame.buttons[i]:SetScript("OnEnter", OnEnter)
frame.buttons[i]:SetScript("OnLeave", OnLeave)
frame.buttons[i]:SetScript('OnEnter', OnEnter)
frame.buttons[i]:SetScript('OnLeave', OnLeave)
end
frame.buttons[i]:Show()
......@@ -66,12 +66,12 @@ function E:DropDown(list, frame, xOffset, yOffset)
frame.buttons[i]:Width(BUTTON_WIDTH)
frame.buttons[i].text:SetText(list[i].text)
frame.buttons[i].func = list[i].func
frame.buttons[i]:SetScript("OnClick", OnClick)
frame.buttons[i]:SetScript('OnClick', OnClick)
if i == 1 then
frame.buttons[i]:Point("TOPLEFT", frame, "TOPLEFT", PADDING, -PADDING)
frame.buttons[i]:Point('TOPLEFT', frame, 'TOPLEFT', PADDING, -PADDING)
else
frame.buttons[i]:Point("TOPLEFT", frame.buttons[i-1], "BOTTOMLEFT")
frame.buttons[i]:Point('TOPLEFT', frame.buttons[i-1], 'BOTTOMLEFT')
end
end
......@@ -83,7 +83,7 @@ function E:DropDown(list, frame, xOffset, yOffset)
x = x/UIScale
y = y/UIScale
frame:ClearAllPoints()
frame:Point("TOPLEFT", _G.UIParent, "BOTTOMLEFT", x + xOffset, y + yOffset)
frame:Point('TOPLEFT', _G.UIParent, 'BOTTOMLEFT', x + xOffset, y + yOffset)
ToggleFrame(frame)
end
......@@ -27,15 +27,15 @@ function E:UpdateBlizzardFonts()
_G.CHAT_FONT_HEIGHTS = {6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20}
if self.db.general.font == "Homespun" then
if self.db.general.font == 'Homespun' then
MONOCHROME = 'MONOCHROME'
end
if self.eyefinity then
SetCVar("floatingcombattextcombatlogperiodicspells",0)
SetCVar("floatingcombattextpetmeleedamage",0)
SetCVar("floatingcombattextcombatdamage",0)
SetCVar("floatingcombattextcombathealing",0)
SetCVar('floatingcombattextcombatlogperiodicspells',0)
SetCVar('floatingcombattextpetmeleedamage',0)
SetCVar('floatingcombattextcombatdamage',0)
SetCVar('floatingcombattextcombathealing',0)
-- set an invisible font for xp, honor kill, etc
COMBAT = E.Media.Fonts.Invisible
......@@ -52,7 +52,7 @@ function E:UpdateBlizzardFonts()
SetFont(_G.AchievementFont_Small, NORMAL, self.db.general.fontSize) -- Achiev dates
SetFont(_G.BossEmoteNormalHuge, NORMAL, 24) -- Talent Title
SetFont(_G.ChatBubbleFont, BUBBLE, self.private.general.chatBubbleFontSize, self.private.general.chatBubbleFontOutline)
SetFont(_G.CombatTextFont, COMBAT, 200, "OUTLINE") -- number here just increase the font quality.
SetFont(_G.CombatTextFont, COMBAT, 200, 'OUTLINE') -- number here just increase the font quality.
SetFont(_G.CoreAbilityFont, NORMAL, 26) -- Core abilities(title)
SetFont(_G.DestinyFontHuge, NORMAL, 20, nil, SHADOWCOLOR, BIGOFFSET) -- Garrison Mission Report
SetFont(_G.DestinyFontMed, NORMAL, 14) -- Added in 7.3.5 used for ?
......@@ -83,15 +83,15 @@ function E:UpdateBlizzardFonts()
SetFont(_G.InvoiceFont_Med, NORMAL, 12) -- Mail
SetFont(_G.InvoiceFont_Small, NORMAL, self.db.general.fontSize) -- Mail
SetFont(_G.MailFont_Large, NORMAL, 14) -- Mail
SetFont(_G.NumberFont_Outline_Huge, NUMBER, 28, MONOCHROME.."THICKOUTLINE", 28)
SetFont(_G.NumberFont_Outline_Large, NUMBER, 15, MONOCHROME.."OUTLINE")
SetFont(_G.NumberFont_Outline_Med, NUMBER, self.db.general.fontSize*1.1, "OUTLINE")
SetFont(_G.NumberFont_OutlineThick_Mono_Small, NUMBER, self.db.general.fontSize, "OUTLINE")
SetFont(_G.NumberFont_Outline_Huge, NUMBER, 28, MONOCHROME..'THICKOUTLINE', 28)
SetFont(_G.NumberFont_Outline_Large, NUMBER, 15, MONOCHROME..'OUTLINE')
SetFont(_G.NumberFont_Outline_Med, NUMBER, self.db.general.fontSize*1.1, 'OUTLINE')
SetFont(_G.NumberFont_OutlineThick_Mono_Small, NUMBER, self.db.general.fontSize, 'OUTLINE')
SetFont(_G.NumberFont_Shadow_Med, NORMAL, self.db.general.fontSize) -- Chat EditBox
SetFont(_G.NumberFont_Shadow_Small, NORMAL, self.db.general.fontSize)
SetFont(_G.NumberFontNormalSmall, NORMAL, 11, "OUTLINE") -- Calendar, EncounterJournal
SetFont(_G.PVPArenaTextString, NORMAL, 22, MONOCHROME.."OUTLINE")
SetFont(_G.PVPInfoTextString, NORMAL, 22, MONOCHROME.."OUTLINE")
SetFont(_G.NumberFontNormalSmall, NORMAL, 11, 'OUTLINE') -- Calendar, EncounterJournal
SetFont(_G.PVPArenaTextString, NORMAL, 22, MONOCHROME..'OUTLINE')
SetFont(_G.PVPInfoTextString, NORMAL, 22, MONOCHROME..'OUTLINE')
SetFont(_G.QuestFont, NORMAL, self.db.general.fontSize)
SetFont(_G.QuestFont_Enormous, NORMAL, 24, nil, SHADOWCOLOR, NORMALOFFSET) -- Garrison Titles
SetFont(_G.QuestFont_Huge, NORMAL, 15, nil, SHADOWCOLOR, BIGOFFSET) -- Quest rewards title(Rewards)
......@@ -100,31 +100,31 @@ function E:UpdateBlizzardFonts()
SetFont(_G.QuestFont_Shadow_Small, NORMAL, 14, nil, SHADOWCOLOR, NORMALOFFSET)
SetFont(_G.QuestFont_Super_Huge, NORMAL, 22, nil, SHADOWCOLOR, BIGOFFSET)
SetFont(_G.ReputationDetailFont, NORMAL, self.db.general.fontSize) -- Rep Desc when clicking a rep
SetFont(_G.SubZoneTextFont, NORMAL, 24, MONOCHROME.."OUTLINE") -- World Map(SubZone)
SetFont(_G.SubZoneTextString, NORMAL, 25, MONOCHROME.."OUTLINE")
SetFont(_G.SubZoneTextFont, NORMAL, 24, MONOCHROME..'OUTLINE') -- World Map(SubZone)
SetFont(_G.SubZoneTextString, NORMAL, 25, MONOCHROME..'OUTLINE')
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_Med1, NORMAL, self.db.general.fontSize)
SetFont(_G.SystemFont_Med3, NORMAL, self.db.general.fontSize*1.1)
SetFont(_G.SystemFont_Outline, NORMAL, 13, MONOCHROME.."OUTLINE") -- Pet level on World map
SetFont(_G.SystemFont_Outline_Small, NUMBER, self.db.general.fontSize, "OUTLINE")
SetFont(_G.SystemFont_OutlineThick_Huge2, NORMAL, 20, MONOCHROME.."THICKOUTLINE")
SetFont(_G.SystemFont_OutlineThick_WTF, NORMAL, 32, MONOCHROME.."OUTLINE") -- World Map
SetFont(_G.SystemFont_Shadow_Huge1, NORMAL, 20, MONOCHROME.."OUTLINE") -- Raid Warning, Boss emote frame too
SetFont(_G.SystemFont_Outline, NORMAL, 13, MONOCHROME..'OUTLINE') -- Pet level on World map
SetFont(_G.SystemFont_Outline_Small, NUMBER, self.db.general.fontSize, 'OUTLINE')
SetFont(_G.SystemFont_OutlineThick_Huge2, NORMAL, 20, MONOCHROME..'THICKOUTLINE')
SetFont(_G.SystemFont_OutlineThick_WTF, NORMAL, 32, MONOCHROME..'OUTLINE') -- World Map
SetFont(_G.SystemFont_Shadow_Huge1, NORMAL, 20, MONOCHROME..'OUTLINE') -- Raid Warning, Boss emote frame too
SetFont(_G.SystemFont_Shadow_Huge3, NORMAL, 22, nil, SHADOWCOLOR, BIGOFFSET) -- FlightMap
SetFont(_G.SystemFont_Shadow_Large, NORMAL, 15)
SetFont(_G.SystemFont_Shadow_Large_Outline, NUMBER, 20, "OUTLINE")
SetFont(_G.SystemFont_Shadow_Large_Outline, NUMBER, 20, 'OUTLINE')
SetFont(_G.SystemFont_Shadow_Med1, NORMAL, self.db.general.fontSize)
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, self.db.general.fontSize*1.1)