Skip to content

Commit

Permalink
фиксы всего получаецца
Browse files Browse the repository at this point in the history
  • Loading branch information
fxpw committed Jul 15, 2022
1 parent 2101194 commit 284dd7f
Show file tree
Hide file tree
Showing 11 changed files with 389 additions and 358 deletions.
2 changes: 1 addition & 1 deletion ElvUI/ElvUI.toc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Interface: 30300
## Author: Elv, Bunny, fxpw
## Version: 7.04
## Version: 7.05
## Title: |cff1784d1E|r|cffe5e3e3lvUI|r for sirus
## Notes: User Interface replacement AddOn for World of Warcraft.
## SavedVariables: ElvDB, ElvPrivateDB, ElvSirusDB
Expand Down
8 changes: 6 additions & 2 deletions ElvUI/Locales/ruRU.lua
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ L["Threat"] = "Угроза"
L["Miscellaneous"] = "Разное"
L["Collections"] = "Коллекции"
L["EncounterJ"] = "Приключения"

--~afkwords
L["RandomWords"] ={ ---- не может быть только одной записи
"На все бабки в босса ©Сырсколбасой",
"Я потратил на эту строчку 20 минут ©fxpw",
Expand Down Expand Up @@ -516,7 +516,11 @@ L["RandomWords"] ={ ---- не может быть только одной зап
"Вещей 303 не будет в бронзовом святилище и не планировалось ©Crystal",
"Он сам спулился",
"Для того чтобы выбежать из лужи нажмите W",
"А сколько у тебя брюлей?"
"А сколько у тебя брюлей?",
"Лучше брюль в рулетке, чем в кармане",
"Обходи эту шелупонь",
"Пачините макросы пж(",




Expand Down
14 changes: 7 additions & 7 deletions ElvUI/Modules/Skins/Blizzard/Calendar.lua
Original file line number Diff line number Diff line change
Expand Up @@ -264,9 +264,9 @@ S:AddCallbackForAddon("Blizzard_Calendar", "Skin_Blizzard_Calendar", function()
S:HandleEditBox(CalendarMassInviteGuildMaxLevelEdit)

S:HandleButton(CalendarMassInviteGuildAcceptButton)
S:HandleButton(CalendarMassInviteArenaButton2)
S:HandleButton(CalendarMassInviteArenaButton3)
S:HandleButton(CalendarMassInviteArenaButton5)
-- S:HandleButton(CalendarMassInviteArenaButton2)
-- S:HandleButton(CalendarMassInviteArenaButton3)
-- S:HandleButton(CalendarMassInviteArenaButton5)

CalendarMassInviteFrame:Size(307, 179)
CalendarMassInviteFrame:ClearAllPoints()
Expand All @@ -285,9 +285,9 @@ S:AddCallbackForAddon("Blizzard_Calendar", "Skin_Blizzard_Calendar", function()

CalendarMassInviteGuildAcceptButton:Point("TOPRIGHT", -8, -100)

CalendarMassInviteArenaButton2:Point("TOPLEFT", 8, -149)
CalendarMassInviteArenaButton3:Point("TOP", 0, -149)
CalendarMassInviteArenaButton5:Point("TOPRIGHT", -8, -149)
-- CalendarMassInviteArenaButton2:Point("TOPLEFT", 8, -149)
-- CalendarMassInviteArenaButton3:Point("TOP", 0, -149)
-- CalendarMassInviteArenaButton5:Point("TOPRIGHT", -8, -149)

select(6, CalendarMassInviteFrame:GetRegions()):Point("TOP", 0, -130)

Expand Down Expand Up @@ -330,7 +330,7 @@ S:AddCallbackForAddon("Blizzard_Calendar", "Skin_Blizzard_Calendar", function()
CalendarViewEventFrameModalOverlay:SetFrameStrata("DIALOG")

S:HandleButton(CalendarViewEventAcceptButton)
S:HandleButton(CalendarViewEventTentativeButton)
-- S:HandleButton(CalendarViewEventTentativeButton)
S:HandleButton(CalendarViewEventRemoveButton)
S:HandleButton(CalendarViewEventDeclineButton)

Expand Down
202 changes: 101 additions & 101 deletions ElvUI/Modules/Skins/Blizzard/Glyph.lua
Original file line number Diff line number Diff line change
@@ -1,101 +1,101 @@
local E, L, V, P, G = unpack(select(2, ...)) --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
local S = E:GetModule("Skins")

--Lua functions
local _G = _G
local unpack = unpack
--WoW API / Variables

S:AddCallbackForAddon("Blizzard_GlyphUI", "Skin_Blizzard_GlyphUI", function()
if not E.private.skins.blizzard.enable or not E.private.skins.blizzard.talent then return end

if not PlayerTalentFrame then
TalentFrame_LoadUI()
end

GlyphFrame:StripTextures()

GlyphFrameBackground:Size(323, 349)
GlyphFrameBackground:Point("TOPLEFT", 20, -59)
GlyphFrameBackground:CreateBackdrop()

S:HookScript(GlyphFrame, "OnShow", function(self)
S:SetBackdropHitRect(self, PlayerTalentFrame.backdrop)
S:Unhook(self, "OnShow")
end)

GlyphFrameBackground:SetTexture("Interface\\Spellbook\\UI-GlyphFrame")
GlyphFrameGlow:SetTexture("Interface\\Spellbook\\UI-GlyphFrame-Glow")
GlyphFrameGlow:SetAllPoints(GlyphFrameBackground)

-- texWidth, texHeight, cropWidth, cropHeight, offsetX, offsetY = 512, 512, 315, 340, 21, 72
GlyphFrameBackground:SetTexCoord(0.041015625, 0.65625, 0.140625, 0.8046875)

-- texWidth, texHeight, cropWidth, cropHeight, offsetX, offsetY = 512, 512, 315, 340, 30, 34
GlyphFrameGlow:SetTexCoord(0.05859375, 0.673828125, 0.06640625, 0.73046875)

local glyphBGScale = 1.0253968
local glyphPositions = {
{"CENTER", -1, 126},
{"CENTER", -1, -119},
{"TOPLEFT", 8, -62},
{"BOTTOMRIGHT", -10, 70},
{"TOPRIGHT", -8, -62},
{"BOTTOMLEFT", 7, 70}
}

local glyphFrameLevel = GlyphFrame:GetFrameLevel() + 1
for i = 1, 6 do
local frame = _G["GlyphFrameGlyph"..i]
frame:SetParent(GlyphFrameBackground.backdrop)
frame:SetFrameLevel(glyphFrameLevel)
frame:SetScale(glyphBGScale)
frame:Point(unpack(glyphPositions[i]))
end

GlyphFrame:HookScript("OnShow", function()
PlayerTalentFrameTitleText:Hide()
PlayerTalentFramePointsBar:Hide()
PlayerTalentFrameScrollFrame:Hide()
PlayerTalentFrameStatusFrame:Hide()
PlayerTalentFrameActivateButton:Hide()
end)

GlyphFrame:SetScript("OnHide", function()
PlayerTalentFrameTitleText:Show()
PlayerTalentFramePointsBar:Show()
PlayerTalentFrameScrollFrame:Show()
end)

hooksecurefunc(PlayerTalentFrame, "updateFunction", function()
if GlyphFrame:IsShown() then
PlayerTalentFramePreviewBar:Hide()
end
end)

do
local slotAnimations = {}
local TOPLEFT, TOP, TOPRIGHT, BOTTOMRIGHT, BOTTOM, BOTTOMLEFT = 3, 1, 5, 4, 2, 6
slotAnimations[TOPLEFT] = {["point"] = "CENTER", ["xStart"] = -13, ["xStop"] = -85, ["yStart"] = 17, ["yStop"] = 60}
slotAnimations[TOP] = {["point"] = "CENTER", ["xStart"] = -13, ["xStop"] = -13, ["yStart"] = 17, ["yStop"] = 100}
slotAnimations[TOPRIGHT] = {["point"] = "CENTER", ["xStart"] = -13, ["xStop"] = 59, ["yStart"] = 17, ["yStop"] = 60}
slotAnimations[BOTTOM] = {["point"] = "CENTER", ["xStart"] = -13, ["xStop"] = -13, ["yStart"] = 17, ["yStop"] = -64}
slotAnimations[BOTTOMLEFT] = {["point"] = "CENTER", ["xStart"] = -13, ["xStop"] = -87, ["yStart"] = 18, ["yStop"] = -27}
slotAnimations[BOTTOMRIGHT] = {["point"] = "CENTER", ["xStart"] = -13, ["xStop"] = 61, ["yStart"] = 18, ["yStop"] = -27}

for _, animData in ipairs(slotAnimations) do
animData.xStart = animData.xStart + 3
animData.yStart = animData.yStart + 8
animData.xStop = (animData.xStop + 3) * glyphBGScale
animData.yStop = (animData.yStop + 8) * glyphBGScale
end

hooksecurefunc("GlyphFrame_StartSlotAnimation", function(slotID, duration, size)
local sparkle = _G["GlyphFrameSparkle"..slotID]
local animation = slotAnimations[slotID]

sparkle:SetPoint(animation.point, animation.xStart, animation.yStart)
sparkle.animGroup.translate:SetOffset(animation.xStop - animation.xStart, animation.yStop - animation.yStart)
end)
end
end)
-- local E, L, V, P, G = unpack(select(2, ...)) --Import: Engine, Locales, PrivateDB, ProfileDB, GlobalDB
-- local S = E:GetModule("Skins")

-- --Lua functions
-- local _G = _G
-- local unpack = unpack
-- --WoW API / Variables

-- S:AddCallbackForAddon("Blizzard_GlyphUI", "Skin_Blizzard_GlyphUI", function()
-- if not E.private.skins.blizzard.enable or not E.private.skins.blizzard.talent then return end

-- if not PlayerTalentFrame then
-- TalentFrame_LoadUI()
-- end

-- GlyphFrame:StripTextures()

-- GlyphFrameBackground:Size(323, 349)
-- GlyphFrameBackground:Point("TOPLEFT", 20, -59)
-- GlyphFrameBackground:CreateBackdrop()

-- S:HookScript(GlyphFrame, "OnShow", function(self)
-- S:SetBackdropHitRect(self, PlayerTalentFrame.backdrop)
-- S:Unhook(self, "OnShow")
-- end)

-- GlyphFrameBackground:SetTexture("Interface\\Spellbook\\UI-GlyphFrame")
-- GlyphFrameGlow:SetTexture("Interface\\Spellbook\\UI-GlyphFrame-Glow")
-- GlyphFrameGlow:SetAllPoints(GlyphFrameBackground)

-- -- texWidth, texHeight, cropWidth, cropHeight, offsetX, offsetY = 512, 512, 315, 340, 21, 72
-- GlyphFrameBackground:SetTexCoord(0.041015625, 0.65625, 0.140625, 0.8046875)

-- -- texWidth, texHeight, cropWidth, cropHeight, offsetX, offsetY = 512, 512, 315, 340, 30, 34
-- GlyphFrameGlow:SetTexCoord(0.05859375, 0.673828125, 0.06640625, 0.73046875)

-- local glyphBGScale = 1.0253968
-- local glyphPositions = {
-- {"CENTER", -1, 126},
-- {"CENTER", -1, -119},
-- {"TOPLEFT", 8, -62},
-- {"BOTTOMRIGHT", -10, 70},
-- {"TOPRIGHT", -8, -62},
-- {"BOTTOMLEFT", 7, 70}
-- }

-- local glyphFrameLevel = GlyphFrame:GetFrameLevel() + 1
-- for i = 1, 6 do
-- local frame = _G["GlyphFrameGlyph"..i]
-- frame:SetParent(GlyphFrameBackground.backdrop)
-- frame:SetFrameLevel(glyphFrameLevel)
-- frame:SetScale(glyphBGScale)
-- frame:Point(unpack(glyphPositions[i]))
-- end

-- GlyphFrame:HookScript("OnShow", function()
-- PlayerTalentFrameTitleText:Hide()
-- PlayerTalentFramePointsBar:Hide()
-- -- PlayerTalentFrameScrollFrame:Hide()
-- PlayerTalentFrameStatusFrame:Hide()
-- PlayerTalentFrameActivateButton:Hide()
-- end)

-- GlyphFrame:SetScript("OnHide", function()
-- PlayerTalentFrameTitleText:Show()
-- PlayerTalentFramePointsBar:Show()
-- -- PlayerTalentFrameScrollFrame:Show()
-- end)

-- hooksecurefunc(PlayerTalentFrame, "updateFunction", function()
-- if GlyphFrame:IsShown() then
-- PlayerTalentFramePreviewBar:Hide()
-- end
-- end)

-- do
-- local slotAnimations = {}
-- local TOPLEFT, TOP, TOPRIGHT, BOTTOMRIGHT, BOTTOM, BOTTOMLEFT = 3, 1, 5, 4, 2, 6
-- slotAnimations[TOPLEFT] = {["point"] = "CENTER", ["xStart"] = -13, ["xStop"] = -85, ["yStart"] = 17, ["yStop"] = 60}
-- slotAnimations[TOP] = {["point"] = "CENTER", ["xStart"] = -13, ["xStop"] = -13, ["yStart"] = 17, ["yStop"] = 100}
-- slotAnimations[TOPRIGHT] = {["point"] = "CENTER", ["xStart"] = -13, ["xStop"] = 59, ["yStart"] = 17, ["yStop"] = 60}
-- slotAnimations[BOTTOM] = {["point"] = "CENTER", ["xStart"] = -13, ["xStop"] = -13, ["yStart"] = 17, ["yStop"] = -64}
-- slotAnimations[BOTTOMLEFT] = {["point"] = "CENTER", ["xStart"] = -13, ["xStop"] = -87, ["yStart"] = 18, ["yStop"] = -27}
-- slotAnimations[BOTTOMRIGHT] = {["point"] = "CENTER", ["xStart"] = -13, ["xStop"] = 61, ["yStart"] = 18, ["yStop"] = -27}

-- for _, animData in ipairs(slotAnimations) do
-- animData.xStart = animData.xStart + 3
-- animData.yStart = animData.yStart + 8
-- animData.xStop = (animData.xStop + 3) * glyphBGScale
-- animData.yStop = (animData.yStop + 8) * glyphBGScale
-- end

-- hooksecurefunc("GlyphFrame_StartSlotAnimation", function(slotID, duration, size)
-- local sparkle = _G["GlyphFrameSparkle"..slotID]
-- local animation = slotAnimations[slotID]

-- sparkle:SetPoint(animation.point, animation.xStart, animation.yStart)
-- sparkle.animGroup.translate:SetOffset(animation.xStop - animation.xStart, animation.yStop - animation.yStart)
-- end)
-- end
-- end)
46 changes: 27 additions & 19 deletions ElvUI/Modules/Skins/Blizzard/Inspect.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ S:AddCallbackForAddon("Blizzard_InspectUI", "Skin_Blizzard_InspectUI", function(

InspectFrame:StripTextures(true)
InspectFrame:CreateBackdrop("Transparent")
InspectFrame.backdrop:Point("TOPLEFT", 11, -12)
InspectFrame.backdrop:Point("BOTTOMRIGHT", -32, 76)
-- InspectFrame.backdrop:Point("TOPLEFT", 11, -12)
-- InspectFrame.backdrop:Point("BOTTOMRIGHT", -32, 76)

S:SetUIPanelWindowInfo(InspectFrame, "width")

S:SetBackdropHitRect(InspectFrame)
S:SetBackdropHitRect(InspectPVPFrame, InspectFrame.backdrop)
S:SetBackdropHitRect(InspectTalentFrame, InspectFrame.backdrop)

InspectPVPFrameHonor:SetHitRectInsets(0, 120, 0, 0)
InspectPVPFrameArena:SetHitRectInsets(0, 120, 0, 0)
-- InspectPVPFrameHonor:SetHitRectInsets(0, 120, 0, 0)
-- InspectPVPFrameArena:SetHitRectInsets(0, 120, 0, 0)

S:HandleCloseButton(InspectFrameCloseButton, InspectFrame.backdrop)

Expand Down Expand Up @@ -101,8 +101,8 @@ S:AddCallbackForAddon("Blizzard_InspectUI", "Skin_Blizzard_InspectUI", function(

hooksecurefunc("InspectPaperDollItemSlotButton_Update", styleButton)

S:HandleRotateButton(InspectModelRotateLeftButton)
S:HandleRotateButton(InspectModelRotateRightButton)
-- S:HandleRotateButton(InspectModelRotateLeftButton)
-- S:HandleRotateButton(InspectModelRotateRightButton)

InspectPVPFrame:StripTextures()

Expand All @@ -118,7 +118,7 @@ S:AddCallbackForAddon("Blizzard_InspectUI", "Skin_Blizzard_InspectUI", function(

InspectTalentFrame:StripTextures()

S:HandleCloseButton(InspectTalentFrameCloseButton, InspectFrame.backdrop)
-- S:HandleCloseButton(InspectTalentFrameCloseButton, InspectFrame.backdrop)

for i = 1, MAX_TALENT_TABS do
local headerTab = _G["InspectTalentFrameTab"..i]
Expand Down Expand Up @@ -156,35 +156,43 @@ S:AddCallbackForAddon("Blizzard_InspectUI", "Skin_Blizzard_InspectUI", function(
end

InspectHeadSlot:Point("TOPLEFT", 19, -76)
InspectHandsSlot:Point("TOPLEFT", 307, -76)
InspectMainHandSlot:Point("TOPLEFT", InspectPaperDollFrame, "BOTTOMLEFT", 121, 131)
-- InspectHandsSlot:Point("TOPLEFT", 307, -76)
InspectHandsSlot:ClearAllPoints()
InspectHandsSlot:Point("TOPRIGHT", InspectFrameInset, "TOPRIGHT", -4, -15)
-- InspectMainHandSlot:Point("TOPLEFT", InspectPaperDollFrame, "BOTTOMLEFT", 121, 131)

InspectModelFrame:Size(237, 324)
InspectModelFrame:Point("TOPLEFT", 63, -76)

InspectModelRotateLeftButton:Point("TOPLEFT", 4, -4)
-- InspectModelRotateLeftButton:Point("TOPLEFT", 4, -4)

InspectTalentFrameScrollFrame:StripTextures()
InspectTalentFrameScrollFrame:CreateBackdrop("Transparent")
InspectTalentFrameScrollFrame.backdrop:Point("TOPLEFT", -1, 1)
InspectTalentFrameScrollFrame.backdrop:Point("BOTTOMRIGHT", 5, -4)
-- InspectTalentFrameScrollFrame:CreateBackdrop("Transparent")
-- InspectTalentFrameScrollFrame.backdrop:Point("TOPLEFT", -1, 1)
-- InspectTalentFrameScrollFrame.backdrop:Point("BOTTOMRIGHT", 5, -4)

InspectTalentFramePointsBar:StripTextures()

InspectModelRotateRightButton:Point("TOPLEFT", InspectModelRotateLeftButton, "TOPRIGHT", 3, 0)
-- InspectModelRotateRightButton:Point("TOPLEFT", InspectModelRotateLeftButton, "TOPRIGHT", 3, 0)

InspectFrameTab1:Point("CENTER", InspectFrame, "BOTTOMLEFT", 54, 62)
InspectFrameTab2:Point("LEFT", InspectFrameTab1, "RIGHT", -15, 0)
InspectFrameTab3:Point("LEFT", InspectFrameTab2, "RIGHT", -15, 0)

InspectTalentFrameBackgroundTopLeft:Point("TOPLEFT", 21, -77)

InspectTalentFrameTab1:Point("TOPLEFT", 17, -40)
InspectTalentFrameTab1:ClearAllPoints()
InspectTalentFrameTab1:SetPoint("BOTTOMLEFT", InspectFrameInset, "TOPLEFT", 10, 0)

-- InspectTalentFrameScrollFrame:Width(298)
-- InspectTalentFrameScrollFrame:Point("TOPRIGHT", -66, -77)
-- InspectTalentFrameScrollFrame:ClearAllPoints()
-- InspectTalentFrameScrollFrame:Point("CENTER", -7, -28)
InspectTalentFrameBackgroundTopLeft:ClearAllPoints() -- 4 текстуры жесть я считаю
InspectTalentFrameBackgroundTopLeft:SetPoint("TOPLEFT", 10, -63)

InspectTalentFrameScrollFrame:Width(298)
InspectTalentFrameScrollFrame:Point("TOPRIGHT", -66, -77)

S:HandleScrollBar(InspectTalentFrameScrollFrameScrollBar)
InspectTalentFrameScrollFrameScrollBar:Point("TOPLEFT", InspectTalentFrameScrollFrame, "TOPRIGHT", 8, -18)
InspectTalentFrameScrollFrameScrollBar:Point("BOTTOMLEFT", InspectTalentFrameScrollFrame, "BOTTOMRIGHT", 8, 15)
InspectTalentFrameScrollFrameScrollBar:Point("TOPLEFT", InspectTalentFrameScrollFrame, "TOPRIGHT", 10, -18)
InspectTalentFrameScrollFrameScrollBar:Point("BOTTOMLEFT", InspectTalentFrameScrollFrame, "BOTTOMRIGHT", 10, 15)
end)
4 changes: 2 additions & 2 deletions ElvUI/Modules/Skins/Blizzard/Load_Blizzard.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<Script file="DressingRoom.lua"/>
<Script file="Friends.lua"/>
<Script file="GuildBank.lua"/>
<Script file="Glyph.lua"/>
<!-- <Script file="Glyph.lua"/> -->
<Script file="GMChat.lua"/>
<Script file="Gossip.lua"/>
<Script file="GuildRegistrar.lua"/>
Expand All @@ -43,7 +43,7 @@
<Script file="Tooltip.lua"/>
<Script file="TimeManager.lua"/>
<Script file="Trade.lua"/>
<Script file="Tradeskill.lua"/>
<!-- <Script file="Tradeskill.lua"/> -->
<Script file="Trainer.lua"/>
<Script file="Tutorial.lua"/>
<Script file="WatchFrame.lua"/>
Expand Down
Loading

0 comments on commit 284dd7f

Please sign in to comment.