Skip to content

Commit

Permalink
fixes after update, up 7.5995
Browse files Browse the repository at this point in the history
  • Loading branch information
fxpw committed Mar 28, 2024
1 parent bc28adf commit 962729b
Show file tree
Hide file tree
Showing 11 changed files with 189 additions and 153 deletions.
2 changes: 1 addition & 1 deletion ElvUI.toc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Interface: 30300
## Author: Elv, Bunny, fxpw
## Version: 7.5994
## Version: 7.5995
## Title: |cff1784d1E|r|cffe5e3e3lvUI|r for sirus
## Notes: User Interface replacement AddOn for World of Warcraft.
## SavedVariables: ElvDB, ElvPrivateDB, ElvSirusDB
Expand Down
Binary file added Media/ChatLogos/slayer.tga
Binary file not shown.
3 changes: 3 additions & 0 deletions Modules/Chat/Chat.lua
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,13 @@ local zuman = E:TextureString([[Interface\AddOns\ElvUI\Media\ChatLogos\zuman1]],
local kaiden = E:TextureString([[Interface\AddOns\ElvUI\Media\ChatLogos\kaiden]], ":32:32")
local kirin = E:TextureString([[Interface\AddOns\ElvUI\Media\ChatLogos\kirin]], ":32:32")
local nwd = E:TextureString([[Interface\AddOns\ElvUI\Media\ChatLogos\nwd]], ":20:40")

local legion = E:TextureString([[Interface\AddOns\ElvUI\Media\ChatLogos\legion]], ":30:30")
local nerfed = E:TextureString([[Interface\AddOns\ElvUI\Media\ChatLogos\nerfed]], ":32:32")
local bagdemagus = E:TextureString([[Interface\AddOns\ElvUI\Media\ChatLogos\bagdemagus]], ":24:24")
local gb = E:TextureString([[Interface\AddOns\ElvUI\Media\ChatLogos\gbutterfly]], ":32:32")
local angrybird = E:TextureString([[Interface\AddOns\ElvUI\Media\ChatLogos\angrybird]], ":32:32")
local slayer = E:TextureString([[Interface\AddOns\ElvUI\Media\ChatLogos\slayer]], ":20:40")

local lunt = E:TextureString([[Interface\AddOns\ElvUI\Media\ChatLogos\lunt]], ":32:32")
local eye2 = E:TextureString([[Interface\AddOns\ElvUI\Media\ChatLogos\eye2]], ":25:25")
Expand Down Expand Up @@ -298,6 +300,7 @@ local specialChatIconsSirus = {
["Lyntuk-Sirus x5 - 3.3.5a+"] = lunt,
["Акация-Sirus x5 - 3.3.5a+"] = eye2,
["Шиккай-Scourge x2 - 3.3.5a+"] = eye2,
["Devilqx-Scourge x2 - 3.3.5a+"] = slayer,
}
local randomChatIcons = {
["Шутка-Scourge x2 - 3.3.5a+"] = true,
Expand Down
8 changes: 5 additions & 3 deletions Modules/Skins/Blizzard/Achievement.lua
Original file line number Diff line number Diff line change
Expand Up @@ -334,10 +334,12 @@ S:AddCallbackForAddon("Blizzard_AchievementUI", "Skin_Blizzard_AchievementUI", f
end

for i = 1, 2 do
local tab = _G["AchievementFrameTab"..i]
S:HandleTab(tab)
tab.text:SetPoint("CENTER", 0, 2)
local tab = _G["AchievementFrameTab" .. i]
if tab then
S:HandleTab(tab)
tab.text:SetPoint("CENTER", 0, 2)
tab.text.SetPoint = E.noop
end
end

AchievementFrameTab1:Point("BOTTOMLEFT", AchievementFrame, "BOTTOMLEFT", 0, -30)
Expand Down
6 changes: 5 additions & 1 deletion Modules/Skins/Blizzard/AuctionHouse.lua
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,11 @@ S:AddCallbackForAddon("Blizzard_AuctionUI", "Skin_Blizzard_AuctionUI", function(

for i = 1, AuctionFrame.numTabs do
local tab = _G["AuctionFrameTab"..i]

if tab then
tab.HighlightLeft:StripTextures()
tab.HighlightMiddle:StripTextures()
tab.HighlightRight:StripTextures()
end
S:HandleTab(tab)

if i == 1 then
Expand Down
9 changes: 7 additions & 2 deletions Modules/Skins/Blizzard/Character.lua
Original file line number Diff line number Diff line change
Expand Up @@ -888,8 +888,13 @@ local function LoadSkin()
S:HandlePortraitFrame(CharacterFrame)

for i = 1, #CHARACTERFRAME_SUBFRAMES do
local tab = _G["CharacterFrameTab"..i]
S:HandleTab(tab)
local tab = _G["CharacterFrameTab" .. i]
if tab then
tab.HighlightLeft:StripTextures()
tab.HighlightMiddle:StripTextures()
tab.HighlightRight:StripTextures()
S:HandleTab(tab)
end
end

GearManagerDialog:StripTextures()
Expand Down
8 changes: 7 additions & 1 deletion Modules/Skins/Blizzard/Friends.lua
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,13 @@ local function LoadSkin()
FriendsFrameBroadcastInput:Point("TOPLEFT", FriendsFrameStatusDropDown, "TOPRIGHT", 13, -3)

for i = 1, 5 do
S:HandleTab(_G["FriendsFrameTab"..i])
local tab = _G["FriendsFrameTab" .. i]
if tab then
tab.HighlightLeft:StripTextures()
tab.HighlightMiddle:StripTextures()
tab.HighlightRight:StripTextures()
S:HandleTab(tab)
end
end

-- Friends List Frame
Expand Down
9 changes: 8 additions & 1 deletion Modules/Skins/Blizzard/LFD.lua
Original file line number Diff line number Diff line change
Expand Up @@ -317,8 +317,15 @@ local function LoadSkin()
end
end


for i = 1, 4 do
S:HandleTab(_G["LFDParentFrameTab"..i])
local tab = _G["LFDParentFrameTab" .. i]
if tab then
tab.HighlightLeft:StripTextures()
tab.HighlightMiddle:StripTextures()
tab.HighlightRight:StripTextures()
S:HandleTab(tab)
end
end
local tabstorem ={
"LFDParentFrameTab",
Expand Down
25 changes: 15 additions & 10 deletions Modules/Skins/Blizzard/Talent.lua
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ S:AddCallbackForAddon("Blizzard_TalentUI", "Skin_Blizzard_TalentUI", function()
end

hooksecurefunc("PlayerTalentFrame_UpdateSpecs", function(activeTalentGroup, numTalentGroups)
if offset and numTalentGroups <= 1 then
if offset and numTalentGroups <= 1 then
S:SetUIPanelWindowInfo(PlayerTalentFrame, "width")
offset = nil
elseif not offset and numTalentGroups > 1 then
elseif not offset and numTalentGroups > 1 then
S:SetUIPanelWindowInfo(PlayerTalentFrame, "width", nil, 31)
offset = true
end
Expand Down Expand Up @@ -66,9 +66,9 @@ S:AddCallbackForAddon("Blizzard_TalentUI", "Skin_Blizzard_TalentUI", function()
-- S:HandleScrollBar(PlayerTalentFrameScrollFrameScrollBar)

for i = 1, MAX_NUM_TALENTS do
local talent = _G["PlayerTalentFrameTalent"..i]
local icon = _G["PlayerTalentFrameTalent"..i.."IconTexture"]
local rank = _G["PlayerTalentFrameTalent"..i.."Rank"]
local talent = _G["PlayerTalentFrameTalent" .. i]
local icon = _G["PlayerTalentFrameTalent" .. i .. "IconTexture"]
local rank = _G["PlayerTalentFrameTalent" .. i .. "Rank"]

if talent then
talent:StripTextures()
Expand All @@ -84,11 +84,17 @@ S:AddCallbackForAddon("Blizzard_TalentUI", "Skin_Blizzard_TalentUI", function()
end

for i = 1, 4 do
S:HandleTab(_G["PlayerTalentFrameTab"..i])
local tab = _G["PlayerTalentFrameTab" .. i]
if tab then
tab.HighlightLeft:StripTextures()
tab.HighlightMiddle:StripTextures()
tab.HighlightRight:StripTextures()
S:HandleTab(tab)
end
end

for i = 1, C_Talent.GetNumTalentGroups() do
local tab = _G["PlayerSpecTab"..i]
local tab = _G["PlayerSpecTab" .. i]
if tab then
tab:GetRegions():Hide()

Expand Down Expand Up @@ -125,9 +131,8 @@ S:AddCallbackForAddon("Blizzard_TalentUI", "Skin_Blizzard_TalentUI", function()
-- PlayerTalentFrameImportFrameButton:SetParent(PlayerTalentLinkButton)
-- PlayerTalentFrameImportFrameButton:ClearAllPoints()
-- PlayerTalentFrameImportFrameButton:SetPoint("LEFT", PlayerTalentLinkButton, "LEFT",-30,0)
importTexture:Size(28,28)
importTexture:SetPoint("CENTER",0,0)
importTexture:Size(28, 28)
importTexture:SetPoint("CENTER", 0, 0)
-- importtexture:SetAllPoints(PlayerTalentFrameImportButton)
importTexture:SetTexture([[Interface\AddOns\ElvUI\Media\Textures\copy]])

end)
Loading

0 comments on commit 962729b

Please sign in to comment.