Skip to content

GitLab

Commit 5c54926f authored by Simpy's avatar Simpy 🐹
Browse files
Options

12.08

parents cd83c73d a76f0d75
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 54 deletions
ElvUI/Core/API.lua
View file @ 5c54926f
......@@ -492,6 +492,9 @@ function E:PLAYER_ENTERING_WORLD(_, initLogin, isReload)
end
if initLogin or isReload then
self:RegisterEvent('UI_SCALE_CHANGED', 'PixelScaleChanged')
self:UIScale()
self:CheckIncompatible()
end
......@@ -594,7 +597,6 @@ function E:LoadAPI()
E:RegisterEvent('PLAYER_SPECIALIZATION_CHANGED', 'CheckRole')
E:RegisterEvent('UNIT_ENTERED_VEHICLE', 'EnterVehicleHideFrames')
E:RegisterEvent('UNIT_EXITED_VEHICLE', 'ExitVehicleShowFrames')
E:RegisterEvent('UI_SCALE_CHANGED', 'PixelScaleChanged')
do -- setup cropIcon texCoords
local opt = E.db.general.cropIcon
......
ElvUI/Core/Core.lua
View file @ 5c54926f
......@@ -1796,7 +1796,6 @@ function E:Initialize()
if not E.db.unitframe.thinBorders then P.unitframe.colors.borderColor = { r = 0.1, g = 0.1, b = 0.1 } end
E:DBConversions()
E:UIScale()
E:BuildPrefixValues()
E:LoadAPI()
E:LoadCommands()
......
ElvUI/Core/Fonts.lua
View file @ 5c54926f
......@@ -61,7 +61,7 @@ function E:UpdateBlizzardFonts()
SetFont(_G.ChatBubbleFont, BUBBLE, E.private.general.chatBubbleFontSize, E.private.general.chatBubbleFontOutline) -- 13
SetFont(_G.AchievementFont_Small, NORMAL, unified or small) -- 10 Achiev dates
SetFont(_G.BossEmoteNormalHuge, NORMAL, 25) -- Talent Title
SetFont(_G.CoreAbilityFont, NORMAL, 28) -- 32 Core abilities(title)
SetFont(_G.CoreAbilityFont, NORMAL, 26) -- 32 Core abilities(title)
SetFont(_G.DestinyFontHuge, NORMAL, 32) -- Garrison Mission Report
SetFont(_G.DestinyFontMed, NORMAL, 14) -- Added in 7.3.5 used for ?
SetFont(_G.Fancy12Font, NORMAL, 12) -- Added in 7.3.5 used for ?
......@@ -90,17 +90,17 @@ function E:UpdateBlizzardFonts()
SetFont(_G.Game60Font, NORMAL, 60)
SetFont(_G.Game72Font, NORMAL, 72)
SetFont(_G.GameFont_Gigantic, NORMAL, 32) -- Used at the install steps
SetFont(_G.GameFontHighlightMedium, NORMAL, unified or medium) -- 14 Fix QuestLog Title mouseover
SetFont(_G.GameFontHighlightMedium, NORMAL, unified and 15 or medium) -- 14 Fix QuestLog Title mouseover
SetFont(_G.GameFontHighlightSmall2, NORMAL, unified or small) -- 11 Skill or Recipe description on TradeSkill frame
SetFont(_G.GameFontNormalHuge2, NORMAL, unified or huge) -- 24 Mythic weekly best dungeon name
SetFont(_G.GameFontNormalLarge, NORMAL, unified or large) -- 16
SetFont(_G.GameFontNormalLarge2, NORMAL, unified or large) -- 18 Garrison Follower Names
SetFont(_G.GameFontNormalMed1, NORMAL, unified or size) -- 13 WoW Token Info
SetFont(_G.GameFontNormalMed2, NORMAL, unified or size) -- 14 Quest tracker
SetFont(_G.GameFontNormalMed3, NORMAL, unified or size) -- 14
SetFont(_G.GameFontNormalSmall2, NORMAL, unified or small) -- 11 MissionUI Followers names
SetFont(_G.GameFontNormalHuge2, NORMAL, unified and 24 or huge) -- 24 Mythic weekly best dungeon name
SetFont(_G.GameFontNormalLarge, NORMAL, unified and 16 or large) -- 16
SetFont(_G.GameFontNormalLarge2, NORMAL, unified and 15 or large) -- 18 Garrison Follower Names
SetFont(_G.GameFontNormalMed1, NORMAL, unified and 14 or size) -- 13 WoW Token Info
SetFont(_G.GameFontNormalMed2, NORMAL, unified and 14 or size) -- 14 Quest tracker
SetFont(_G.GameFontNormalMed3, NORMAL, unified and 15 or size) -- 14
SetFont(_G.GameFontNormalSmall2, NORMAL, unified and 12 or small) -- 11 MissionUI Followers names
SetFont(_G.GameTooltipHeader, NORMAL, unified or size) -- 14
SetFont(_G.InvoiceFont_Med, NORMAL, unified or size) -- 12 Mail
SetFont(_G.InvoiceFont_Med, NORMAL, unified and 12 or size) -- 12 Mail
SetFont(_G.InvoiceFont_Small, NORMAL, unified or small) -- 10 Mail
SetFont(_G.MailFont_Large, NORMAL, 14) -- Mail
SetFont(_G.Number11Font, NORMAL, 11)
......@@ -116,23 +116,23 @@ function E:UpdateBlizzardFonts()
SetFont(_G.Number15Font, NORMAL, 15)
SetFont(_G.Number18Font, NUMBER, 18)
SetFont(_G.Number18FontWhite, NUMBER, 18)
SetFont(_G.NumberFont_Outline_Huge, NUMBER, unified or huge, thick) -- 30
SetFont(_G.NumberFont_Outline_Large, NUMBER, unified or large, outline) -- 16
SetFont(_G.NumberFont_Outline_Med, NUMBER, unified or medium, 'OUTLINE') -- 14
SetFont(_G.NumberFont_Outline_Huge, NUMBER, unified and 28 or huge, thick) -- 30
SetFont(_G.NumberFont_Outline_Large, NUMBER, unified and 15 or large, outline) -- 16
SetFont(_G.NumberFont_Outline_Med, NUMBER, unified and 14 or medium, 'OUTLINE') -- 14
SetFont(_G.NumberFont_OutlineThick_Mono_Small, NUMBER, unified or size, 'OUTLINE') -- 12
SetFont(_G.NumberFont_Shadow_Med, NORMAL, unified or medium) -- 14 Chat EditBox
SetFont(_G.NumberFont_Shadow_Small, NORMAL, unified or small) -- 12
SetFont(_G.NumberFontNormalSmall, NORMAL, unified or small, 'OUTLINE') -- 12 Calendar, EncounterJournal
SetFont(_G.NumberFontNormalSmall, NORMAL, unified and 11 or small, 'OUTLINE') -- 12 Calendar, EncounterJournal
SetFont(_G.PriceFont, NORMAL, 14)
SetFont(_G.PVPArenaTextString, NORMAL, 22, outline)
SetFont(_G.PVPInfoTextString, NORMAL, 22, outline)
SetFont(_G.QuestFont, NORMAL, unified or size) -- 13
SetFont(_G.QuestFont_Enormous, NORMAL, unified or enormous) -- 30 Garrison Titles
SetFont(_G.QuestFont_Huge, NORMAL, unified or huge) -- 18 Quest rewards title(Rewards)
SetFont(_G.QuestFont_Large, NORMAL, unified or large) -- 14
SetFont(_G.QuestFont_Shadow_Huge, NORMAL, unified or huge) -- 18 Quest Title
SetFont(_G.QuestFont_Shadow_Small, NORMAL, unified or small) -- 14
SetFont(_G.QuestFont_Super_Huge, NORMAL, unified or mega) -- 24
SetFont(_G.QuestFont_Enormous, NORMAL, unified and 24 or enormous) -- 30 Garrison Titles
SetFont(_G.QuestFont_Huge, NORMAL, unified and 15 or huge) -- 18 Quest rewards title(Rewards)
SetFont(_G.QuestFont_Large, NORMAL, unified and 14 or large) -- 14
SetFont(_G.QuestFont_Shadow_Huge, NORMAL, unified and 15 or huge) -- 18 Quest Title
SetFont(_G.QuestFont_Shadow_Small, NORMAL, unified and 14 or small) -- 14
SetFont(_G.QuestFont_Super_Huge, NORMAL, unified and 22 or mega) -- 24
SetFont(_G.ReputationDetailFont, NORMAL, unified or size) -- 10 Rep Desc when clicking a rep
SetFont(_G.SpellFont_Small, NORMAL, 10)
SetFont(_G.SubSpellFont, NORMAL, 10) -- Spellbook Sub Names
......@@ -142,25 +142,25 @@ function E:UpdateBlizzardFonts()
SetFont(_G.SystemFont_Huge1_Outline, NORMAL, 18, outline) -- 20 Garrison Mission Chance
SetFont(_G.SystemFont_Large, NORMAL, 16)
SetFont(_G.SystemFont_Med1, NORMAL, unified or size) -- 12
SetFont(_G.SystemFont_Med3, NORMAL, unified or medium) -- 14
SetFont(_G.SystemFont_Outline, NORMAL, unified or size, outline) -- 13 Pet level on World map
SetFont(_G.SystemFont_Med3, NORMAL, unified and 14 or medium) -- 14
SetFont(_G.SystemFont_Outline, NORMAL, unified and 13 or size, outline) -- 13 Pet level on World map
SetFont(_G.SystemFont_Outline_Small, NUMBER, unified or small, 'OUTLINE') -- 10
SetFont(_G.SystemFont_OutlineThick_Huge2, NORMAL, unified or huge, thick) -- 22
SetFont(_G.SystemFont_OutlineThick_WTF, NORMAL, unified or enormous, outline) -- 32 World Map
SetFont(_G.SystemFont_OutlineThick_Huge2, NORMAL, unified and 20 or huge, thick) -- 22
SetFont(_G.SystemFont_OutlineThick_WTF, NORMAL, unified and 32 or enormous, outline) -- 32 World Map
SetFont(_G.SystemFont_Shadow_Huge1, NORMAL, 20, outline) -- Raid Warning, Boss emote frame too
SetFont(_G.SystemFont_Shadow_Huge3, NORMAL, 25) -- FlightMap
SetFont(_G.SystemFont_Shadow_Huge3, NORMAL, 24) -- 25 FlightMap
SetFont(_G.SystemFont_Shadow_Huge4, NORMAL, 27, nil, nil, nil, nil, nil, 1, -1)
SetFont(_G.SystemFont_Shadow_Large, NORMAL, 16)
SetFont(_G.SystemFont_Shadow_Large2, NORMAL, 18) -- Auction House ItemDisplay
SetFont(_G.SystemFont_Shadow_Large_Outline, NUMBER, 16, 'OUTLINE')
SetFont(_G.SystemFont_Shadow_Large_Outline, NUMBER, 18, 'OUTLINE') -- 16
SetFont(_G.SystemFont_Shadow_Med1, NORMAL, unified or size) -- 12
SetFont(_G.SystemFont_Shadow_Med2, NORMAL, unified or medium) -- 14 Shows Order resourses on OrderHallTalentFrame
SetFont(_G.SystemFont_Shadow_Med3, NORMAL, unified or medium) -- 14
SetFont(_G.SystemFont_Shadow_Small, NORMAL, unified or small) -- 10
SetFont(_G.SystemFont_Small, NORMAL, unified or small) -- 10
SetFont(_G.SystemFont_Shadow_Med2, NORMAL, unified and 15 or medium) -- 14 Shows Order resourses on OrderHallTalentFrame
SetFont(_G.SystemFont_Shadow_Med3, NORMAL, unified and 15 or medium) -- 14
SetFont(_G.SystemFont_Shadow_Small, NORMAL, unified and 15 or small) -- 10
SetFont(_G.SystemFont_Small, NORMAL, unified and 13 or small) -- 10
SetFont(_G.SystemFont_Tiny, NORMAL, unified or tiny) -- 09
SetFont(_G.Tooltip_Med, NORMAL, unified or size) -- 12
SetFont(_G.Tooltip_Small, NORMAL, unified or small) -- 10
SetFont(_G.ZoneTextString, NORMAL, unified or enormous, outline) -- 32
SetFont(_G.ZoneTextString, NORMAL, unified and 32 or enormous, outline) -- 32
end
end
ElvUI/Core/Toolkit.lua
View file @ 5c54926f
......@@ -147,7 +147,7 @@ local function SetTemplate(frame, template, glossTex, ignoreUpdates, forcePixelM
frame:SetBackdropColor(backdropr, backdropg, backdropb, frame.customBackdropAlpha or (template == 'Transparent' and backdropa) or 1)
end
local notPixelMode = not isUnitFrameElement and not E.PixelMode
local notPixelMode = not isUnitFrameElement and not isNamePlateElement and not E.PixelMode
local notThinBorders = (isUnitFrameElement and not UF.thinBorders) or (isNamePlateElement and not NP.thinBorders)
if (notPixelMode or notThinBorders) and not forcePixelMode then
local backdrop = {
......@@ -195,10 +195,9 @@ local function CreateBackdrop(frame, template, glossTex, ignoreUpdates, forcePix
if forcePixelMode then
backdrop:SetOutside(frame, E.twoPixelsPlease and 2 or 1, E.twoPixelsPlease and 2 or 1)
elseif isUnitFrameElement then
backdrop:SetOutside(frame, UF.BORDER, UF.BORDER)
else
backdrop:SetOutside(frame)
local border = (isUnitFrameElement and UF.BORDER) or (isNamePlateElement and NP.BORDER)
backdrop:SetOutside(frame, border, border)
end
backdrop:SetTemplate(template, glossTex, ignoreUpdates, forcePixelMode, isUnitFrameElement, isNamePlateElement)
......
ElvUI/ElvUI.toc
View file @ 5c54926f
## Interface: 90001
## Author: Elv, Simpy
## Version: 12.07
## Version: 12.08
## Title: |cff1784d1ElvUI|r
## Notes: User Interface replacement AddOn for World of Warcraft.
## SavedVariables: ElvDB, ElvPrivateDB
......
ElvUI/Modules/Bags/Bags.lua
View file @ 5c54926f
......@@ -45,7 +45,6 @@ local GetScreenWidth, GetScreenHeight = GetScreenWidth, GetScreenHeight
local IsBagOpen, IsOptionFrameOpen = IsBagOpen, IsOptionFrameOpen
local IsInventoryItemProfessionBag = IsInventoryItemProfessionBag
local IsReagentBankUnlocked = IsReagentBankUnlocked
local IsAddOnLoaded = IsAddOnLoaded
local IsShiftKeyDown, IsControlKeyDown = IsShiftKeyDown, IsControlKeyDown
local PickupContainerItem = PickupContainerItem
local PlaySound = PlaySound
......@@ -386,7 +385,7 @@ function B:UpdateItemUpgradeIcon(slot)
local itemIsUpgrade, containerID, slotID = nil, slot:GetParent():GetID(), slot:GetID()
-- We need to use the Pawn function here to show actually the icon, as Blizzard API doesnt seem to work.
if IsAddOnLoaded('Pawn') then itemIsUpgrade = _G.PawnIsContainerItemAnUpgrade(containerID, slotID) end
if _G.PawnIsContainerItemAnUpgrade then itemIsUpgrade = _G.PawnIsContainerItemAnUpgrade(containerID, slotID) end
-- Pawn author suggests to fallback to Blizzard API anyways.
if itemIsUpgrade == nil then itemIsUpgrade = _G.IsContainerItemAnUpgrade(containerID, slotID) end
......
ElvUI/Modules/Blizzard/TalkingHeadFrame.lua
View file @ 5c54926f
......@@ -3,7 +3,6 @@ local B = E:GetModule('Blizzard')
local _G = _G
local ipairs, tremove = ipairs, tremove
local IsAddOnLoaded = IsAddOnLoaded
function B:ScaleTalkingHeadFrame()
local scale = E.db.general.talkingHeadFrameScale or 1
......@@ -46,20 +45,18 @@ local function InitializeTalkingHead()
end
end
local function LoadTalkingHead(event)
B:UnregisterEvent(event)
_G.TalkingHead_LoadUI()
local function LoadTalkingHead()
if not _G.TalkingHeadFrame then
_G.TalkingHead_LoadUI()
end
InitializeTalkingHead()
B:ScaleTalkingHeadFrame()
end
function B:PositionTalkingHead()
if IsAddOnLoaded('Blizzard_TalkingHeadUI') then
InitializeTalkingHead()
B:ScaleTalkingHeadFrame()
else --We want the mover to be available immediately, so we load it ourselves
B:RegisterEvent('PLAYER_ENTERING_WORLD', LoadTalkingHead)
end
if not E:IsAddOnEnabled('Blizzard_TalkingHeadUI') then return end
-- wait until first frame, then load talking head (if it isnt yet) and spawn the mover
E:Delay(1, LoadTalkingHead)
end
ElvUI/Modules/Nameplates/Nameplates.lua
View file @ 5c54926f
......@@ -752,9 +752,12 @@ function NP:Initialize()
NP.db = E.db.nameplates
if E.private.nameplates.enable ~= true then return end
NP.thinBorders = NP.db.thinBorders
NP.Initialized = true
NP.thinBorders = NP.db.thinBorders
NP.SPACING = (NP.thinBorders or E.twoPixelsPlease) and 0 or 1
NP.BORDER = (NP.thinBorders and not E.twoPixelsPlease) and 1 or 2
ElvUF:RegisterStyle('ElvNP', function(frame, unit) NP:Style(frame, unit) end)
ElvUF:SetActiveStyle('ElvNP')
......
ElvUI/Settings/Private.lua
View file @ 5c54926f
......@@ -19,7 +19,7 @@ V.general = {
replaceNameFont = true,
replaceCombatFont = true,
replaceBlizzFonts = true,
unifiedBlizzFonts = true,
unifiedBlizzFonts = false,
totemBar = true,
minimap = {
enable = true,
......
ElvUI_OptionsUI/General.lua
View file @ 5c54926f
......@@ -346,7 +346,7 @@ E.Options.args.general = {
order = 6,
type = 'toggle',
name = L["Unified Font Sizes"],
desc = L["Let the Replace Blizzard Fonts setting use the General Font Size setting. With this off the Fonts will Scale based on General Font Size to Blizzard's Font Size Scheme."],
desc = L["This setting mimics the older style of Replace Blizzard Fonts, with a more static unified font sizing."],
get = function(info) return E.private.general[info[#info]] end,
set = function(info, value) E.private.general[info[#info]] = value; E:UpdateBlizzardFonts() end,
},
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment