Skip to content

Commit

Permalink
13.49
Browse files Browse the repository at this point in the history
  • Loading branch information
kodewdle committed Nov 14, 2023
2 parents a46361b + c142d90 commit 54cf2bd
Show file tree
Hide file tree
Showing 92 changed files with 1,501 additions and 1,190 deletions.
834 changes: 424 additions & 410 deletions CHANGELOG.md

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions ElvUI/Classic/Modules/Skins/AddonManager.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ local E, L, V, P, G = unpack(ElvUI)
local S = E:GetModule('Skins')

local _G = _G
local GetNumAddOns = GetNumAddOns
local GetAddOnInfo = GetAddOnInfo
local GetAddOnEnableState = GetAddOnEnableState
local UIDropDownMenu_GetSelectedValue = UIDropDownMenu_GetSelectedValue
local hooksecurefunc = hooksecurefunc

local GetAddOnEnableState = (C_AddOns and C_AddOns.GetAddOnEnableState) or GetAddOnEnableState
local GetAddOnInfo = (C_AddOns and C_AddOns.GetAddOnInfo) or GetAddOnInfo
local GetNumAddOns = (C_AddOns and C_AddOns.GetNumAddOns) or GetNumAddOns

function S:AddonList()
if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.addonManager) then return end

Expand Down
2 changes: 1 addition & 1 deletion ElvUI/Classic/Modules/Skins/Character.lua
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function S:CharacterFrame()
HandleResistanceFrame('MagicResFrame')

for _, slot in pairs({ _G.PaperDollItemsFrame:GetChildren() }) do
if slot:IsObjectType('Button') then
if slot:IsObjectType('Button') and slot.Count then
local name = slot:GetName()
local icon = _G[name..'IconTexture']
local cooldown = _G[name..'Cooldown']
Expand Down
4 changes: 3 additions & 1 deletion ElvUI/Classic/Modules/Skins/Debug.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ local TT = E:GetModule('Tooltip')
local _G = _G
local hooksecurefunc = hooksecurefunc

local IsAddOnLoaded = (C_AddOns and C_AddOns.IsAddOnLoaded) or IsAddOnLoaded

local FrameTexs = {
'TopLeft',
'TopRight',
Expand Down Expand Up @@ -119,7 +121,7 @@ end
S:AddCallback('ScriptErrorsFrame')

-- FrameStack, TableInspect Skins
if _G.IsAddOnLoaded('Blizzard_DebugTools') then
if IsAddOnLoaded('Blizzard_DebugTools') then
S:AddCallback('Blizzard_DebugTools')
else
S:AddCallbackForAddon('Blizzard_DebugTools')
Expand Down
14 changes: 0 additions & 14 deletions ElvUI/Classic/Modules/Skins/Talent.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ local S = E:GetModule('Skins')

local _G = _G
local unpack = unpack
local hooksecurefunc = hooksecurefunc

local MAX_TALENT_TABS = MAX_TALENT_TABS

Expand All @@ -23,19 +22,6 @@ function S:Blizzard_TalentUI()
_G.PlayerTalentFrameTab2:Point('TOPLEFT', _G.PlayerTalentFrameTab1, 'TOPRIGHT', -19, 0)
_G.PlayerTalentFrameTab3:Point('TOPLEFT', _G.PlayerTalentFrameTab2, 'TOPRIGHT', -19, 0)

_G.PlayerTalentFrameRoleButton:ClearAllPoints()
_G.PlayerTalentFrameRoleButton:Point('TOPRIGHT', _G.PlayerTalentFrameScrollFrame, 'TOPRIGHT', 0, 0)

hooksecurefunc('PlayerTalentFrameRole_UpdateRole', function(button)
local highlightTexture = button:GetHighlightTexture()
highlightTexture:ClearAllPoints()
highlightTexture:Point('TOPLEFT', button, 'TOPLEFT', 5, -5)
highlightTexture:Point('BOTTOMRIGHT', button, 'BOTTOMRIGHT', -5, 5)

button:SetHighlightTexture(E.media.normTex)
button:SetNormalTexture(E.Media.Textures.RoleIcons)
end)

for i = 1, MAX_TALENT_TABS do
local tab = _G['PlayerSpecTab'..i]
tab:GetRegions():Hide()
Expand Down
9 changes: 8 additions & 1 deletion ElvUI/Classic/Modules/Skins/WorldMap.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,18 @@ function S:WorldMapFrame()
local WorldMapFrame = _G.WorldMapFrame
WorldMapFrame:StripTextures()

WorldMapFrame.BorderFrame:SetTemplate('Transparent')
WorldMapFrame.BorderFrame:StripTextures()
WorldMapFrame.BorderFrame:CreateBackdrop('Transparent')
WorldMapFrame.BorderFrame.backdrop:Point('TOPLEFT', 0, -0.5)

WorldMapFrame.MiniBorderFrame:StripTextures()
WorldMapFrame.MiniBorderFrame:CreateBackdrop('Transparent')
WorldMapFrame.MiniBorderFrame.backdrop:Point('TOPLEFT', 6, -25)

S:HandleDropDownBox(_G.WorldMapZoneMinimapDropDown)
S:HandleDropDownBox(_G.WorldMapContinentDropDown)
S:HandleDropDownBox(_G.WorldMapZoneDropDown)
S:HandleMaxMinFrame(_G.WorldMapFrame.MaximizeMinimizeFrame)

_G.WorldMapContinentDropDown:Point('TOPLEFT', WorldMapFrame, 'TOPLEFT', 330, -35)
_G.WorldMapContinentDropDown:Width(205)
Expand Down
5 changes: 4 additions & 1 deletion ElvUI/Core/Defaults/Profile.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1474,6 +1474,7 @@ local UF_Fader = {
smooth = 0.33,
unittarget = false,
vehicle = false,
dynamicflight = false,
instanceDifficulties = {
none = false,
dungeonNormal = false,
Expand Down Expand Up @@ -2576,6 +2577,7 @@ P.actionbar = {
desaturateOnCooldown = false,
equippedItem = false,
equippedItemColor = { r = 0.4, g = 1.0, b = 0.4 },
targetReticleColor = { r = 0.2, g = 1.0, b = 0.2 },
flashAnimation = false,
flyoutSize = 32, -- match buttonsize default, blizz default is 28
font = 'Homespun',
Expand Down Expand Up @@ -2720,6 +2722,7 @@ local AB_Bar = {
alpha = 1,
inheritGlobalFade = false,
showGrid = true,
targetReticle = true,
flyoutDirection = 'AUTOMATIC',
paging = {},
countColor = { r = 1, g = 1, b = 1 },
Expand Down Expand Up @@ -2813,7 +2816,7 @@ P.actionbar.bar1.paging.ROGUE = '[bonusbar:1] 7;'..(E.Wrath and ' [bonusbar:2] 8
P.actionbar.bar1.paging.WARLOCK = E.Wrath and '[form:1] 7;' or nil
P.actionbar.bar1.paging.DRUID = '[bonusbar:1,nostealth] 7; [bonusbar:1,stealth] 8; [bonusbar:2] 10; [bonusbar:3] 9; [bonusbar:4] 10;'
P.actionbar.bar1.paging.EVOKER = '[bonusbar:1] 7;'
P.actionbar.bar1.paging.PRIEST = '[bonusbar:1] 7;'
P.actionbar.bar1.paging.PRIEST = '[bonusbar:1] 7;'..(E.Classic and ' [possessbar] 16;' or '')
P.actionbar.bar1.paging.WARRIOR = '[bonusbar:1] 7; [bonusbar:2] 8; [bonusbar:3] 9;'

P.actionbar.bar3.enabled = true
Expand Down
8 changes: 5 additions & 3 deletions ElvUI/Core/Developer/Frame.lua
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
local print, strmatch, strlower = print, strmatch, strlower
local _G, UNKNOWN, format, type, next = _G, UNKNOWN, format, type, next

local LoadAddOn = LoadAddOn
local GetAddOnInfo = GetAddOnInfo
local SlashCmdList = SlashCmdList
local GetMouseFocus = GetMouseFocus
local IsAddOnLoaded = IsAddOnLoaded
local UIParentLoadAddOn = UIParentLoadAddOn

local GetAddOnInfo = (C_AddOns and C_AddOns.GetAddOnInfo) or GetAddOnInfo
local IsAddOnLoaded = (C_AddOns and C_AddOns.IsAddOnLoaded) or IsAddOnLoaded
local LoadAddOn = (C_AddOns and C_AddOns.LoadAddOn) or LoadAddOn

-- GLOBALS: ElvUI_CPU, ElvUI

local function GetName(frame, text)
Expand Down
4 changes: 3 additions & 1 deletion ElvUI/Core/Developer/TInspect.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ local _G = _G
local next = next

local hooksecurefunc = hooksecurefunc
local IsAddOnLoaded = IsAddOnLoaded
local CreateFrame = CreateFrame

local IsAddOnLoaded = (C_AddOns and C_AddOns.IsAddOnLoaded) or IsAddOnLoaded

-- GLOBALS: ElvUI

local function OnMouseDown(self, button)
Expand Down
7 changes: 4 additions & 3 deletions ElvUI/Core/General/API.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,13 @@ local strfind, strlen, tonumber, tostring = strfind, strlen, tonumber, tostring
local hooksecurefunc = hooksecurefunc

local CreateFrame = CreateFrame
local GetAddOnEnableState = GetAddOnEnableState
local GetBattlefieldArenaFaction = GetBattlefieldArenaFaction
local GetClassInfo = GetClassInfo
local GetInstanceInfo = GetInstanceInfo
local GetNumGroupMembers = GetNumGroupMembers
local GetSpecializationInfoForSpecID = GetSpecializationInfoForSpecID
local HideUIPanel = HideUIPanel
local InCombatLockdown = InCombatLockdown
local IsAddOnLoaded = IsAddOnLoaded
local IsInRaid = IsInRaid
local IsLevelAtEffectiveMaxLevel = IsLevelAtEffectiveMaxLevel
local IsRestrictedAccount = IsRestrictedAccount
Expand All @@ -29,7 +27,6 @@ local IsVeteranTrialAccount = IsVeteranTrialAccount
local IsWargame = IsWargame
local IsXPUserDisabled = IsXPUserDisabled
local RequestBattlefieldScoreData = RequestBattlefieldScoreData
local SetCVar = SetCVar
local UIParent = UIParent
local UIParentLoadAddOn = UIParentLoadAddOn
local UnitAura = UnitAura
Expand All @@ -45,6 +42,10 @@ local UnitIsUnit = UnitIsUnit
local GetSpecialization = (E.Classic or E.Wrath) and LCS.GetSpecialization or GetSpecialization
local GetSpecializationInfo = (E.Classic or E.Wrath) and LCS.GetSpecializationInfo or GetSpecializationInfo

local GetAddOnEnableState = (C_AddOns and C_AddOns.GetAddOnEnableState) or GetAddOnEnableState
local IsAddOnLoaded = (C_AddOns and C_AddOns.IsAddOnLoaded) or IsAddOnLoaded
local SetCVar = C_CVar.SetCVar

local C_TooltipInfo_GetUnit = C_TooltipInfo and C_TooltipInfo.GetUnit
local C_TooltipInfo_GetHyperlink = C_TooltipInfo and C_TooltipInfo.GetHyperlink
local C_TooltipInfo_GetInventoryItem = C_TooltipInfo and C_TooltipInfo.GetInventoryItem
Expand Down
11 changes: 6 additions & 5 deletions ElvUI/Core/General/Commands.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ local AB = E:GetModule('ActionBars')
local type, pairs, select, tonumber = type, pairs, select, tonumber
local lower, wipe, next, print = strlower, wipe, next, print

local EnableAddOn = EnableAddOn
local GetAddOnInfo = GetAddOnInfo
local GetNumAddOns = GetNumAddOns
local DisableAddOn = DisableAddOn
local ReloadUI = ReloadUI
local SetCVar = SetCVar

local DisableAddOn = (C_AddOns and C_AddOns.DisableAddOn) or DisableAddOn
local EnableAddOn = (C_AddOns and C_AddOns.EnableAddOn) or EnableAddOn
local GetAddOnInfo = (C_AddOns and C_AddOns.GetAddOnInfo) or GetAddOnInfo
local GetNumAddOns = (C_AddOns and C_AddOns.GetNumAddOns) or GetNumAddOns
local SetCVar = C_CVar.SetCVar
-- GLOBALS: ElvUIGrid, ElvDB

function E:Grid(msg)
Expand Down
10 changes: 6 additions & 4 deletions ElvUI/Core/General/Config.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,20 @@ local pairs, tinsert, tContains = pairs, tinsert, tContains
local strmatch, strtrim, strlower = strmatch, strtrim, strlower

local CreateFrame = CreateFrame
local EnableAddOn = EnableAddOn
local GetAddOnInfo = GetAddOnInfo
local InCombatLockdown = InCombatLockdown
local IsAddOnLoaded = IsAddOnLoaded
local IsAltKeyDown = IsAltKeyDown
local IsControlKeyDown = IsControlKeyDown
local GetMouseFocus = GetMouseFocus
local LoadAddOn = LoadAddOn
local UIParent = UIParent

local EditBox_HighlightText = EditBox_HighlightText
local EditBox_ClearFocus = EditBox_ClearFocus

local EnableAddOn = (C_AddOns and C_AddOns.EnableAddOn) or EnableAddOn
local GetAddOnInfo = (C_AddOns and C_AddOns.GetAddOnInfo) or GetAddOnInfo
local IsAddOnLoaded = (C_AddOns and C_AddOns.IsAddOnLoaded) or IsAddOnLoaded
local LoadAddOn = (C_AddOns and C_AddOns.LoadAddOn) or LoadAddOn

-- GLOBALS: ElvUIMoverNudgeWindow, ElvUIMoverPopupWindow, ElvUIMoverPopupWindowDropDown

local grid
Expand Down
3 changes: 2 additions & 1 deletion ElvUI/Core/General/Cooldowns.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ local time, floor, tinsert = time, floor, tinsert

local GetTime = GetTime
local CreateFrame = CreateFrame
local IsAddOnLoaded = IsAddOnLoaded
local hooksecurefunc = hooksecurefunc

local IsAddOnLoaded = (C_AddOns and C_AddOns.IsAddOnLoaded) or IsAddOnLoaded

local ICON_SIZE = 36 --the normal size for an icon (don't change this)
local FONT_SIZE = 20 --the base font size to use at a scale of 1
local MIN_SCALE = 0.5 --the minimum scale we want to show cooldown counts at, anything below this will be hidden
Expand Down
10 changes: 6 additions & 4 deletions ElvUI/Core/General/Core.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,8 @@ local assert, type, pcall, xpcall, next, print = assert, type, pcall, xpcall, ne
local rawget, rawset, setmetatable = rawget, rawset, setmetatable

local CreateFrame = CreateFrame
local DisableAddOn = DisableAddOn
local GetAddOnEnableState = GetAddOnEnableState
local GetBindingKey = GetBindingKey
local GetCurrentBindingSet = GetCurrentBindingSet
local GetCVarBool = GetCVarBool
local GetNumGroupMembers = GetNumGroupMembers
local GetSpellInfo = GetSpellInfo
local InCombatLockdown = InCombatLockdown
Expand All @@ -31,10 +28,15 @@ local UnitGUID = UnitGUID

local GetSpecialization = (E.Classic or E.Wrath) and LCS.GetSpecialization or GetSpecialization

local DisableAddOn = (C_AddOns and C_AddOns.DisableAddOn) or DisableAddOn
local GetAddOnEnableState = (C_AddOns and C_AddOns.GetAddOnEnableState) or GetAddOnEnableState
local GetAddOnMetadata = (C_AddOns and C_AddOns.GetAddOnMetadata) or GetAddOnMetadata
local GetCVarBool = C_CVar.GetCVarBool

local LE_PARTY_CATEGORY_HOME = LE_PARTY_CATEGORY_HOME
local LE_PARTY_CATEGORY_INSTANCE = LE_PARTY_CATEGORY_INSTANCE
local C_ChatInfo_SendAddonMessage = C_ChatInfo.SendAddonMessage
local GetAddOnMetadata = C_AddOns and C_AddOns.GetAddOnMetadata or GetAddOnMetadata

-- GLOBALS: ElvCharacterDB

--Modules
Expand Down
4 changes: 2 additions & 2 deletions ElvUI/Core/General/Fonts.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ local strsub = strsub
local strmatch = strmatch

local FontMap = {
worldzone = { object = _G.ZoneTextString },
worldsubzone = { object = _G.SubZoneTextString },
worldzone = { object = _G.ZoneTextFont },
worldsubzone = { object = _G.SubZoneTextFont },
pvpzone = { object = _G.PVPArenaTextString },
pvpsubzone = { object = _G.PVPInfoTextString },
cooldown = { object = _G.SystemFont_Shadow_Large_Outline },
Expand Down
4 changes: 3 additions & 1 deletion ElvUI/Core/General/Install.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ local format = format
local strsub = strsub
local tinsert = tinsert

local SetCVar = SetCVar
local ReloadUI = ReloadUI
local PlaySound = PlaySound
local CreateFrame = CreateFrame
Expand All @@ -33,9 +32,12 @@ local VoiceTranscriptionFrame_UpdateEditBox = VoiceTranscriptionFrame_UpdateEdit
local VoiceTranscriptionFrame_UpdateVisibility = VoiceTranscriptionFrame_UpdateVisibility
local VoiceTranscriptionFrame_UpdateVoiceTab = VoiceTranscriptionFrame_UpdateVoiceTab

local SetCVar = C_CVar.SetCVar

local CLASS, CONTINUE, PREVIOUS = CLASS, CONTINUE, PREVIOUS
local LOOT, GENERAL, TRADE = LOOT, GENERAL, TRADE
local GUILD_EVENT_LOG = GUILD_EVENT_LOG

-- GLOBALS: ElvUIInstallFrame

local CURRENT_PAGE = 0
Expand Down
3 changes: 2 additions & 1 deletion ElvUI/Core/General/ItemLevel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ local GetAverageItemLevel = GetAverageItemLevel
local GetInspectSpecialization = GetInspectSpecialization
local GetInventoryItemTexture = GetInventoryItemTexture
local GetInventoryItemLink = GetInventoryItemLink
local GetCVarBool = GetCVarBool
local GetItemInfo = GetItemInfo
local UIParent = UIParent
local UnitIsUnit = UnitIsUnit
Expand All @@ -20,6 +19,8 @@ local RETRIEVING_ITEM_INFO = RETRIEVING_ITEM_INFO
local ITEM_SPELL_TRIGGER_ONEQUIP = ITEM_SPELL_TRIGGER_ONEQUIP
local ESSENCE_DESCRIPTION = GetSpellDescription(277253)

local GetCVarBool = C_CVar.GetCVarBool

local MATCH_ITEM_LEVEL = ITEM_LEVEL:gsub('%%d', '(%%d+)')
local MATCH_ITEM_LEVEL_ALT = ITEM_LEVEL_ALT:gsub('%%d(%s?)%(%%d%)', '%%d+%1%%((%%d+)%%)')
local MATCH_ENCHANT = ENCHANTED_TOOLTIP_LINE:gsub('%%s', '(.+)')
Expand Down
13 changes: 7 additions & 6 deletions ElvUI/Core/General/StaticPopups.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,23 @@ local tremove, tContains, tinsert, wipe = tremove, tContains, tinsert, wipe
local format, error, ipairs, ceil = format, error, ipairs, ceil

local CreateFrame = CreateFrame
local IsAddOnLoaded = IsAddOnLoaded
local DeleteCursorItem = DeleteCursorItem
local MoneyFrame_Update = MoneyFrame_Update
local UnitIsDeadOrGhost, InCinematic = UnitIsDeadOrGhost, InCinematic
local PurchaseSlot, GetBankSlotCost = PurchaseSlot, GetBankSlotCost
local SetCVar, EnableAddOn, DisableAddOn = SetCVar, EnableAddOn, DisableAddOn
local ReloadUI, PlaySound, StopMusic = ReloadUI, PlaySound, StopMusic
local StaticPopup_Resize = StaticPopup_Resize
local GetBindingFromClick = GetBindingFromClick

local AutoCompleteEditBox_OnEnterPressed = AutoCompleteEditBox_OnEnterPressed
local AutoCompleteEditBox_OnTextChanged = AutoCompleteEditBox_OnTextChanged
local ChatEdit_FocusActiveWindow = ChatEdit_FocusActiveWindow

local DisableAddOn = (C_AddOns and C_AddOns.DisableAddOn) or DisableAddOn
local EnableAddOn = (C_AddOns and C_AddOns.EnableAddOn) or EnableAddOn
local IsAddOnLoaded = (C_AddOns and C_AddOns.IsAddOnLoaded) or IsAddOnLoaded
local PickupContainerItem = (C_Container and C_Container.PickupContainerItem) or PickupContainerItem
local SetCVar = C_CVar.SetCVar

local STATICPOPUP_TEXTURE_ALERT = STATICPOPUP_TEXTURE_ALERT
local STATICPOPUP_TEXTURE_ALERTGEAR = STATICPOPUP_TEXTURE_ALERTGEAR
Expand All @@ -44,7 +47,6 @@ E.PopupDialogs.ELVUI_UPDATE_AVAILABLE = {
self.editBox.width = self.editBox:GetWidth()
self.editBox:Width(220)
self.editBox:SetText(DOWNLOAD_URL)
self.editBox:HighlightText()
ChatEdit_FocusActiveWindow()
end,
OnHide = function(self)
Expand All @@ -67,7 +69,7 @@ E.PopupDialogs.ELVUI_UPDATE_AVAILABLE = {
end

self:HighlightText()
self:ClearFocus()

ChatEdit_FocusActiveWindow()
end,
OnEditFocusGained = function(self)
Expand All @@ -87,7 +89,6 @@ E.PopupDialogs.ELVUI_EDITBOX = {
self.editBox:AddHistoryLine('text')
self.editBox.temptxt = data
self.editBox:SetText(data)
self.editBox:HighlightText()
self.editBox:SetJustifyH('CENTER')
end,
OnHide = function(self)
Expand All @@ -105,8 +106,8 @@ E.PopupDialogs.ELVUI_EDITBOX = {
if self:GetText() ~= self.temptxt then
self:SetText(self.temptxt)
end

self:HighlightText()
self:ClearFocus()
end,
whileDead = 1,
preferredIndex = 3,
Expand Down
Loading

0 comments on commit 54cf2bd

Please sign in to comment.