Commit 35983813 authored by Simpy's avatar Simpy 🐹
Browse files

Merge remote-tracking branch 'elvui/beta' into ptr

parents e6eb7840 265390de
......@@ -8,7 +8,6 @@ local EnumerateFrames = EnumerateFrames
local hooksecurefunc = hooksecurefunc
local CreateFrame = CreateFrame
local templateBackdrop, innerOuterBackdrop, shadowBackdrop = {}, {}, {}
local backdropr, backdropg, backdropb, backdropa, borderr, borderg, borderb = 0, 0, 0, 1, 0, 0, 0
-- 8.2 restricted frame check
......@@ -133,13 +132,11 @@ local function SetTemplate(frame, template, glossTex, ignoreUpdates, forcePixelM
if template == 'NoBackdrop' then
frame:SetBackdrop()
else
templateBackdrop.edgeFile = E.media.blankTex
templateBackdrop.bgFile = glossTex and (type(glossTex) == 'string' and glossTex or E.media.glossTex) or E.media.blankTex
if not templateBackdrop.edgeSize then
templateBackdrop.edgeSize = E:Scale(E.twoPixelsPlease and 2 or 1)
end
frame:SetBackdrop(templateBackdrop)
frame:SetBackdrop({
edgeFile = E.media.blankTex,
bgFile = glossTex and (type(glossTex) == 'string' and glossTex or E.media.glossTex) or E.media.blankTex,
edgeSize = E:Scale(E.twoPixelsPlease and 2 or 1)
})
if frame.callbackBackdropColor then
frame:callbackBackdropColor()
......@@ -150,12 +147,14 @@ local function SetTemplate(frame, template, glossTex, ignoreUpdates, forcePixelM
local notPixelMode = not isUnitFrameElement and not E.PixelMode
local notThinBorders = isUnitFrameElement and not UF.thinBorders
if (notPixelMode or notThinBorders) and not forcePixelMode then
innerOuterBackdrop.edgeFile = E.media.blankTex
if not innerOuterBackdrop.edgeSize then innerOuterBackdrop.edgeSize = E:Scale(1) end
local backdrop = {
edgeFile = E.media.blankTex,
edgeSize = E:Scale(1)
}
if not frame.iborder then
local border = CreateFrame('Frame', nil, frame, 'BackdropTemplate')
border:SetBackdrop(innerOuterBackdrop)
border:SetBackdrop(backdrop)
border:SetBackdropBorderColor(0, 0, 0, 1)
border:SetInside(frame, 1, 1)
frame.iborder = border
......@@ -163,7 +162,7 @@ local function SetTemplate(frame, template, glossTex, ignoreUpdates, forcePixelM
if not frame.oborder then
local border = CreateFrame('Frame', nil, frame, 'BackdropTemplate')
border:SetBackdrop(innerOuterBackdrop)
border:SetBackdrop(backdrop)
border:SetBackdropBorderColor(0, 0, 0, 1)
border:SetOutside(frame, 1, 1)
frame.oborder = border
......@@ -214,15 +213,12 @@ local function CreateShadow(frame, size, pass)
backdropr, backdropg, backdropb, borderr, borderg, borderb = 0, 0, 0, 0, 0, 0
shadowBackdrop.edgeFile = E.Media.Textures.GlowTex
shadowBackdrop.edgeSize = E:Scale(size)
local offset = (E.PixelMode and size) or (size + 1)
local shadow = CreateFrame('Frame', nil, frame, 'BackdropTemplate')
shadow:SetFrameLevel(1)
shadow:SetFrameStrata(frame:GetFrameStrata())
shadow:SetOutside(frame, offset, offset, nil, true)
shadow:SetBackdrop(shadowBackdrop)
shadow:SetBackdrop({edgeFile = E.Media.Textures.GlowTex, edgeSize = E:Scale(size)})
shadow:SetBackdropColor(backdropr, backdropg, backdropb, 0)
shadow:SetBackdropBorderColor(borderr, borderg, borderb, 0.9)
......
......@@ -207,6 +207,7 @@ function A:ClearAuraTime(button, expired)
end
button.endTime = nil
button.timeLeft = nil
button.text:SetText('')
button:SetScript('OnUpdate', nil)
end
......
......@@ -154,11 +154,17 @@ function M:GetLocTextColor()
end
end
function M:SetupHybridMinimap()
_G.HybridMinimap.MapCanvas:SetMaskTexture(E.Media.Textures.White8x8)
end
function M:ADDON_LOADED(_, addon)
if addon == 'Blizzard_TimeManager' then
_G.TimeManagerClockButton:Kill()
elseif addon == 'Blizzard_FeedbackUI' then
_G.FeedbackUIButton:Kill()
elseif addon == 'Blizzard_HybridMinimap' then
M:SetupHybridMinimap()
end
end
......@@ -323,21 +329,6 @@ function M:SetGetMinimapShape()
Minimap:Size(E.db.general.minimap.size, E.db.general.minimap.size)
end
function M:SetupHybridMinimap()
local MapCanvas = _G.HybridMinimap.MapCanvas
MapCanvas:SetMaskTexture('Interface\\Buttons\\WHITE8X8')
MapCanvas:SetScript('OnMouseWheel', M.Minimap_OnMouseWheel)
MapCanvas:SetScript('OnMouseDown', M.Minimap_OnMouseDown) -- HybridMinimap seems not able to use ping see: Blizzard_HybridMinimap @Simpy
MapCanvas:SetScript('OnMouseUp', E.noop)
end
function M:HybridMinimapOnLoad(addon)
if addon == 'Blizzard_HybridMinimap' then
M:SetupHybridMinimap()
E:UnregisterEvent(self, M.HybridMinimapOnLoad)
end
end
function M:Initialize()
if not E.private.general.minimap.enable then return end
self.Initialized = true
......@@ -408,6 +399,7 @@ function M:Initialize()
if _G.TimeManagerClockButton then _G.TimeManagerClockButton:Kill() end
if _G.FeedbackUIButton then _G.FeedbackUIButton:Kill() end
if _G.HybridMinimap then M:SetupHybridMinimap() end
E:CreateMover(_G.MMHolder, 'MinimapMover', L["Minimap"], nil, nil, MinimapPostDrag, nil, nil, 'maps,minimap')
......@@ -422,7 +414,6 @@ function M:Initialize()
self:RegisterEvent('ZONE_CHANGED_INDOORS', 'Update_ZoneText')
self:RegisterEvent('ZONE_CHANGED', 'Update_ZoneText')
self:RegisterEvent('ADDON_LOADED')
self:RegisterEvent('ADDON_LOADED', M.HybridMinimapOnLoad)
self:UpdateSettings()
end
......
......@@ -19,7 +19,6 @@ local UnitHealthMax = UnitHealthMax
local _, ns = ...
local oUF = ns.oUF
local templateBackdrop = {}
local function Update(self)
local element = self.TargetIndicator
......@@ -124,9 +123,7 @@ local function Enable(self)
end
if element.Shadow and element.Shadow:IsObjectType('Frame') and not element.Shadow:GetBackdrop() then
if not templateBackdrop.edgeFile then templateBackdrop.edgeFile = E.Media.Textures.GlowTex end
if not templateBackdrop.edgeSize then templateBackdrop.edgeSize = E:Scale(5) end
element.Shadow:SetBackdrop(templateBackdrop)
element.Shadow:SetBackdrop({edgeFile = E.Media.Textures.GlowTex, edgeSize = E:Scale(5)})
end
if element.Spark and element.Spark:IsObjectType('Texture') and not element.Spark:GetTexture() then
......
......@@ -178,7 +178,7 @@ function S:Blizzard_AchievementUI(event)
local summaries = {_G.AchievementFrameComparisonSummaryPlayer, _G.AchievementFrameComparisonSummaryFriend}
for _, frame in pairs(summaries) do
frame:SetBackdrop(nil)
frame:SetBackdrop()
end
_G.AchievementFrameMetalBorderTopLeft:Hide()
......@@ -201,7 +201,7 @@ function S:Blizzard_AchievementUI(event)
for i=1, frame:GetNumChildren() do
local child = select(i, frame:GetChildren())
if child and not child:GetName() then
child:SetBackdrop(nil)
child:SetBackdrop()
end
end
end
......
......@@ -362,7 +362,7 @@ function S:BlizzardOptions()
S:HandleButton(_G.AudioOptionsVoicePanel.TestInputDevice.ToggleTest)
local VUMeter = _G.AudioOptionsVoicePanelTestInputDevice.VUMeter
VUMeter:SetBackdrop(nil)
VUMeter:SetBackdrop()
VUMeter.Status:CreateBackdrop()
VUMeter.Status:SetStatusBarTexture(E.media.normTex)
E:RegisterStatusBar(VUMeter.Status)
......
......@@ -620,7 +620,7 @@ function S:Blizzard_Communities()
S:HandleButton(CommunitiesGuildRecruitmentFrameApplicants.DeclineButton)
for i = 1, 5 do
_G['CommunitiesGuildRecruitmentFrameApplicantsContainerButton'..i]:SetBackdrop(nil)
_G['CommunitiesGuildRecruitmentFrameApplicantsContainerButton'..i]:SetBackdrop()
end
-- Notification Settings Dialog
......
......@@ -192,7 +192,7 @@ function S:Blizzard_GuildUI()
for _, button in next, _G.GuildInfoFrameApplicantsContainer.buttons do
button.selectedTex:Kill()
button:GetHighlightTexture():Kill()
button:SetBackdrop(nil)
button:SetBackdrop()
end
--Text Edit Frame
......
......@@ -126,7 +126,7 @@ function S:LookingForGroupFrames()
_G.LFGDungeonReadyDialogRoleIconTexture:SetAlpha(0.5)
hooksecurefunc(_G.LFGDungeonReadyDialog, 'SetBackdrop', function(frame, backdrop)
if backdrop ~= nil then frame:SetBackdrop(nil) end
if backdrop ~= nil then frame:SetBackdrop() end
end)
hooksecurefunc('LFGDungeonReadyPopup_Update', function()
......
......@@ -40,8 +40,8 @@ function S:LookingForGuildFrame()
-- skin container buttons on browse and request page
for i = 1, 5 do
_G['LookingForGuildBrowseFrameContainerButton'..i]:SetBackdrop(nil)
_G['LookingForGuildAppsFrameContainerButton'..i]:SetBackdrop(nil)
_G['LookingForGuildBrowseFrameContainerButton'..i]:SetBackdrop()
_G['LookingForGuildAppsFrameContainerButton'..i]:SetBackdrop()
end
-- skin tabs
......
......@@ -3,8 +3,6 @@ local S = E:GetModule('Skins')
local _G = _G
local pairs, unpack = pairs, unpack
local C_Spell_GetMawPowerBorderAtlasBySpellID = C_Spell.GetMawPowerBorderAtlasBySpellID
local hooksecurefunc = hooksecurefunc
local headers = {
......
......@@ -8,7 +8,7 @@ local unpack = unpack
local hooksecurefunc = hooksecurefunc
local function IslandTooltipStyle(self)
self:SetBackdrop(nil)
self:SetBackdrop()
self:SetTemplate('Transparent', nil, true)
end
......
......@@ -782,7 +782,7 @@ function S:HandleSliderFrame(frame)
local orientation = frame:GetOrientation()
local SIZE = 12
frame:SetBackdrop(nil)
frame:SetBackdrop()
frame:StripTextures()
frame:SetThumbTexture(E.Media.Textures.Melli)
......
......@@ -412,13 +412,14 @@ E.Options.args.general = {
applyTextureToAll = {
order = 3,
type = 'execute',
name = L["Apply Texture To All"],
desc = L["Applies the primary texture to all statusbars."],
name = L["Copy Primary Texture"],
desc = L["Replaces the StatusBar texture setting on Unitframes and Nameplates with the primary texture."],
func = function()
local texture = E.private.general.normTex
E.db.unitframe.statusbar = texture
E.db.nameplates.statusbar = texture
E:StaggeredUpdateAll(nil, true)
E.db.unitframe.statusbar = E.private.general.normTex
E:UpdateUnitFrames()
E.db.nameplates.statusbar = E.private.general.normTex
E:UpdateNamePlates()
end,
},
},
......
-- German localization file for deDE.
local L = ElvUI[1].Libs.ACL:NewLocale("ElvUI", "deDE")
L["Copy Primary Texture"] = true
L["Replaces the StatusBar texture setting on Unitframes and Nameplates with the primary texture."] = true
L["# Displayed Auras"] = "# angezeigte Auren"
L["%s and then %s"] = "%s und dann %s"
L["|cffFF0000Warning:|r Click the arrow on the dropdown box to see a list of spells."] = "|cffFF0000Warnung:|r Klick auf den Pfeil rechts in der Dropdown Box um eine Liste der Fähigkeiten zu sehen."
......
-- English localization file for enUS and enGB.
local L = ElvUI[1].Libs.ACL:NewLocale("ElvUI", "enUS", true, true)
L["Copy Primary Texture"] = true
L["Replaces the StatusBar texture setting on Unitframes and Nameplates with the primary texture."] = true
L["# Displayed Auras"] = true
L["%s and then %s"] = true
L["|cffFF0000Warning:|r Click the arrow on the dropdown box to see a list of spells."] = true
......
-- Spanish localization file for esES and esMX.
local L = ElvUI[1].Libs.ACL:NewLocale("ElvUI", "esMX")
L["Copy Primary Texture"] = true
L["Replaces the StatusBar texture setting on Unitframes and Nameplates with the primary texture."] = true
L["# Displayed Auras"] = "# Auras mostradas"
L["%s and then %s"] = "%s y entonces %s"
L["|cffFF0000Warning:|r Click the arrow on the dropdown box to see a list of spells."] = true
......
-- French localization file for frFR.
local L = ElvUI[1].Libs.ACL:NewLocale("ElvUI", "frFR")
L["Copy Primary Texture"] = true
L["Replaces the StatusBar texture setting on Unitframes and Nameplates with the primary texture."] = true
L["# Displayed Auras"] = "Auras affichées"
L["%s and then %s"] = "%s et alors %s"
L["|cffFF0000Warning:|r Click the arrow on the dropdown box to see a list of spells."] = true
......
-- Italian localization file for enUS and enGB.
local L = ElvUI[1].Libs.ACL:NewLocale("ElvUI", "itIT")
L["Copy Primary Texture"] = true
L["Replaces the StatusBar texture setting on Unitframes and Nameplates with the primary texture."] = true
L["# Displayed Auras"] = true
L["%s and then %s"] = true
L["|cffFF0000Warning:|r Click the arrow on the dropdown box to see a list of spells."] = true
......
-- Korean localization file for koKR.
local L = ElvUI[1].Libs.ACL:NewLocale("ElvUI", "koKR")
L["Copy Primary Texture"] = true
L["Replaces the StatusBar texture setting on Unitframes and Nameplates with the primary texture."] = true
L["# Displayed Auras"] = "표시되는 효과 갯수"
L["%s and then %s"] = "%s 이후 %s"
L["|cffFF0000Warning:|r Click the arrow on the dropdown box to see a list of spells."] = true
......
-- Portuguese localization file for ptBR.
local L = ElvUI[1].Libs.ACL:NewLocale("ElvUI", "ptBR")
L["Copy Primary Texture"] = true
L["Replaces the StatusBar texture setting on Unitframes and Nameplates with the primary texture."] = true
L["# Displayed Auras"] = "# Auras Exibidas"
L["%s and then %s"] = "%s e depois %s"
L["|cffFF0000Warning:|r Click the arrow on the dropdown box to see a list of spells."] = "|cffFF0000Aviso:|r Clique na seta na caixa de suspensão para ver a lista de feitiços."
......
-- Russian localization file for ruRU.
local L = ElvUI[1].Libs.ACL:NewLocale("ElvUI", "ruRU")
L["Copy Primary Texture"] = true
L["Replaces the StatusBar texture setting on Unitframes and Nameplates with the primary texture."] = true
L["# Displayed Auras"] = "Кол-во аур"
L["%s and then %s"] = "%s, а затем %s"
L["|cffFF0000Warning:|r Click the arrow on the dropdown box to see a list of spells."] = true
......
-- Simplified Chinese localization file for zhCN.
local L = ElvUI[1].Libs.ACL:NewLocale("ElvUI", "zhCN")
L["Copy Primary Texture"] = true
L["Replaces the StatusBar texture setting on Unitframes and Nameplates with the primary texture."] = true
L["# Displayed Auras"] = "显示光环的数量"
L["%s and then %s"] = "%s 于 %s"
L["|cffFF0000Warning:|r Click the arrow on the dropdown box to see a list of spells."] = "|cffFF0000警告:|r 点击下拉菜单的箭头来查看法术列表."
......
-- Traditional Chinese localization file for zhTW.
local L = ElvUI[1].Libs.ACL:NewLocale("ElvUI", "zhTW")
L["Copy Primary Texture"] = true
L["Replaces the StatusBar texture setting on Unitframes and Nameplates with the primary texture."] = true
L["# Displayed Auras"] = "顯示光環的數量"
L["%s and then %s"] = "%s 與 %s"
L["|cffFF0000Warning:|r Click the arrow on the dropdown box to see a list of spells."] = true
......
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