From ea5239854e4d52201f6449ff30029dbd2f6c5d9b Mon Sep 17 00:00:00 2001 From: Simpy Date: Tue, 24 Sep 2024 13:59:27 -0400 Subject: [PATCH 01/40] copy this over --- ElvUI/Core/Modules/DataBars/Reputation.lua | 2 +- ElvUI/Core/Modules/Skins/Skins.lua | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ElvUI/Core/Modules/DataBars/Reputation.lua b/ElvUI/Core/Modules/DataBars/Reputation.lua index 1b42cdca45..b64f8d3480 100644 --- a/ElvUI/Core/Modules/DataBars/Reputation.lua +++ b/ElvUI/Core/Modules/DataBars/Reputation.lua @@ -63,7 +63,7 @@ function DB:ReputationBar_Update() standing, currentReactionThreshold, nextReactionThreshold, currentStanding = info.reaction, info.reactionThreshold or 0, info.nextThreshold or huge, info.standing or 1 end - if not standing and factionID and E.Retail and C_Reputation_IsFactionParagon(factionID) then + if E.Retail and not standing and factionID and C_Reputation_IsFactionParagon(factionID) then local current, threshold current, threshold, _, rewardPending = C_Reputation_GetFactionParagonInfo(factionID) diff --git a/ElvUI/Core/Modules/Skins/Skins.lua b/ElvUI/Core/Modules/Skins/Skins.lua index ade653c3e1..d70518cb80 100644 --- a/ElvUI/Core/Modules/Skins/Skins.lua +++ b/ElvUI/Core/Modules/Skins/Skins.lua @@ -1146,9 +1146,7 @@ function S:HandleDropDownBox(frame, width, template, old) frame:SetFrameLevel(frame:GetFrameLevel() + 2) end - -- Add cata check back when merging ptr>main for classic 1.15.4 if not old then - -- if not E.Cata and not old then if frame.Arrow then frame.Arrow:SetAlpha(0) end From 37bdc5b9634c057e2a3a59c8ba6892cbc61874a8 Mon Sep 17 00:00:00 2001 From: Simpy Date: Tue, 24 Sep 2024 14:15:03 -0400 Subject: [PATCH 02/40] clean up stuff --- ElvUI/Classic/Modules/Skins/AuctionHouse.lua | 1 - .../Classic/Modules/Skins/BlizzardOptions.lua | 42 ------------------- ElvUI/Classic/Modules/Skins/Communities.lua | 5 ++- ElvUI/Classic/Modules/Skins/GuildControl.lua | 4 +- ElvUI/Core/Modules/ActionBars/ActionBars.lua | 3 +- ElvUI/Core/Modules/DataTexts/DataTexts.lua | 4 +- ElvUI/Core/Modules/DataTexts/Friends.lua | 8 ++-- ElvUI/Core/Modules/DataTexts/Guild.lua | 4 +- ElvUI/Core/Modules/DataTexts/Time.lua | 3 ++ ElvUI/Core/Modules/Misc/Misc.lua | 8 ++-- .../LibRangeCheck-3.0/LibRangeCheck-3.0.lua | 2 +- 11 files changed, 22 insertions(+), 62 deletions(-) diff --git a/ElvUI/Classic/Modules/Skins/AuctionHouse.lua b/ElvUI/Classic/Modules/Skins/AuctionHouse.lua index a081d98e90..ca43d2d6da 100644 --- a/ElvUI/Classic/Modules/Skins/AuctionHouse.lua +++ b/ElvUI/Classic/Modules/Skins/AuctionHouse.lua @@ -234,7 +234,6 @@ function S:Blizzard_AuctionUI() S:HandleRadioButton(_G.AuctionsLongAuctionButton) S:HandleDropDownBox(_G.BrowseDropdown, 155) - -- S:HandleDropDownBox(_G.PriceDropDown) -- Progress Frame _G.AuctionProgressFrame:StripTextures() diff --git a/ElvUI/Classic/Modules/Skins/BlizzardOptions.lua b/ElvUI/Classic/Modules/Skins/BlizzardOptions.lua index 6237b2dc65..0380b012c1 100644 --- a/ElvUI/Classic/Modules/Skins/BlizzardOptions.lua +++ b/ElvUI/Classic/Modules/Skins/BlizzardOptions.lua @@ -5,48 +5,6 @@ local _G = _G local ipairs, pairs, next = ipairs, pairs, next local hooksecurefunc = hooksecurefunc -local InCombatLockdown = InCombatLockdown - -local function HandlePushToTalkButton(button) - button:Size(button:GetSize()) - - button.TopLeft:Hide() - button.TopRight:Hide() - button.BottomLeft:Hide() - button.BottomRight:Hide() - button.TopMiddle:Hide() - button.MiddleLeft:Hide() - button.MiddleRight:Hide() - button.BottomMiddle:Hide() - button.MiddleMiddle:Hide() - button:SetHighlightTexture(E.ClearTexture) - - button:SetTemplate(nil, true) - button:HookScript('OnEnter', S.SetModifiedBackdrop) - button:HookScript('OnLeave', S.SetOriginalBackdrop) -end - -local function ReskinPickerOptions(self) - local scrollTarget = self.ScrollBox.ScrollTarget - if scrollTarget then - for _, child in next, { scrollTarget:GetChildren() } do - if not child.IsSkinned then - child.UnCheck:SetTexture(nil) - child.Highlight:SetColorTexture(1, .82, 0, 0.4) - - local check = child.Check - if check then - check:SetColorTexture(1, .82, 0, 0.8) - check:SetSize(10, 10) - check:Point('LEFT', 2, 0) - check:CreateBackdrop('Transparent') - end - - child.IsSkinned = true - end - end - end -end function S:BlizzardOptions() if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.blizzardOptions) then return end diff --git a/ElvUI/Classic/Modules/Skins/Communities.lua b/ElvUI/Classic/Modules/Skins/Communities.lua index ab0a18fcef..9993f9e935 100644 --- a/ElvUI/Classic/Modules/Skins/Communities.lua +++ b/ElvUI/Classic/Modules/Skins/Communities.lua @@ -3,12 +3,13 @@ local S = E:GetModule('Skins') local _G = _G local next, pairs, select = next, pairs, select +local hooksecurefunc = hooksecurefunc -local C_GuildInfo_GetGuildNewsInfo = C_GuildInfo.GetGuildNewsInfo local BATTLENET_FONT_COLOR = BATTLENET_FONT_COLOR local GREEN_FONT_COLOR = GREEN_FONT_COLOR + local CreateFrame = CreateFrame -local hooksecurefunc = hooksecurefunc +local C_GuildInfo_GetGuildNewsInfo = C_GuildInfo.GetGuildNewsInfo local function HandleCommunitiesButtons(button) button.Background:Hide() diff --git a/ElvUI/Classic/Modules/Skins/GuildControl.lua b/ElvUI/Classic/Modules/Skins/GuildControl.lua index 13920272cb..5c38c948f1 100644 --- a/ElvUI/Classic/Modules/Skins/GuildControl.lua +++ b/ElvUI/Classic/Modules/Skins/GuildControl.lua @@ -76,9 +76,7 @@ function S:Blizzard_GuildControlUI() S:HandleTrimScrollBar(_G.GuildControlUIRankBankFrameInsetScrollFrame.ScrollBar) S:HandleDropDownBox(_G.GuildControlUINavigationDropdown) S:HandleDropDownBox(_G.GuildControlUIRankSettingsFrameRankDropdown, 180) - --_G.GuildControlUINavigationDropDownButton:Width(20) - --_G.GuildControlUIRankSettingsFrameRankDropDownButton:Width(20) - --_G.GuildControlUIRankBankFrameRankDropDownButton:Width(20) + _G.GuildControlUIRankBankFrame:StripTextures() _G.GuildControlUIRankBankFrameInset:StripTextures() _G.GuildControlUIRankBankFrameInsetScrollFrame:StripTextures() diff --git a/ElvUI/Core/Modules/ActionBars/ActionBars.lua b/ElvUI/Core/Modules/ActionBars/ActionBars.lua index 18cf92a07c..9650192873 100644 --- a/ElvUI/Core/Modules/ActionBars/ActionBars.lua +++ b/ElvUI/Core/Modules/ActionBars/ActionBars.lua @@ -50,6 +50,7 @@ local ClearPetActionHighlightMarks = ClearPetActionHighlightMarks or PetActionBa local GetProfessionQuality = C_ActionBar.GetProfessionQuality local IsInBattle = C_PetBattles and C_PetBattles.IsInBattle +local C_PlayerInfo_GetGlidingInfo = C_PlayerInfo.GetGlidingInfo local FindSpellBookSlotForSpell = C_SpellBook.FindSpellBookSlotForSpell or SpellBook_GetSpellBookSlot local ActionBarController_UpdateAllSpellHighlights = ActionBarController_UpdateAllSpellHighlights @@ -892,7 +893,7 @@ end do local function CanGlide() -- required when reloading because the event wont fire yet - local isGliding, canGlide = C_PlayerInfo.GetGlidingInfo() + local isGliding, canGlide = C_PlayerInfo_GetGlidingInfo() return isGliding or canGlide end diff --git a/ElvUI/Core/Modules/DataTexts/DataTexts.lua b/ElvUI/Core/Modules/DataTexts/DataTexts.lua index 66194d4e7d..ff0e743b90 100644 --- a/ElvUI/Core/Modules/DataTexts/DataTexts.lua +++ b/ElvUI/Core/Modules/DataTexts/DataTexts.lua @@ -748,7 +748,7 @@ do DT:SortMenuList(QuickList) end - function DT:Player_Invite(name, guid) + function DT:InviteFriend(name, guid) if not (name and name ~= '') then return end local isBNet = type(name) == 'number' @@ -778,7 +778,7 @@ do end end - function DT:Player_Whisper(name, battleNet) + function DT:SendWhisper(name, battleNet) if battleNet then ChatFrame_SendBNetTell(name) else diff --git a/ElvUI/Core/Modules/DataTexts/Friends.lua b/ElvUI/Core/Modules/DataTexts/Friends.lua index 8d84578672..7a4c1ea991 100644 --- a/ElvUI/Core/Modules/DataTexts/Friends.lua +++ b/ElvUI/Core/Modules/DataTexts/Friends.lua @@ -340,11 +340,11 @@ local function Click(self, btn) if not classc then classc = levelc end menuCountWhispers = menuCountWhispers + 1 - menuList[3].menuList[menuCountWhispers] = {text = format(levelNameString,levelc.r*255,levelc.g*255,levelc.b*255,info.level,classc.r*255,classc.g*255,classc.b*255,info.name), arg1 = info.name, notCheckable=true, func = DT.Player_Whisper} + menuList[3].menuList[menuCountWhispers] = {text = format(levelNameString,levelc.r*255,levelc.g*255,levelc.b*255,info.level,classc.r*255,classc.g*255,classc.b*255,info.name), arg1 = info.name, notCheckable=true, func = DT.SendWhisper} if inGroup(info.name) == '' then menuCountInvites = menuCountInvites + 1 - menuList[2].menuList[menuCountInvites] = {text = format(levelNameString,levelc.r*255,levelc.g*255,levelc.b*255,info.level,classc.r*255,classc.g*255,classc.b*255,info.name), arg1 = info.name, arg2 = info.guid, notCheckable=true, func = DT.Player_Invite} + menuList[2].menuList[menuCountInvites] = {text = format(levelNameString,levelc.r*255,levelc.g*255,levelc.b*255,info.level,classc.r*255,classc.g*255,classc.b*255,info.name), arg1 = info.name, arg2 = info.guid, notCheckable=true, func = DT.InviteFriend} end end end @@ -374,7 +374,7 @@ local function Click(self, btn) if not hasBnet then -- hasBnet will make sure only one is added to whispers but still allow us to add multiple into invites menuCountWhispers = menuCountWhispers + 1 - menuList[3].menuList[menuCountWhispers] = {text = realID, arg1 = realID, arg2 = true, notCheckable=true, func = DT.Player_Whisper} + menuList[3].menuList[menuCountWhispers] = {text = realID, arg1 = realID, arg2 = true, notCheckable=true, func = DT.SendWhisper} end if (info.client and info.client == wowString) and inGroup(info.characterName, info.realmName) == '' then @@ -383,7 +383,7 @@ local function Click(self, btn) if info.wowProjectID == retailID then menuCountInvites = menuCountInvites + 1 - menuList[2].menuList[menuCountInvites] = {text = format(levelNameString,levelc.r*255,levelc.g*255,levelc.b*255,info.level,classc.r*255,classc.g*255,classc.b*255,info.characterName), arg1 = info.gameID, arg2 = info.guid, notCheckable=true, func = DT.Player_Invite} + menuList[2].menuList[menuCountInvites] = {text = format(levelNameString,levelc.r*255,levelc.g*255,levelc.b*255,info.level,classc.r*255,classc.g*255,classc.b*255,info.characterName), arg1 = info.gameID, arg2 = info.guid, notCheckable=true, func = DT.InviteFriend} end end end diff --git a/ElvUI/Core/Modules/DataTexts/Guild.lua b/ElvUI/Core/Modules/DataTexts/Guild.lua index f76759939d..ba6dcc6f6f 100644 --- a/ElvUI/Core/Modules/DataTexts/Guild.lua +++ b/ElvUI/Core/Modules/DataTexts/Guild.lua @@ -210,11 +210,11 @@ local function Click(self, btn) name = name..' |cffaaaaaa*|r' elseif not (info.isMobile and info.zone == REMOTE_CHAT) then menuCountInvites = menuCountInvites + 1 - menuList[2].menuList[menuCountInvites] = {text = name, arg1 = info.name, arg2 = info.guid, notCheckable=true, func = DT.Player_Invite} + menuList[2].menuList[menuCountInvites] = {text = name, arg1 = info.name, arg2 = info.guid, notCheckable=true, func = DT.InviteFriend} end menuCountWhispers = menuCountWhispers + 1 - menuList[3].menuList[menuCountWhispers] = {text = name, arg1 = info.name, notCheckable=true, func = DT.Player_Whisper} + menuList[3].menuList[menuCountWhispers] = {text = name, arg1 = info.name, notCheckable=true, func = DT.SendWhisper} end end diff --git a/ElvUI/Core/Modules/DataTexts/Time.lua b/ElvUI/Core/Modules/DataTexts/Time.lua index 83a4c708af..a4b5760009 100644 --- a/ElvUI/Core/Modules/DataTexts/Time.lua +++ b/ElvUI/Core/Modules/DataTexts/Time.lua @@ -213,6 +213,7 @@ local function OnEnter() if DT.tooltip:NumLines() > 0 then DT.tooltip:AddLine(' ') end + DT.tooltip:AddLine(L["Saved Raid(s)"]) sort(lockedInstances.raids, sortFunc) @@ -234,6 +235,7 @@ local function OnEnter() if DT.tooltip:NumLines() > 0 then DT.tooltip:AddLine(' ') end + DT.tooltip:AddLine(L["Saved Dungeon(s)"]) sort(lockedInstances.dungeons, sortFunc) @@ -269,6 +271,7 @@ local function OnEnter() if DT.tooltip:NumLines() > 0 then DT.tooltip:AddLine(' ') end + DT.tooltip:AddLine(WORLD_BOSSES_TEXT) addedLine = true end diff --git a/ElvUI/Core/Modules/Misc/Misc.lua b/ElvUI/Core/Modules/Misc/Misc.lua index 7debbb3812..c7d4718b0f 100644 --- a/ElvUI/Core/Modules/Misc/Misc.lua +++ b/ElvUI/Core/Modules/Misc/Misc.lua @@ -97,8 +97,8 @@ function M:ZoneTextToggle() end end -local function IsRandomGroup() - return IsPartyLFG() or IsPartyWalkIn() -- This is the API for Delves +function M:IsRandomGroup() + return IsPartyLFG() or (E.Retail and IsPartyWalkIn()) -- This is the API for Delves end function M:COMBAT_LOG_EVENT_UNFILTERED() @@ -109,11 +109,11 @@ function M:COMBAT_LOG_EVENT_UNFILTERED() local announce = spellName and (destGUID ~= E.myguid) and (sourceGUID == E.myguid or sourceGUID == UnitGUID('pet')) and strmatch(event, '_INTERRUPT') if not announce then return end -- No announce-able interrupt from player or pet, exit. - local inRaid, inPartyLFG = IsInRaid(), E.Retail and IsRandomGroup() + local inRaid, inPartyLFG = IsInRaid(), M:IsRandomGroup() --Skirmish/non-rated arenas need to use INSTANCE_CHAT but IsPartyLFG() returns 'false' local _, instanceType = GetInstanceInfo() - if E.Retail and instanceType == 'arena' then + if not E.Classic and instanceType == 'arena' then local skirmish = IsArenaSkirmish() local _, isRegistered = IsActiveBattlefieldArena() if skirmish or not isRegistered then diff --git a/ElvUI_Libraries/Core/LibRangeCheck-3.0/LibRangeCheck-3.0.lua b/ElvUI_Libraries/Core/LibRangeCheck-3.0/LibRangeCheck-3.0.lua index 3e1fbad9f7..87c94dd65a 100644 --- a/ElvUI_Libraries/Core/LibRangeCheck-3.0/LibRangeCheck-3.0.lua +++ b/ElvUI_Libraries/Core/LibRangeCheck-3.0/LibRangeCheck-3.0.lua @@ -40,7 +40,7 @@ License: MIT -- @class file -- @name LibRangeCheck-3.0 local MAJOR_VERSION = "LibRangeCheck-3.0-ElvUI" -local MINOR_VERSION = 22 -- based off real minor version: 26 +local MINOR_VERSION = 23 -- based off real minor version: 26 -- GLOBALS: LibStub, CreateFrame From 584ffc321469e405d5a005914eeecd42ae57bf3d Mon Sep 17 00:00:00 2001 From: Luckyone Date: Tue, 24 Sep 2024 20:30:57 +0200 Subject: [PATCH 03/40] Retail check for some BL funcs --- ElvUI/Core/Modules/Blizzard/Blizzard.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ElvUI/Core/Modules/Blizzard/Blizzard.lua b/ElvUI/Core/Modules/Blizzard/Blizzard.lua index 9a24801ff2..d0eea4144e 100644 --- a/ElvUI/Core/Modules/Blizzard/Blizzard.lua +++ b/ElvUI/Core/Modules/Blizzard/Blizzard.lua @@ -165,10 +165,13 @@ function BL:Initialize() end end + if E.Cata then + BL:KillBlizzard() + end + if E.Retail then BL:DisableHelpTip() BL:DisableTutorials() - BL:HandleTalkingHead() BL:HandleAddonCompartment() E:CreateMover(_G.LossOfControlFrame, 'LossControlMover', L["Loss Control Icon"]) From 3312c324480c554cc876af9cedf33b6523ac7015 Mon Sep 17 00:00:00 2001 From: Luckyone Date: Tue, 24 Sep 2024 20:32:42 +0200 Subject: [PATCH 04/40] Add this back --- ElvUI/Core/Modules/Blizzard/Blizzard.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/ElvUI/Core/Modules/Blizzard/Blizzard.lua b/ElvUI/Core/Modules/Blizzard/Blizzard.lua index d0eea4144e..914edb6024 100644 --- a/ElvUI/Core/Modules/Blizzard/Blizzard.lua +++ b/ElvUI/Core/Modules/Blizzard/Blizzard.lua @@ -172,6 +172,7 @@ function BL:Initialize() if E.Retail then BL:DisableHelpTip() BL:DisableTutorials() + BL:HandleTalkingHead() BL:HandleAddonCompartment() E:CreateMover(_G.LossOfControlFrame, 'LossControlMover', L["Loss Control Icon"]) From b5eb062251a02147498bb0c457dd01815b30e898 Mon Sep 17 00:00:00 2001 From: Simpy Date: Tue, 24 Sep 2024 14:33:47 -0400 Subject: [PATCH 05/40] shorter --- ElvUI/Core/Modules/Blizzard/Blizzard.lua | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ElvUI/Core/Modules/Blizzard/Blizzard.lua b/ElvUI/Core/Modules/Blizzard/Blizzard.lua index 914edb6024..e549920d43 100644 --- a/ElvUI/Core/Modules/Blizzard/Blizzard.lua +++ b/ElvUI/Core/Modules/Blizzard/Blizzard.lua @@ -167,9 +167,7 @@ function BL:Initialize() if E.Cata then BL:KillBlizzard() - end - - if E.Retail then + elseif E.Retail then BL:DisableHelpTip() BL:DisableTutorials() BL:HandleTalkingHead() From ad6209cc41afdafa0b7830fe919a958934ac89a6 Mon Sep 17 00:00:00 2001 From: Simpy Date: Tue, 24 Sep 2024 15:05:33 -0400 Subject: [PATCH 06/40] chat config boxes --- ElvUI/Cata/Modules/Skins/BlizzardOptions.lua | 23 ------------ .../Classic/Modules/Skins/BlizzardOptions.lua | 35 ++++++++++--------- ElvUI/Classic/Modules/Skins/Channels.lua | 2 ++ 3 files changed, 21 insertions(+), 39 deletions(-) diff --git a/ElvUI/Cata/Modules/Skins/BlizzardOptions.lua b/ElvUI/Cata/Modules/Skins/BlizzardOptions.lua index 01fb506dc2..901b80d80e 100644 --- a/ElvUI/Cata/Modules/Skins/BlizzardOptions.lua +++ b/ElvUI/Cata/Modules/Skins/BlizzardOptions.lua @@ -5,29 +5,6 @@ local _G = _G local ipairs, pairs, next = ipairs, pairs, next local hooksecurefunc = hooksecurefunc -local InCombatLockdown = InCombatLockdown - -local function ReskinPickerOptions(self) - local scrollTarget = self.ScrollBox.ScrollTarget - if scrollTarget then - for _, child in next, { scrollTarget:GetChildren() } do - if not child.IsSkinned then - child.UnCheck:SetTexture(nil) - child.Highlight:SetColorTexture(1, .82, 0, 0.4) - - local check = child.Check - if check then - check:SetColorTexture(1, .82, 0, 0.8) - check:SetSize(10, 10) - check:Point('LEFT', 2, 0) - check:CreateBackdrop('Transparent') - end - - child.IsSkinned = true - end - end - end -end function S:BlizzardOptions() if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.blizzardOptions) then return end diff --git a/ElvUI/Classic/Modules/Skins/BlizzardOptions.lua b/ElvUI/Classic/Modules/Skins/BlizzardOptions.lua index 0380b012c1..4a108ce398 100644 --- a/ElvUI/Classic/Modules/Skins/BlizzardOptions.lua +++ b/ElvUI/Classic/Modules/Skins/BlizzardOptions.lua @@ -108,6 +108,9 @@ function S:BlizzardOptions() _G.CombatConfigTab1:ClearAllPoints() _G.CombatConfigTab1:Point('BOTTOMLEFT', _G.ChatConfigBackgroundFrame, 'TOPLEFT', 6, -2) + _G.ChatConfigChatSettingsClassColorLegend.NineSlice:SetTemplate('Transparent') + _G.ChatConfigChannelSettingsClassColorLegend.NineSlice:SetTemplate('Transparent') + S:HandleEditBox(_G.CombatConfigSettingsNameEditBox) S:HandleNextPrevButton(_G.ChatConfigMoveFilterUpButton) S:HandleNextPrevButton(_G.ChatConfigMoveFilterDownButton) @@ -129,10 +132,11 @@ function S:BlizzardOptions() end) hooksecurefunc('ChatConfig_UpdateCheckboxes', function(frame) - if not _G.FCF_GetCurrentChatFrame() then return end - + if not _G.FCF_GetCurrentChatFrame() then + return + end for index in ipairs(frame.checkBoxTable) do - local checkBoxNameString = frame:GetName()..'CheckBox' + local checkBoxNameString = frame:GetName()..'Checkbox' local checkBoxName = checkBoxNameString..index local checkBox = _G[checkBoxName] local check = _G[checkBoxName..'Check'] @@ -149,7 +153,7 @@ function S:BlizzardOptions() hooksecurefunc('ChatConfig_UpdateTieredCheckboxes', function(frame, index) local group = frame.checkBoxTable[index] - local checkBox = _G[frame:GetName()..'CheckBox'..index] + local checkBox = _G[frame:GetName()..'Checkbox'..index] if checkBox then S:HandleCheckBox(checkBox) end @@ -161,26 +165,25 @@ function S:BlizzardOptions() end) hooksecurefunc('ChatConfig_UpdateSwatches', function(frame) - if not _G.FCF_GetCurrentChatFrame() then return end - + if not _G.FCF_GetCurrentChatFrame() then + return + end for index in ipairs(frame.swatchTable) do _G[frame:GetName()..'Swatch'..index]:StripTextures() end end) hooksecurefunc('ChatConfig_CreateBoxes', function(frame) - if not frame.boxTable then return end - local boxName = frame:GetName()..'Box' - for index in next, frame.boxTable do - local box = _G[boxName..index] - if box then - if box.NineSlice then - box.NineSlice:SetTemplate('Transparent') - end - if box.Button then - S:HandleButton(box.Button) + if frame.boxTable then + for index in next, frame.boxTable do + local box = _G[boxName..index] + if box then + box.NineSlice:SetTemplate('Transparent') + if box.Button then + S:HandleButton(box.Button) + end end end end diff --git a/ElvUI/Classic/Modules/Skins/Channels.lua b/ElvUI/Classic/Modules/Skins/Channels.lua index c272225bff..eb23c916a3 100644 --- a/ElvUI/Classic/Modules/Skins/Channels.lua +++ b/ElvUI/Classic/Modules/Skins/Channels.lua @@ -16,6 +16,7 @@ function S:Blizzard_Channels() S:HandlePointXY(ChannelFrame.NewButton, -1, 4) S:HandlePointXY(_G.ChannelFrameCloseButton, 2, 2) + -- ScrollBars S:HandleScrollBar(ChannelFrame.ChannelRoster.ScrollFrame.scrollBar) ChannelFrame.ChannelRoster.ScrollFrame.scrollBar:Point('TOPLEFT', ChannelFrame.ChannelRoster.ScrollFrame, 'TOPRIGHT', 1, -13) ChannelFrame.ChannelRoster.ScrollFrame.scrollBar:Point('BOTTOMLEFT', ChannelFrame.ChannelRoster.ScrollFrame, 'BOTTOMRIGHT', 1, 13) @@ -23,6 +24,7 @@ function S:Blizzard_Channels() S:HandleScrollBar(ChannelFrame.ChannelList.ScrollBar) ChannelFrame.ChannelList.ScrollBar:Point('BOTTOMLEFT', ChannelFrame.ChannelList, 'BOTTOMRIGHT', 0, 15) + -- Popups local CreateChannelPopup = _G.CreateChannelPopup S:HandleFrame(CreateChannelPopup, true) From e1ca3cbc68359cceb6364ed173bb383d59bcbffb Mon Sep 17 00:00:00 2001 From: Luckyone Date: Tue, 24 Sep 2024 20:38:47 +0200 Subject: [PATCH 07/40] Fix checkbox on SpellBook (ShowAllRanks) --- ElvUI/Classic/Modules/Skins/SpellBook.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ElvUI/Classic/Modules/Skins/SpellBook.lua b/ElvUI/Classic/Modules/Skins/SpellBook.lua index 3713da907f..9e7346f65d 100644 --- a/ElvUI/Classic/Modules/Skins/SpellBook.lua +++ b/ElvUI/Classic/Modules/Skins/SpellBook.lua @@ -30,6 +30,12 @@ function S:SpellBookFrame() S:HandleFrame(_G.SpellBookFrame, true, nil, 11, -12, -32, 76) + local showAllRanks = _G.ShowAllSpellRanksCheckbox + if showAllRanks then + S:HandleCheckBox(showAllRanks) + showAllRanks:Point('TOPLEFT', 20, -20) + end + _G.SpellBookTitleText:Point('TOP', -10, -17) _G.SpellBookTitleText:SetTextColor(1, 1, 1) From 3a47a694fb6622f216027b6d203196c72e94e3a7 Mon Sep 17 00:00:00 2001 From: Simpy Date: Tue, 24 Sep 2024 14:38:53 -0400 Subject: [PATCH 08/40] strip dropdowns --- ElvUI/Classic/Modules/Skins/Friends.lua | 2 +- ElvUI/Core/Modules/Skins/Skins.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ElvUI/Classic/Modules/Skins/Friends.lua b/ElvUI/Classic/Modules/Skins/Friends.lua index 1b7b90192e..77e8d4dcde 100644 --- a/ElvUI/Classic/Modules/Skins/Friends.lua +++ b/ElvUI/Classic/Modules/Skins/Friends.lua @@ -296,4 +296,4 @@ function S:FriendsFrame() S:HandleScrollBar(_G.RaidInfoScrollFrameScrollBar) end -S:AddCallback('FriendsFrame') \ No newline at end of file +S:AddCallback('FriendsFrame') diff --git a/ElvUI/Core/Modules/Skins/Skins.lua b/ElvUI/Core/Modules/Skins/Skins.lua index d70518cb80..c6bf0d76da 100644 --- a/ElvUI/Core/Modules/Skins/Skins.lua +++ b/ElvUI/Core/Modules/Skins/Skins.lua @@ -1139,7 +1139,7 @@ function S:HandleDropDownBox(frame, width, template, old) end frame:Width(width) - frame:StripTextures() + frame:StripTextures(true) if not frame.backdrop then frame:CreateBackdrop(template) From e7fb278a0462b02c619e9798d454bd924a20cd0d Mon Sep 17 00:00:00 2001 From: Luckyone Date: Tue, 24 Sep 2024 20:56:03 +0200 Subject: [PATCH 09/40] Fix WorldMap DropDowns --- ElvUI/Classic/Modules/Skins/WorldMap.lua | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/ElvUI/Classic/Modules/Skins/WorldMap.lua b/ElvUI/Classic/Modules/Skins/WorldMap.lua index 6f1c8bc888..2e48a8b07d 100644 --- a/ElvUI/Classic/Modules/Skins/WorldMap.lua +++ b/ElvUI/Classic/Modules/Skins/WorldMap.lua @@ -17,22 +17,19 @@ function S:WorldMapFrame() WorldMapFrame.MiniBorderFrame:CreateBackdrop('Transparent') WorldMapFrame.MiniBorderFrame.backdrop:Point('TOPLEFT', 6, -2) - S:HandleDropDownBox(_G.WorldMapZoneMinimapDropdown) - S:HandleDropDownBox(_G.WorldMapContinentDropdown) - S:HandleDropDownBox(_G.WorldMapZoneDropdown) + S:HandleDropDownBox(_G.WorldMapZoneMinimapDropdown, 160) + S:HandleDropDownBox(_G.WorldMapContinentDropdown, 160) + S:HandleDropDownBox(_G.WorldMapZoneDropdown, 160) S:HandleMaxMinFrame(_G.WorldMapFrame.MaximizeMinimizeFrame) _G.WorldMapContinentDropdown:Point('TOPLEFT', WorldMapFrame, 'TOPLEFT', 330, -35) - _G.WorldMapContinentDropdown:Width(205) - _G.WorldMapContinentDropdown:Height(33) + _G.WorldMapContinentDropdown:Height(28) - _G.WorldMapZoneDropdown:Point('LEFT', _G.WorldMapContinentDropdown, 'RIGHT', -20, 0) - _G.WorldMapZoneDropdown:Width(205) - _G.WorldMapZoneDropdown:Height(33) + _G.WorldMapZoneDropdown:Point('LEFT', _G.WorldMapContinentDropdown, 'RIGHT', 10, 0) + _G.WorldMapZoneDropdown:Height(28) - _G.WorldMapZoneMinimapDropdown:Point('RIGHT', _G.WorldMapContinentDropdown, 'LEFT', 20, 0) - _G.WorldMapZoneMinimapDropdown:Width(205) - _G.WorldMapZoneMinimapDropdown:Height(33) + _G.WorldMapZoneMinimapDropdown:Point('RIGHT', _G.WorldMapContinentDropdown, 'LEFT', -10, 0) + _G.WorldMapZoneMinimapDropdown:Height(28) _G.WorldMapZoomOutButton:Point('LEFT', _G.WorldMapZoneDropdown, 'RIGHT', 3, 3) _G.WorldMapZoomOutButton:Height(23) From e41481f4da18a7e25aca988dc31a2a5ef797c6ad Mon Sep 17 00:00:00 2001 From: Simpy Date: Tue, 24 Sep 2024 14:46:55 -0400 Subject: [PATCH 10/40] communities skin --- ElvUI/Classic/Modules/Skins/Communities.lua | 47 +++++++++++++++++++-- 1 file changed, 43 insertions(+), 4 deletions(-) diff --git a/ElvUI/Classic/Modules/Skins/Communities.lua b/ElvUI/Classic/Modules/Skins/Communities.lua index 9993f9e935..2c3448e3d4 100644 --- a/ElvUI/Classic/Modules/Skins/Communities.lua +++ b/ElvUI/Classic/Modules/Skins/Communities.lua @@ -3,13 +3,12 @@ local S = E:GetModule('Skins') local _G = _G local next, pairs, select = next, pairs, select -local hooksecurefunc = hooksecurefunc +local C_GuildInfo_GetGuildNewsInfo = C_GuildInfo.GetGuildNewsInfo local BATTLENET_FONT_COLOR = BATTLENET_FONT_COLOR local GREEN_FONT_COLOR = GREEN_FONT_COLOR - local CreateFrame = CreateFrame -local C_GuildInfo_GetGuildNewsInfo = C_GuildInfo.GetGuildNewsInfo +local hooksecurefunc = hooksecurefunc local function HandleCommunitiesButtons(button) button.Background:Hide() @@ -111,6 +110,7 @@ function S:Blizzard_Communities() CommunitiesFrameCommunitiesList.BottomFiligree:Hide() CommunitiesFrameCommunitiesList.ScrollBar:GetChildren():Hide() S:HandleTrimScrollBar(CommunitiesFrameCommunitiesList.ScrollBar) + S:HandleDropDownBox(CommunitiesFrame.StreamDropdown) hooksecurefunc(CommunitiesFrameCommunitiesList.ScrollBox, 'Update', function(frame) for _, child in next, { frame.ScrollTarget:GetChildren() } do @@ -135,6 +135,8 @@ function S:Blizzard_Communities() S:HandleButton(CommunitiesFrame.InviteButton) S:HandleNextPrevButton(CommunitiesFrame.AddToChatButton) + S:HandleDropDownBox(CommunitiesFrame.CommunitiesListDropdown) + hooksecurefunc(_G.CommunitiesNotificationSettingsStreamEntryMixin, 'SetFilter', function(s) s.ShowNotificationsButton:Size(20, 20) s.HideNotificationsButton:Size(20, 20) @@ -210,14 +212,35 @@ function S:Blizzard_Communities() local ClubFinderGuildFinderFrame = _G.ClubFinderGuildFinderFrame ClubFinderGuildFinderFrame:StripTextures() + local ClubFinderGuildOptionsList = ClubFinderGuildFinderFrame.OptionsList + S:HandleDropDownBox(ClubFinderGuildOptionsList.ClubFilterDropdown) + S:HandleDropDownBox(ClubFinderGuildOptionsList.ClubSizeDropdown) + + ClubFinderGuildOptionsList.SearchBox:Size(118, 20) + ClubFinderGuildOptionsList.Search:Size(118, 20) + ClubFinderGuildOptionsList.Search:ClearAllPoints() + ClubFinderGuildOptionsList.Search:Point('TOP', ClubFinderGuildOptionsList.SearchBox, 'BOTTOM', 1, -3) + S:HandleEditBox(ClubFinderGuildOptionsList.SearchBox) + S:HandleButton(ClubFinderGuildOptionsList.Search) + + --S:HandleCheckBox(ClubFinderGuildOptionsList.TankRoleFrame.Checkbox) + --S:HandleCheckBox(ClubFinderGuildOptionsList.HealerRoleFrame.Checkbox) + --S:HandleCheckBox(ClubFinderGuildOptionsList.DpsRoleFrame.Checkbox) + S:HandleItemButton(ClubFinderGuildFinderFrame.ClubFinderSearchTab) S:HandleItemButton(ClubFinderGuildFinderFrame.ClubFinderPendingTab) -- Community and Guild finder Tab local ClubFinderCommunityAndGuildFinderFrame = _G.ClubFinderCommunityAndGuildFinderFrame - local ClubFinderCommunityOptionsList = ClubFinderCommunityAndGuildFinderFrame.OptionsList ClubFinderCommunityAndGuildFinderFrame:StripTextures() + local ClubFinderCommunityOptionsList = ClubFinderCommunityAndGuildFinderFrame.OptionsList + S:HandleDropDownBox(ClubFinderCommunityOptionsList.ClubFilterDropdown, 120) + S:HandleDropDownBox(ClubFinderCommunityOptionsList.SortByDropdown, 120) + + ClubFinderCommunityOptionsList.SortByDropdown:ClearAllPoints() + ClubFinderCommunityOptionsList.SortByDropdown:Point('RIGHT', ClubFinderCommunityOptionsList.ClubFilterDropdown, 'RIGHT', 120, 0) + S:HandleButton(ClubFinderCommunityOptionsList.Search) ClubFinderCommunityOptionsList.Search:ClearAllPoints() ClubFinderCommunityOptionsList.Search:Point('TOP', ClubFinderCommunityOptionsList.SearchBox, 'BOTTOM', 1, -3) @@ -225,6 +248,10 @@ function S:Blizzard_Communities() ClubFinderCommunityOptionsList.SearchBox:Size(118, 20) S:HandleEditBox(ClubFinderCommunityOptionsList.SearchBox) + S:HandleCheckBox(ClubFinderCommunityOptionsList.TankRoleFrame.Checkbox) + S:HandleCheckBox(ClubFinderCommunityOptionsList.HealerRoleFrame.Checkbox) + S:HandleCheckBox(ClubFinderCommunityOptionsList.DpsRoleFrame.Checkbox) + S:HandleItemButton(ClubFinderCommunityAndGuildFinderFrame.ClubFinderSearchTab) S:HandleItemButton(ClubFinderCommunityAndGuildFinderFrame.ClubFinderPendingTab) @@ -242,6 +269,10 @@ function S:Blizzard_Communities() CommunitiesFrame.GuildMemberDetailFrame.RemoveButton:ClearAllPoints() CommunitiesFrame.GuildMemberDetailFrame.RemoveButton:Point('BOTTOMLEFT', 10, 4) + local DropDown = CommunitiesFrame.GuildMemberDetailFrame.RankDropdown + DropDown:Point('LEFT', CommunitiesFrame.GuildMemberDetailFrame.RankLabel, 'RIGHT', 0, -3) + S:HandleDropDownBox(DropDown, 150) + -- Roster Tab local MemberList = CommunitiesFrame.MemberList local ColumnDisplay = MemberList.ColumnDisplay @@ -252,6 +283,7 @@ function S:Blizzard_Communities() ColumnDisplay.InsetBorderTop:Hide() S:HandleInsetFrame(MemberList.InsetFrame) + S:HandleDropDownBox(CommunitiesFrame.GuildMemberListDropdown) S:HandleButton(CommunitiesFrame.CommunitiesControlFrame.GuildControlButton) S:HandleButton(CommunitiesFrame.CommunitiesControlFrame.GuildRecruitmentButton) S:HandleButton(CommunitiesFrame.CommunitiesControlFrame.CommunitiesSettingsButton) @@ -428,6 +460,9 @@ function S:Blizzard_Communities() RecruitmentDialog:StripTextures() RecruitmentDialog:SetTemplate('Transparent') S:HandleCheckBox(RecruitmentDialog.ShouldListClub.Button) + S:HandleDropDownBox(RecruitmentDialog.ClubFocusDropdown, 220) + S:HandleDropDownBox(RecruitmentDialog.LookingForDropdown, 220) + S:HandleDropDownBox(RecruitmentDialog.LanguageDropdown, 140) RecruitmentDialog.RecruitmentMessageFrame:StripTextures() S:HandleEditBox(RecruitmentDialog.RecruitmentMessageFrame.RecruitmentMessageInput) S:HandleCheckBox(RecruitmentDialog.MaxLevelOnly.Button) @@ -441,6 +476,7 @@ function S:Blizzard_Communities() local NotificationSettings = _G.CommunitiesFrame.NotificationSettingsDialog NotificationSettings.Selector:StripTextures() S:HandleFrame(NotificationSettings) + S:HandleDropDownBox(NotificationSettings.CommunitiesListDropdown, 190) S:HandleCheckBox(NotificationSettings.ScrollFrame.Child.QuickJoinButton) S:HandleButton(NotificationSettings.ScrollFrame.Child.AllButton) S:HandleButton(NotificationSettings.ScrollFrame.Child.NoneButton) @@ -508,6 +544,9 @@ function S:Blizzard_Communities() S:HandleButton(TicketManager.Close) S:HandleButton(TicketManager.GenerateLinkButton) + S:HandleDropDownBox(TicketManager.ExpiresDropdown) + S:HandleDropDownBox(TicketManager.UsesDropdown) + S:HandleButton(TicketManager.MaximizeButton) -- InvitationsFrames From d6f44810eaaa94fd643e08ea738119627d7d3f6e Mon Sep 17 00:00:00 2001 From: Luckyone Date: Tue, 24 Sep 2024 20:58:43 +0200 Subject: [PATCH 11/40] Better --- ElvUI/Classic/Modules/Skins/WorldMap.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ElvUI/Classic/Modules/Skins/WorldMap.lua b/ElvUI/Classic/Modules/Skins/WorldMap.lua index 2e48a8b07d..95bc1df249 100644 --- a/ElvUI/Classic/Modules/Skins/WorldMap.lua +++ b/ElvUI/Classic/Modules/Skins/WorldMap.lua @@ -23,15 +23,15 @@ function S:WorldMapFrame() S:HandleMaxMinFrame(_G.WorldMapFrame.MaximizeMinimizeFrame) _G.WorldMapContinentDropdown:Point('TOPLEFT', WorldMapFrame, 'TOPLEFT', 330, -35) - _G.WorldMapContinentDropdown:Height(28) + _G.WorldMapContinentDropdown:Height(26) _G.WorldMapZoneDropdown:Point('LEFT', _G.WorldMapContinentDropdown, 'RIGHT', 10, 0) - _G.WorldMapZoneDropdown:Height(28) + _G.WorldMapZoneDropdown:Height(26) _G.WorldMapZoneMinimapDropdown:Point('RIGHT', _G.WorldMapContinentDropdown, 'LEFT', -10, 0) - _G.WorldMapZoneMinimapDropdown:Height(28) + _G.WorldMapZoneMinimapDropdown:Height(26) - _G.WorldMapZoomOutButton:Point('LEFT', _G.WorldMapZoneDropdown, 'RIGHT', 3, 3) + _G.WorldMapZoomOutButton:Point('LEFT', _G.WorldMapZoneDropdown, 'RIGHT', 10, 1) _G.WorldMapZoomOutButton:Height(23) _G.WorldMapZoomOutButton:Width(100) _G.WorldMapZoomOutButton:SetFrameLevel(_G.WorldMapFrame.BlackoutFrame:GetFrameLevel() + 2) From b55f1d1534791327e4ba1ff0b9e07bd3e737930e Mon Sep 17 00:00:00 2001 From: Luckyone Date: Tue, 24 Sep 2024 20:59:53 +0200 Subject: [PATCH 12/40] Fix TradeSkill DropDowns --- ElvUI/Classic/Modules/Skins/TradeSkill.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ElvUI/Classic/Modules/Skins/TradeSkill.lua b/ElvUI/Classic/Modules/Skins/TradeSkill.lua index 67b3ac2a05..54f2aedce9 100644 --- a/ElvUI/Classic/Modules/Skins/TradeSkill.lua +++ b/ElvUI/Classic/Modules/Skins/TradeSkill.lua @@ -46,11 +46,11 @@ function S:Blizzard_TradeSkillUI() TradeSkillCollapseAllButton:GetDisabledTexture():Size(15) TradeSkillCollapseAllButton:GetDisabledTexture():SetDesaturated(true) - S:HandleDropDownBox(_G.TradeSkillInvSlotDropdown, 140) + S:HandleDropDownBox(_G.TradeSkillInvSlotDropdown, 110) _G.TradeSkillInvSlotDropdown:ClearAllPoints() _G.TradeSkillInvSlotDropdown:Point('TOPRIGHT', TradeSkillFrame, 'TOPRIGHT', -32, -68) - S:HandleDropDownBox(_G.TradeSkillSubClassDropdown, 140) + S:HandleDropDownBox(_G.TradeSkillSubClassDropdown, 110) _G.TradeSkillSubClassDropdown:ClearAllPoints() _G.TradeSkillSubClassDropdown:Point('RIGHT', _G.TradeSkillInvSlotDropdown, 'RIGHT', -120, 0) From ea65db352ad16a0db74b24d5ab53951b42b0fe73 Mon Sep 17 00:00:00 2001 From: Simpy Date: Tue, 24 Sep 2024 15:03:50 -0400 Subject: [PATCH 13/40] uncomment this --- ElvUI/Classic/Modules/Skins/Communities.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ElvUI/Classic/Modules/Skins/Communities.lua b/ElvUI/Classic/Modules/Skins/Communities.lua index 2c3448e3d4..8339b49662 100644 --- a/ElvUI/Classic/Modules/Skins/Communities.lua +++ b/ElvUI/Classic/Modules/Skins/Communities.lua @@ -223,9 +223,9 @@ function S:Blizzard_Communities() S:HandleEditBox(ClubFinderGuildOptionsList.SearchBox) S:HandleButton(ClubFinderGuildOptionsList.Search) - --S:HandleCheckBox(ClubFinderGuildOptionsList.TankRoleFrame.Checkbox) - --S:HandleCheckBox(ClubFinderGuildOptionsList.HealerRoleFrame.Checkbox) - --S:HandleCheckBox(ClubFinderGuildOptionsList.DpsRoleFrame.Checkbox) + S:HandleCheckBox(ClubFinderGuildOptionsList.TankRoleFrame.Checkbox) + S:HandleCheckBox(ClubFinderGuildOptionsList.HealerRoleFrame.Checkbox) + S:HandleCheckBox(ClubFinderGuildOptionsList.DpsRoleFrame.Checkbox) S:HandleItemButton(ClubFinderGuildFinderFrame.ClubFinderSearchTab) S:HandleItemButton(ClubFinderGuildFinderFrame.ClubFinderPendingTab) From b000cf7c768f2cb04d9bfb3ec278f728701a6f90 Mon Sep 17 00:00:00 2001 From: Simpy Date: Tue, 24 Sep 2024 15:13:18 -0400 Subject: [PATCH 14/40] 13.78 --- CHANGELOG.md | 6 ++++++ ElvUI/Core/init.lua | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a60d7756e7..2f1aa598ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +### Version 13.78 [ September 24th 2024 ] +* Priest and Shaman spells added to help with Range checking. +* Objective Tracker taint caused from SplashFrame (there are likely more causes). +* Time Datatext now has an option to toggle Saved Instances. +* Heal Prediction no longer being goofy. + ### Version 13.77 [ September 10th 2024 ] * Unitframe range issue with Shaman resolved. * Castbar option to allow BigWigs to rename spells to something better to understand (Example: 'Impaling Eruption' becomes 'Frontal'). diff --git a/ElvUI/Core/init.lua b/ElvUI/Core/init.lua index 4d72bf704e..f7939d8911 100644 --- a/ElvUI/Core/init.lua +++ b/ElvUI/Core/init.lua @@ -116,7 +116,7 @@ end function E:ParseVersionString(addon) local version = GetAddOnMetadata(addon, 'Version') if strfind(version, 'project%-version') then - return 13.77, '13.77-git', nil, true + return 13.78, '13.78-git', nil, true else local release, extra = strmatch(version, '^v?([%d.]+)(.*)') return tonumber(release), release..extra, extra ~= '' From ab98a52e1fccec6e732571cbd9080c813ee6576a Mon Sep 17 00:00:00 2001 From: Simpy Date: Tue, 24 Sep 2024 15:31:31 -0400 Subject: [PATCH 15/40] remove this --- ElvUI/Core/Modules/Blizzard/Blizzard.lua | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ElvUI/Core/Modules/Blizzard/Blizzard.lua b/ElvUI/Core/Modules/Blizzard/Blizzard.lua index e549920d43..9a24801ff2 100644 --- a/ElvUI/Core/Modules/Blizzard/Blizzard.lua +++ b/ElvUI/Core/Modules/Blizzard/Blizzard.lua @@ -165,9 +165,7 @@ function BL:Initialize() end end - if E.Cata then - BL:KillBlizzard() - elseif E.Retail then + if E.Retail then BL:DisableHelpTip() BL:DisableTutorials() BL:HandleTalkingHead() From beee7d75b37db463fecc75332d5008efee183477 Mon Sep 17 00:00:00 2001 From: Simpy Date: Tue, 24 Sep 2024 15:31:38 -0400 Subject: [PATCH 16/40] communities skin from main --- ElvUI/Cata/Modules/Skins/Communities.lua | 42 +++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/ElvUI/Cata/Modules/Skins/Communities.lua b/ElvUI/Cata/Modules/Skins/Communities.lua index ab0a18fcef..8339b49662 100644 --- a/ElvUI/Cata/Modules/Skins/Communities.lua +++ b/ElvUI/Cata/Modules/Skins/Communities.lua @@ -110,6 +110,7 @@ function S:Blizzard_Communities() CommunitiesFrameCommunitiesList.BottomFiligree:Hide() CommunitiesFrameCommunitiesList.ScrollBar:GetChildren():Hide() S:HandleTrimScrollBar(CommunitiesFrameCommunitiesList.ScrollBar) + S:HandleDropDownBox(CommunitiesFrame.StreamDropdown) hooksecurefunc(CommunitiesFrameCommunitiesList.ScrollBox, 'Update', function(frame) for _, child in next, { frame.ScrollTarget:GetChildren() } do @@ -134,6 +135,8 @@ function S:Blizzard_Communities() S:HandleButton(CommunitiesFrame.InviteButton) S:HandleNextPrevButton(CommunitiesFrame.AddToChatButton) + S:HandleDropDownBox(CommunitiesFrame.CommunitiesListDropdown) + hooksecurefunc(_G.CommunitiesNotificationSettingsStreamEntryMixin, 'SetFilter', function(s) s.ShowNotificationsButton:Size(20, 20) s.HideNotificationsButton:Size(20, 20) @@ -209,14 +212,35 @@ function S:Blizzard_Communities() local ClubFinderGuildFinderFrame = _G.ClubFinderGuildFinderFrame ClubFinderGuildFinderFrame:StripTextures() + local ClubFinderGuildOptionsList = ClubFinderGuildFinderFrame.OptionsList + S:HandleDropDownBox(ClubFinderGuildOptionsList.ClubFilterDropdown) + S:HandleDropDownBox(ClubFinderGuildOptionsList.ClubSizeDropdown) + + ClubFinderGuildOptionsList.SearchBox:Size(118, 20) + ClubFinderGuildOptionsList.Search:Size(118, 20) + ClubFinderGuildOptionsList.Search:ClearAllPoints() + ClubFinderGuildOptionsList.Search:Point('TOP', ClubFinderGuildOptionsList.SearchBox, 'BOTTOM', 1, -3) + S:HandleEditBox(ClubFinderGuildOptionsList.SearchBox) + S:HandleButton(ClubFinderGuildOptionsList.Search) + + S:HandleCheckBox(ClubFinderGuildOptionsList.TankRoleFrame.Checkbox) + S:HandleCheckBox(ClubFinderGuildOptionsList.HealerRoleFrame.Checkbox) + S:HandleCheckBox(ClubFinderGuildOptionsList.DpsRoleFrame.Checkbox) + S:HandleItemButton(ClubFinderGuildFinderFrame.ClubFinderSearchTab) S:HandleItemButton(ClubFinderGuildFinderFrame.ClubFinderPendingTab) -- Community and Guild finder Tab local ClubFinderCommunityAndGuildFinderFrame = _G.ClubFinderCommunityAndGuildFinderFrame - local ClubFinderCommunityOptionsList = ClubFinderCommunityAndGuildFinderFrame.OptionsList ClubFinderCommunityAndGuildFinderFrame:StripTextures() + local ClubFinderCommunityOptionsList = ClubFinderCommunityAndGuildFinderFrame.OptionsList + S:HandleDropDownBox(ClubFinderCommunityOptionsList.ClubFilterDropdown, 120) + S:HandleDropDownBox(ClubFinderCommunityOptionsList.SortByDropdown, 120) + + ClubFinderCommunityOptionsList.SortByDropdown:ClearAllPoints() + ClubFinderCommunityOptionsList.SortByDropdown:Point('RIGHT', ClubFinderCommunityOptionsList.ClubFilterDropdown, 'RIGHT', 120, 0) + S:HandleButton(ClubFinderCommunityOptionsList.Search) ClubFinderCommunityOptionsList.Search:ClearAllPoints() ClubFinderCommunityOptionsList.Search:Point('TOP', ClubFinderCommunityOptionsList.SearchBox, 'BOTTOM', 1, -3) @@ -224,6 +248,10 @@ function S:Blizzard_Communities() ClubFinderCommunityOptionsList.SearchBox:Size(118, 20) S:HandleEditBox(ClubFinderCommunityOptionsList.SearchBox) + S:HandleCheckBox(ClubFinderCommunityOptionsList.TankRoleFrame.Checkbox) + S:HandleCheckBox(ClubFinderCommunityOptionsList.HealerRoleFrame.Checkbox) + S:HandleCheckBox(ClubFinderCommunityOptionsList.DpsRoleFrame.Checkbox) + S:HandleItemButton(ClubFinderCommunityAndGuildFinderFrame.ClubFinderSearchTab) S:HandleItemButton(ClubFinderCommunityAndGuildFinderFrame.ClubFinderPendingTab) @@ -241,6 +269,10 @@ function S:Blizzard_Communities() CommunitiesFrame.GuildMemberDetailFrame.RemoveButton:ClearAllPoints() CommunitiesFrame.GuildMemberDetailFrame.RemoveButton:Point('BOTTOMLEFT', 10, 4) + local DropDown = CommunitiesFrame.GuildMemberDetailFrame.RankDropdown + DropDown:Point('LEFT', CommunitiesFrame.GuildMemberDetailFrame.RankLabel, 'RIGHT', 0, -3) + S:HandleDropDownBox(DropDown, 150) + -- Roster Tab local MemberList = CommunitiesFrame.MemberList local ColumnDisplay = MemberList.ColumnDisplay @@ -251,6 +283,7 @@ function S:Blizzard_Communities() ColumnDisplay.InsetBorderTop:Hide() S:HandleInsetFrame(MemberList.InsetFrame) + S:HandleDropDownBox(CommunitiesFrame.GuildMemberListDropdown) S:HandleButton(CommunitiesFrame.CommunitiesControlFrame.GuildControlButton) S:HandleButton(CommunitiesFrame.CommunitiesControlFrame.GuildRecruitmentButton) S:HandleButton(CommunitiesFrame.CommunitiesControlFrame.CommunitiesSettingsButton) @@ -427,6 +460,9 @@ function S:Blizzard_Communities() RecruitmentDialog:StripTextures() RecruitmentDialog:SetTemplate('Transparent') S:HandleCheckBox(RecruitmentDialog.ShouldListClub.Button) + S:HandleDropDownBox(RecruitmentDialog.ClubFocusDropdown, 220) + S:HandleDropDownBox(RecruitmentDialog.LookingForDropdown, 220) + S:HandleDropDownBox(RecruitmentDialog.LanguageDropdown, 140) RecruitmentDialog.RecruitmentMessageFrame:StripTextures() S:HandleEditBox(RecruitmentDialog.RecruitmentMessageFrame.RecruitmentMessageInput) S:HandleCheckBox(RecruitmentDialog.MaxLevelOnly.Button) @@ -440,6 +476,7 @@ function S:Blizzard_Communities() local NotificationSettings = _G.CommunitiesFrame.NotificationSettingsDialog NotificationSettings.Selector:StripTextures() S:HandleFrame(NotificationSettings) + S:HandleDropDownBox(NotificationSettings.CommunitiesListDropdown, 190) S:HandleCheckBox(NotificationSettings.ScrollFrame.Child.QuickJoinButton) S:HandleButton(NotificationSettings.ScrollFrame.Child.AllButton) S:HandleButton(NotificationSettings.ScrollFrame.Child.NoneButton) @@ -507,6 +544,9 @@ function S:Blizzard_Communities() S:HandleButton(TicketManager.Close) S:HandleButton(TicketManager.GenerateLinkButton) + S:HandleDropDownBox(TicketManager.ExpiresDropdown) + S:HandleDropDownBox(TicketManager.UsesDropdown) + S:HandleButton(TicketManager.MaximizeButton) -- InvitationsFrames From 7b9e612dc8dff3e0b850a5ee8ca73abcaa3ba61d Mon Sep 17 00:00:00 2001 From: Simpy Date: Wed, 25 Sep 2024 02:24:40 -0400 Subject: [PATCH 17/40] rep error for datatext and databars --- ElvUI/Core/Modules/DataBars/Reputation.lua | 2 +- ElvUI/Core/Modules/DataTexts/Reputation.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ElvUI/Core/Modules/DataBars/Reputation.lua b/ElvUI/Core/Modules/DataBars/Reputation.lua index b64f8d3480..24c416be83 100644 --- a/ElvUI/Core/Modules/DataBars/Reputation.lua +++ b/ElvUI/Core/Modules/DataBars/Reputation.lua @@ -152,7 +152,7 @@ function DB:ReputationBar_OnEnter() local data = E:GetWatchedFactionInfo() local name, reaction, currentReactionThreshold, nextReactionThreshold, currentStanding, factionID = data.name, data.reaction, data.currentReactionThreshold, data.nextReactionThreshold, data.currentStanding, data.factionID - local isParagon = factionID and C_Reputation_IsFactionParagon(factionID) + local isParagon = E.Retail and factionID and C_Reputation_IsFactionParagon(factionID) local standing if isParagon then diff --git a/ElvUI/Core/Modules/DataTexts/Reputation.lua b/ElvUI/Core/Modules/DataTexts/Reputation.lua index 224be19a0e..0474396f2a 100644 --- a/ElvUI/Core/Modules/DataTexts/Reputation.lua +++ b/ElvUI/Core/Modules/DataTexts/Reputation.lua @@ -54,7 +54,7 @@ local function OnEvent(self) standing, currentReactionThreshold, nextReactionThreshold, currentStanding = info.reaction, info.reactionThreshold or 0, info.nextThreshold or huge, info.standing or 1 end - if not standing and factionID and C_Reputation_IsFactionParagon(factionID) then + if E.Retail and not standing and factionID and C_Reputation_IsFactionParagon(factionID) then local current, threshold current, threshold = C_Reputation_GetFactionParagonInfo(factionID) @@ -108,7 +108,7 @@ local function OnEnter() if not data then return end local name, reaction, currentReactionThreshold, nextReactionThreshold, currentStanding, factionID = data.name, data.reaction, data.currentReactionThreshold, data.nextReactionThreshold, data.currentStanding, data.factionID - local isParagon = factionID and C_Reputation_IsFactionParagon(factionID) + local isParagon = E.Retail and factionID and C_Reputation_IsFactionParagon(factionID) local standing if isParagon then From 6c1f2c174f4ffa2d1eb2823aa574637799709321 Mon Sep 17 00:00:00 2001 From: Luckyone Date: Wed, 25 Sep 2024 14:31:26 +0200 Subject: [PATCH 18/40] Fix MM middleclick --- ElvUI/Core/Modules/Maps/Minimap.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI/Core/Modules/Maps/Minimap.lua b/ElvUI/Core/Modules/Maps/Minimap.lua index c6c2cc941e..7f60cc316b 100644 --- a/ElvUI/Core/Modules/Maps/Minimap.lua +++ b/ElvUI/Core/Modules/Maps/Minimap.lua @@ -88,7 +88,7 @@ tinsert(menuList, { microOffset = 'MainMenuMicroButton', func = function() if not _G.GameMenuFrame:IsShown() then - if not E.Retail then + if E.Cata then if _G.VideoOptionsFrame:IsShown() then _G.VideoOptionsFrameCancel:Click() elseif _G.AudioOptionsFrame:IsShown() then From d0ed88c159d9df1fb89b39b14e102565a4faea14 Mon Sep 17 00:00:00 2001 From: Luckyone Date: Sat, 5 Oct 2024 08:38:17 +0200 Subject: [PATCH 19/40] WorldMap updates (Cata) --- ElvUI/Cata/Modules/Skins/WorldMap.lua | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/ElvUI/Cata/Modules/Skins/WorldMap.lua b/ElvUI/Cata/Modules/Skins/WorldMap.lua index ae3ac7e34b..96c1fc36a1 100644 --- a/ElvUI/Cata/Modules/Skins/WorldMap.lua +++ b/ElvUI/Cata/Modules/Skins/WorldMap.lua @@ -17,27 +17,24 @@ function S:WorldMapFrame() WorldMapFrame.MiniBorderFrame:CreateBackdrop('Transparent') WorldMapFrame.MiniBorderFrame.backdrop:Point('TOPLEFT', 6, -2) - S:HandleDropDownBox(_G.WorldMapZoneMinimapDropdown) - S:HandleDropDownBox(_G.WorldMapContinentDropdown) - S:HandleDropDownBox(_G.WorldMapZoneDropdown) + S:HandleDropDownBox(_G.WorldMapZoneMinimapDropdown, 160) + S:HandleDropDownBox(_G.WorldMapContinentDropdown, 160) + S:HandleDropDownBox(_G.WorldMapZoneDropdown, 160) S:HandleMaxMinFrame(_G.WorldMapFrame.MaximizeMinimizeFrame) S:HandleCheckBox(_G.WorldMapShowDigsites) S:HandleCheckBox(_G.WorldMapQuestShowObjectives) _G.WorldMapContinentDropdown:Point('TOPLEFT', WorldMapFrame, 'TOPLEFT', 330, -35) - _G.WorldMapContinentDropdown:Width(205) - _G.WorldMapContinentDropdown:Height(33) + _G.WorldMapContinentDropdown:Height(26) - _G.WorldMapZoneDropdown:Point('LEFT', _G.WorldMapContinentDropdown, 'RIGHT', -20, 0) - _G.WorldMapZoneDropdown:Width(205) - _G.WorldMapZoneDropdown:Height(33) + _G.WorldMapZoneDropdown:Point('LEFT', _G.WorldMapContinentDropdown, 'RIGHT', 10, 0) + _G.WorldMapZoneDropdown:Height(26) - _G.WorldMapZoneMinimapDropdown:Point('RIGHT', _G.WorldMapContinentDropdown, 'LEFT', 20, 0) - _G.WorldMapZoneMinimapDropdown:Width(205) - _G.WorldMapZoneMinimapDropdown:Height(33) + _G.WorldMapZoneMinimapDropdown:Point('RIGHT', _G.WorldMapContinentDropdown, 'LEFT', -10, 0) + _G.WorldMapZoneMinimapDropdown:Height(26) - _G.WorldMapZoomOutButton:Point('LEFT', _G.WorldMapZoneDropdown, 'RIGHT', 3, 3) + _G.WorldMapZoomOutButton:Point('LEFT', _G.WorldMapZoneDropdown, 'RIGHT', 10, 1) _G.WorldMapZoomOutButton:Height(23) _G.WorldMapZoomOutButton:Width(100) _G.WorldMapZoomOutButton:SetFrameLevel(_G.WorldMapFrame.BlackoutFrame:GetFrameLevel() + 2) From a73a7e23aa3fc16b42743d5e2272e968fd50c8e5 Mon Sep 17 00:00:00 2001 From: Luckyone Date: Sat, 5 Oct 2024 08:41:56 +0200 Subject: [PATCH 20/40] Fix TradeSkill (Cata) --- ElvUI/Cata/Modules/Skins/TradeSkill.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ElvUI/Cata/Modules/Skins/TradeSkill.lua b/ElvUI/Cata/Modules/Skins/TradeSkill.lua index 0aa0897897..cf3bb44a38 100644 --- a/ElvUI/Cata/Modules/Skins/TradeSkill.lua +++ b/ElvUI/Cata/Modules/Skins/TradeSkill.lua @@ -56,13 +56,13 @@ function S:Blizzard_TradeSkillUI() TradeSkillCollapseAllButton:GetDisabledTexture():Size(15) TradeSkillCollapseAllButton:GetDisabledTexture():SetDesaturated(true) - S:HandleDropDownBox(_G.TradeSkillInvSlotDropDown, 140) - _G.TradeSkillInvSlotDropDown:ClearAllPoints() - _G.TradeSkillInvSlotDropDown:Point('TOPRIGHT', TradeSkillFrame, 'TOPRIGHT', -32, -68) + S:HandleDropDownBox(_G.TradeSkillInvSlotDropdown, 120) + _G.TradeSkillInvSlotDropdown:ClearAllPoints() + _G.TradeSkillInvSlotDropdown:Point('TOPRIGHT', TradeSkillFrame, 'TOPRIGHT', -32, -68) - S:HandleDropDownBox(_G.TradeSkillSubClassDropDown, 140) - _G.TradeSkillSubClassDropDown:ClearAllPoints() - _G.TradeSkillSubClassDropDown:Point('RIGHT', _G.TradeSkillInvSlotDropDown, 'RIGHT', -120, 0) + S:HandleDropDownBox(_G.TradeSkillSubClassDropdown, 120) + _G.TradeSkillSubClassDropdown:ClearAllPoints() + _G.TradeSkillSubClassDropdown:Point('RIGHT', _G.TradeSkillInvSlotDropdown, 'RIGHT', -120, 0) _G.TradeSkillFrameTitleText:ClearAllPoints() _G.TradeSkillFrameTitleText:Point('TOP', TradeSkillFrame, 'TOP', 0, -18) From e49bddc5eea34b4fe60657fd6ab47ff55860e480 Mon Sep 17 00:00:00 2001 From: Luckyone Date: Sat, 5 Oct 2024 08:47:48 +0200 Subject: [PATCH 21/40] EncounterJournal updates (Cata) --- ElvUI/Cata/Modules/Skins/EncounterJournal.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ElvUI/Cata/Modules/Skins/EncounterJournal.lua b/ElvUI/Cata/Modules/Skins/EncounterJournal.lua index b331f77c57..6628b34a30 100644 --- a/ElvUI/Cata/Modules/Skins/EncounterJournal.lua +++ b/ElvUI/Cata/Modules/Skins/EncounterJournal.lua @@ -210,6 +210,9 @@ function S:Blizzard_EncounterJournal() InstanceSelect.bg:Kill() S:HandleDropDownBox(InstanceSelect.ExpansionDropdown) + S:HandleDropDownBox(EncounterJournalEncounterFrameInfo.LootContainer.filter, 100) + S:HandleDropDownBox(EncounterJournalEncounterFrameInfo.LootContainer.slotFilter, 100) + S:HandleDropDownBox(EncounterJournalEncounterFrameInfoDifficulty, 110) S:HandleTrimScrollBar(InstanceSelect.ScrollBar) -- Bottom tabs From 30851e6eb4cc5f9a8a26fdc9f89175d5b36cc178 Mon Sep 17 00:00:00 2001 From: Luckyone Date: Sat, 5 Oct 2024 08:49:11 +0200 Subject: [PATCH 22/40] LFG updates (Cata) --- ElvUI/Cata/Modules/Skins/LFG.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ElvUI/Cata/Modules/Skins/LFG.lua b/ElvUI/Cata/Modules/Skins/LFG.lua index 8a2e5b3f3a..d8efd1e4e0 100644 --- a/ElvUI/Cata/Modules/Skins/LFG.lua +++ b/ElvUI/Cata/Modules/Skins/LFG.lua @@ -246,7 +246,7 @@ function S:LookingForGroupFrames() end end) - S:HandleDropDownBox(_G.LFDQueueFrameTypeDropdown) + S:HandleDropDownBox(_G.LFDQueueFrameTypeDropdown, 200) -- Skin Reward Items (This works for all frames, LFD, Raid, Scenario) hooksecurefunc('LFGRewardsFrame_SetItemButton', SkinItemButton) From 737e8b53898a57f714f071ad80384758bc817102 Mon Sep 17 00:00:00 2001 From: Luckyone Date: Sat, 5 Oct 2024 08:51:07 +0200 Subject: [PATCH 23/40] Fix AuctionHouse (Cata) --- ElvUI/Cata/Modules/Skins/AuctionHouse.lua | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ElvUI/Cata/Modules/Skins/AuctionHouse.lua b/ElvUI/Cata/Modules/Skins/AuctionHouse.lua index 16f75a5c55..ca43d2d6da 100644 --- a/ElvUI/Cata/Modules/Skins/AuctionHouse.lua +++ b/ElvUI/Cata/Modules/Skins/AuctionHouse.lua @@ -162,9 +162,8 @@ function S:Blizzard_AuctionUI() _G.BrowseCloseButton:Point('BOTTOMRIGHT', 66, 6) _G.BrowseBuyoutButton:Point('RIGHT', _G.BrowseCloseButton, 'LEFT', -4, 0) - _G.BrowseBidButton:Point('RIGHT', _G.BrowseBuyoutButton, 'LEFT', -4, 0) - _G.BrowseBidPrice:Point('BOTTOM', 25, 10) + _G.BrowseBidPrice:Point('BOTTOM', -102, 10) S:HandleScrollBar(_G.BrowseFilterScrollFrameScrollBar) S:HandleScrollBar(_G.BrowseScrollFrameScrollBar) @@ -234,8 +233,7 @@ function S:Blizzard_AuctionUI() S:HandleRadioButton(_G.AuctionsMediumAuctionButton) S:HandleRadioButton(_G.AuctionsLongAuctionButton) - S:HandleDropDownBox(_G.BrowseDropDown, 155) - S:HandleDropDownBox(_G.PriceDropDown) + S:HandleDropDownBox(_G.BrowseDropdown, 155) -- Progress Frame _G.AuctionProgressFrame:StripTextures() From 68ed90fce8b8fc030f96b271cf3a65c0bd352783 Mon Sep 17 00:00:00 2001 From: Simpy Date: Sat, 5 Oct 2024 03:00:57 -0400 Subject: [PATCH 24/40] cata ptr skins from Tsxy --- ElvUI/Cata/Modules/Skins/EncounterJournal.lua | 19 ++++++------ ElvUI/Cata/Modules/Skins/TradeSkill.lua | 6 ++-- ElvUI/Cata/Modules/Skins/Trainer.lua | 4 +-- ElvUI/Cata/Modules/Skins/WorldMap.lua | 30 ++++++++++++------- 4 files changed, 34 insertions(+), 25 deletions(-) diff --git a/ElvUI/Cata/Modules/Skins/EncounterJournal.lua b/ElvUI/Cata/Modules/Skins/EncounterJournal.lua index 6628b34a30..4674cda78a 100644 --- a/ElvUI/Cata/Modules/Skins/EncounterJournal.lua +++ b/ElvUI/Cata/Modules/Skins/EncounterJournal.lua @@ -210,9 +210,6 @@ function S:Blizzard_EncounterJournal() InstanceSelect.bg:Kill() S:HandleDropDownBox(InstanceSelect.ExpansionDropdown) - S:HandleDropDownBox(EncounterJournalEncounterFrameInfo.LootContainer.filter, 100) - S:HandleDropDownBox(EncounterJournalEncounterFrameInfo.LootContainer.slotFilter, 100) - S:HandleDropDownBox(EncounterJournalEncounterFrameInfoDifficulty, 110) S:HandleTrimScrollBar(InstanceSelect.ScrollBar) -- Bottom tabs @@ -257,10 +254,10 @@ function S:Blizzard_EncounterJournal() EncounterInfo.reset:StripTextures() -- Buttons - EncounterInfo.difficulty:ClearAllPoints() - EncounterInfo.difficulty:Point('BOTTOMRIGHT', _G.EncounterJournalEncounterFrameInfoBG, 'TOPRIGHT', -5, 7) +-- EncounterInfo.difficulty:ClearAllPoints() +-- EncounterInfo.difficulty:Point('BOTTOMRIGHT', _G.EncounterJournalEncounterFrameInfoBG, 'TOPRIGHT', -5, 7) HandleButton(EncounterInfo.reset) - HandleButton(EncounterInfo.difficulty) +-- HandleButton(EncounterInfo.difficulty) EncounterInfo.reset:ClearAllPoints() EncounterInfo.reset:Point('TOPRIGHT', EncounterInfo.difficulty, 'TOPLEFT', -10, 0) @@ -282,6 +279,10 @@ function S:Blizzard_EncounterJournal() S:HandleTrimScrollBar(EncounterInfo.detailsScroll.ScrollBar) S:HandleTrimScrollBar(EncounterInfo.LootContainer.ScrollBar) + S:HandleDropDownBox(_G.EncounterJournalEncounterFrameInfo.LootContainer.filter, 120) + S:HandleDropDownBox(_G.EncounterJournalEncounterFrameInfo.LootContainer.slotFilter, 90) + S:HandleDropDownBox(_G.EncounterJournalEncounterFrameInfoDifficulty, 100) + EncounterInfo.detailsScroll:Height(360) EncounterInfo.LootContainer:Height(360) EncounterInfo.overviewScroll:Height(360) @@ -324,9 +325,9 @@ function S:Blizzard_EncounterJournal() S:HandleCloseButton(_G.EncounterJournalSearchResultsCloseButton) S:HandleTrimScrollBar(_G.EncounterJournalSearchResults.ScrollBar) - for _, button in next, { _G.EncounterJournalEncounterFrameInfoFilterToggle, _G.EncounterJournalEncounterFrameInfoSlotFilterToggle } do - HandleButton(button, true) - end +-- for _, button in next, { _G.EncounterJournalEncounterFrameInfo.LootContainer.filter, _G.EncounterJournalEncounterFrameInfo.LootContainer.slotFilter } do +-- HandleButton(button, true) +-- end hooksecurefunc(_G.EncounterJournal.instanceSelect.ScrollBox, 'Update', function(frame) for _, child in next, { frame.ScrollTarget:GetChildren() } do diff --git a/ElvUI/Cata/Modules/Skins/TradeSkill.lua b/ElvUI/Cata/Modules/Skins/TradeSkill.lua index cf3bb44a38..6c947c3bad 100644 --- a/ElvUI/Cata/Modules/Skins/TradeSkill.lua +++ b/ElvUI/Cata/Modules/Skins/TradeSkill.lua @@ -56,11 +56,11 @@ function S:Blizzard_TradeSkillUI() TradeSkillCollapseAllButton:GetDisabledTexture():Size(15) TradeSkillCollapseAllButton:GetDisabledTexture():SetDesaturated(true) - S:HandleDropDownBox(_G.TradeSkillInvSlotDropdown, 120) + S:HandleDropDownBox(_G.TradeSkillInvSlotDropdown, 115) _G.TradeSkillInvSlotDropdown:ClearAllPoints() - _G.TradeSkillInvSlotDropdown:Point('TOPRIGHT', TradeSkillFrame, 'TOPRIGHT', -32, -68) + _G.TradeSkillInvSlotDropdown:Point('TOPRIGHT', TradeSkillFrame, 'TOPRIGHT', -37, -68) - S:HandleDropDownBox(_G.TradeSkillSubClassDropdown, 120) + S:HandleDropDownBox(_G.TradeSkillSubClassDropdown, 115) _G.TradeSkillSubClassDropdown:ClearAllPoints() _G.TradeSkillSubClassDropdown:Point('RIGHT', _G.TradeSkillInvSlotDropdown, 'RIGHT', -120, 0) diff --git a/ElvUI/Cata/Modules/Skins/Trainer.lua b/ElvUI/Cata/Modules/Skins/Trainer.lua index dadb3762c1..5ce5e8e80a 100644 --- a/ElvUI/Cata/Modules/Skins/Trainer.lua +++ b/ElvUI/Cata/Modules/Skins/Trainer.lua @@ -13,8 +13,8 @@ function S:Blizzard_TrainerUI() _G.ClassTrainerExpandButtonFrame:StripTextures() - S:HandleDropDownBox(_G.ClassTrainerFrameFilterDropDown) - _G.ClassTrainerFrameFilterDropDown:Point('TOPRIGHT', -40, -64) + S:HandleDropDownBox(_G.ClassTrainerFrame.FilterDropdown) + _G.ClassTrainerFrame.FilterDropdown:Point('TOPRIGHT', -40, -64) _G.ClassTrainerListScrollFrame:StripTextures() S:HandleScrollBar(_G.ClassTrainerListScrollFrameScrollBar) diff --git a/ElvUI/Cata/Modules/Skins/WorldMap.lua b/ElvUI/Cata/Modules/Skins/WorldMap.lua index 96c1fc36a1..2104840f12 100644 --- a/ElvUI/Cata/Modules/Skins/WorldMap.lua +++ b/ElvUI/Cata/Modules/Skins/WorldMap.lua @@ -17,31 +17,39 @@ function S:WorldMapFrame() WorldMapFrame.MiniBorderFrame:CreateBackdrop('Transparent') WorldMapFrame.MiniBorderFrame.backdrop:Point('TOPLEFT', 6, -2) - S:HandleDropDownBox(_G.WorldMapZoneMinimapDropdown, 160) - S:HandleDropDownBox(_G.WorldMapContinentDropdown, 160) - S:HandleDropDownBox(_G.WorldMapZoneDropdown, 160) + S:HandleDropDownBox(_G.WorldMapZoneMinimapDropdown) + S:HandleDropDownBox(_G.WorldMapContinentDropdown) + S:HandleDropDownBox(_G.WorldMapZoneDropdown) S:HandleMaxMinFrame(_G.WorldMapFrame.MaximizeMinimizeFrame) + S:HandleCheckBox(_G.WorldMapTrackQuest) S:HandleCheckBox(_G.WorldMapShowDigsites) S:HandleCheckBox(_G.WorldMapQuestShowObjectives) - _G.WorldMapContinentDropdown:Point('TOPLEFT', WorldMapFrame, 'TOPLEFT', 330, -35) - _G.WorldMapContinentDropdown:Height(26) + _G.WorldMapContinentDropdown:Point('TOPLEFT', WorldMapFrame, 'TOPLEFT', 230, -35) + _G.WorldMapContinentDropdown:Width(130) +-- _G.WorldMapContinentDropdown:Height(23) - _G.WorldMapZoneDropdown:Point('LEFT', _G.WorldMapContinentDropdown, 'RIGHT', 10, 0) - _G.WorldMapZoneDropdown:Height(26) + _G.WorldMapZoneDropdown:Point('LEFT', _G.WorldMapContinentDropdown, 'RIGHT', 5, 0) + _G.WorldMapZoneDropdown:Width(130) +-- _G.WorldMapZoneDropdown:Height(23) - _G.WorldMapZoneMinimapDropdown:Point('RIGHT', _G.WorldMapContinentDropdown, 'LEFT', -10, 0) - _G.WorldMapZoneMinimapDropdown:Height(26) + _G.WorldMapZoneMinimapDropdown:Point('RIGHT', _G.WorldMapContinentDropdown, 'LEFT', -20, 0) + _G.WorldMapZoneMinimapDropdown:Width(130) +-- _G.WorldMapZoneMinimapDropdown:Height(23) - _G.WorldMapZoomOutButton:Point('LEFT', _G.WorldMapZoneDropdown, 'RIGHT', 10, 1) - _G.WorldMapZoomOutButton:Height(23) + _G.WorldMapZoomOutButton:Point('LEFT', _G.WorldMapZoneDropdown, 'RIGHT', 3, 0) + _G.WorldMapZoomOutButton:Height(20) _G.WorldMapZoomOutButton:Width(100) _G.WorldMapZoomOutButton:SetFrameLevel(_G.WorldMapFrame.BlackoutFrame:GetFrameLevel() + 2) S:HandleButton(_G.WorldMapZoomOutButton) S:HandleSliderFrame(_G.OpacityFrameSlider) + S:HandleTrimScrollBar(_G.QuestScrollFrame.ScrollBar) + _G.QuestMapDetailsScrollFrame:StripTextures() + S:HandleScrollBar(_G.QuestMapDetailsScrollFrame.ScrollBar) + if E:IsAddOnEnabled('Questie') and _G.Questie_Toggle then S:HandleButton(_G.Questie_Toggle) end From 41be9bf75d55750fd951de6eebe6186c6677a1a9 Mon Sep 17 00:00:00 2001 From: Simpy Date: Sat, 5 Oct 2024 03:05:32 -0400 Subject: [PATCH 25/40] blah blah --- ElvUI/Core/Modules/ActionBars/ActionBars.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ElvUI/Core/Modules/ActionBars/ActionBars.lua b/ElvUI/Core/Modules/ActionBars/ActionBars.lua index 9650192873..77325f1883 100644 --- a/ElvUI/Core/Modules/ActionBars/ActionBars.lua +++ b/ElvUI/Core/Modules/ActionBars/ActionBars.lua @@ -1013,8 +1013,8 @@ function AB:SpellButtonOnEnter(_, tt) return end - local slotIndex = self.slotIndex or (not E.Retail and FindSpellBookSlotForSpell(self)) - local slotBank = self.spellBank or (not E.Retail and _G.SpellBookFrame.bookType) + local slotIndex = self.slotIndex or (E.Classic and FindSpellBookSlotForSpell(self)) + local slotBank = self.spellBank or (E.Classic and _G.SpellBookFrame.bookType) if not (slotIndex and slotBank) then return end -- huh? local needsUpdate = tt:SetSpellBookItem(slotIndex, slotBank) From e04064c18f9ebacf1b5b371f3771e4b5c5dfb1e4 Mon Sep 17 00:00:00 2001 From: Luckyone Date: Sat, 5 Oct 2024 09:06:42 +0200 Subject: [PATCH 26/40] Flyout fix & skin --- ElvUI/Core/Modules/ActionBars/ActionBars.lua | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/ElvUI/Core/Modules/ActionBars/ActionBars.lua b/ElvUI/Core/Modules/ActionBars/ActionBars.lua index 77325f1883..b9e5bc30f3 100644 --- a/ElvUI/Core/Modules/ActionBars/ActionBars.lua +++ b/ElvUI/Core/Modules/ActionBars/ActionBars.lua @@ -1013,8 +1013,8 @@ function AB:SpellButtonOnEnter(_, tt) return end - local slotIndex = self.slotIndex or (E.Classic and FindSpellBookSlotForSpell(self)) - local slotBank = self.spellBank or (E.Classic and _G.SpellBookFrame.bookType) + local slotIndex = (E.Classic and FindSpellBookSlotForSpell(self)) or self.slotIndex + local slotBank = (E.Classic and _G.SpellBookFrame.bookType) or self.spellBank if not (slotIndex and slotBank) then return end -- huh? local needsUpdate = tt:SetSpellBookItem(slotIndex, slotBank) @@ -1455,6 +1455,13 @@ function AB:FixKeybindText(button) end end +local function skinFlyout() + if _G.SpellFlyout.Background then _G.SpellFlyout.Background:Hide() end + if _G.SpellFlyoutBackgroundEnd then _G.SpellFlyoutBackgroundEnd:Hide() end + if _G.SpellFlyoutHorizontalBackground then _G.SpellFlyoutHorizontalBackground:Hide() end + if _G.SpellFlyoutVerticalBackground then _G.SpellFlyoutVerticalBackground:Hide() end +end + local function flyoutButtonAnchor(frame) local parent = frame:GetParent() local _, parentAnchorButton = parent:GetPoint() @@ -1493,7 +1500,6 @@ function AB:SpellFlyout_OnLeave() end function AB:UpdateFlyoutButtons() - if _G.SpellFlyout then _G.SpellFlyout.Background:Hide() end if _G.LABFlyoutHandlerFrame then _G.LABFlyoutHandlerFrame.Background:Hide() end local isShown = _G.SpellFlyout:IsShown() @@ -1833,6 +1839,10 @@ function AB:Initialize() _G.SpellFlyout:HookScript('OnEnter', AB.SpellFlyout_OnEnter) _G.SpellFlyout:HookScript('OnLeave', AB.SpellFlyout_OnLeave) end + + if not E.Classic then + hooksecurefunc(_G.SpellFlyout, 'Toggle', skinFlyout) + end end E:RegisterModule(AB:GetName()) From 4ef00ebd534066d2343b2c0a37f3bc8f7d2f4c2c Mon Sep 17 00:00:00 2001 From: Luckyone Date: Sat, 5 Oct 2024 09:07:09 +0200 Subject: [PATCH 27/40] Revert "cata ptr skins from Tsxy" This reverts commit 68ed90fce8b8fc030f96b271cf3a65c0bd352783. --- ElvUI/Cata/Modules/Skins/EncounterJournal.lua | 19 ++++++------ ElvUI/Cata/Modules/Skins/TradeSkill.lua | 6 ++-- ElvUI/Cata/Modules/Skins/Trainer.lua | 4 +-- ElvUI/Cata/Modules/Skins/WorldMap.lua | 30 +++++++------------ 4 files changed, 25 insertions(+), 34 deletions(-) diff --git a/ElvUI/Cata/Modules/Skins/EncounterJournal.lua b/ElvUI/Cata/Modules/Skins/EncounterJournal.lua index 4674cda78a..6628b34a30 100644 --- a/ElvUI/Cata/Modules/Skins/EncounterJournal.lua +++ b/ElvUI/Cata/Modules/Skins/EncounterJournal.lua @@ -210,6 +210,9 @@ function S:Blizzard_EncounterJournal() InstanceSelect.bg:Kill() S:HandleDropDownBox(InstanceSelect.ExpansionDropdown) + S:HandleDropDownBox(EncounterJournalEncounterFrameInfo.LootContainer.filter, 100) + S:HandleDropDownBox(EncounterJournalEncounterFrameInfo.LootContainer.slotFilter, 100) + S:HandleDropDownBox(EncounterJournalEncounterFrameInfoDifficulty, 110) S:HandleTrimScrollBar(InstanceSelect.ScrollBar) -- Bottom tabs @@ -254,10 +257,10 @@ function S:Blizzard_EncounterJournal() EncounterInfo.reset:StripTextures() -- Buttons --- EncounterInfo.difficulty:ClearAllPoints() --- EncounterInfo.difficulty:Point('BOTTOMRIGHT', _G.EncounterJournalEncounterFrameInfoBG, 'TOPRIGHT', -5, 7) + EncounterInfo.difficulty:ClearAllPoints() + EncounterInfo.difficulty:Point('BOTTOMRIGHT', _G.EncounterJournalEncounterFrameInfoBG, 'TOPRIGHT', -5, 7) HandleButton(EncounterInfo.reset) --- HandleButton(EncounterInfo.difficulty) + HandleButton(EncounterInfo.difficulty) EncounterInfo.reset:ClearAllPoints() EncounterInfo.reset:Point('TOPRIGHT', EncounterInfo.difficulty, 'TOPLEFT', -10, 0) @@ -279,10 +282,6 @@ function S:Blizzard_EncounterJournal() S:HandleTrimScrollBar(EncounterInfo.detailsScroll.ScrollBar) S:HandleTrimScrollBar(EncounterInfo.LootContainer.ScrollBar) - S:HandleDropDownBox(_G.EncounterJournalEncounterFrameInfo.LootContainer.filter, 120) - S:HandleDropDownBox(_G.EncounterJournalEncounterFrameInfo.LootContainer.slotFilter, 90) - S:HandleDropDownBox(_G.EncounterJournalEncounterFrameInfoDifficulty, 100) - EncounterInfo.detailsScroll:Height(360) EncounterInfo.LootContainer:Height(360) EncounterInfo.overviewScroll:Height(360) @@ -325,9 +324,9 @@ function S:Blizzard_EncounterJournal() S:HandleCloseButton(_G.EncounterJournalSearchResultsCloseButton) S:HandleTrimScrollBar(_G.EncounterJournalSearchResults.ScrollBar) --- for _, button in next, { _G.EncounterJournalEncounterFrameInfo.LootContainer.filter, _G.EncounterJournalEncounterFrameInfo.LootContainer.slotFilter } do --- HandleButton(button, true) --- end + for _, button in next, { _G.EncounterJournalEncounterFrameInfoFilterToggle, _G.EncounterJournalEncounterFrameInfoSlotFilterToggle } do + HandleButton(button, true) + end hooksecurefunc(_G.EncounterJournal.instanceSelect.ScrollBox, 'Update', function(frame) for _, child in next, { frame.ScrollTarget:GetChildren() } do diff --git a/ElvUI/Cata/Modules/Skins/TradeSkill.lua b/ElvUI/Cata/Modules/Skins/TradeSkill.lua index 6c947c3bad..cf3bb44a38 100644 --- a/ElvUI/Cata/Modules/Skins/TradeSkill.lua +++ b/ElvUI/Cata/Modules/Skins/TradeSkill.lua @@ -56,11 +56,11 @@ function S:Blizzard_TradeSkillUI() TradeSkillCollapseAllButton:GetDisabledTexture():Size(15) TradeSkillCollapseAllButton:GetDisabledTexture():SetDesaturated(true) - S:HandleDropDownBox(_G.TradeSkillInvSlotDropdown, 115) + S:HandleDropDownBox(_G.TradeSkillInvSlotDropdown, 120) _G.TradeSkillInvSlotDropdown:ClearAllPoints() - _G.TradeSkillInvSlotDropdown:Point('TOPRIGHT', TradeSkillFrame, 'TOPRIGHT', -37, -68) + _G.TradeSkillInvSlotDropdown:Point('TOPRIGHT', TradeSkillFrame, 'TOPRIGHT', -32, -68) - S:HandleDropDownBox(_G.TradeSkillSubClassDropdown, 115) + S:HandleDropDownBox(_G.TradeSkillSubClassDropdown, 120) _G.TradeSkillSubClassDropdown:ClearAllPoints() _G.TradeSkillSubClassDropdown:Point('RIGHT', _G.TradeSkillInvSlotDropdown, 'RIGHT', -120, 0) diff --git a/ElvUI/Cata/Modules/Skins/Trainer.lua b/ElvUI/Cata/Modules/Skins/Trainer.lua index 5ce5e8e80a..dadb3762c1 100644 --- a/ElvUI/Cata/Modules/Skins/Trainer.lua +++ b/ElvUI/Cata/Modules/Skins/Trainer.lua @@ -13,8 +13,8 @@ function S:Blizzard_TrainerUI() _G.ClassTrainerExpandButtonFrame:StripTextures() - S:HandleDropDownBox(_G.ClassTrainerFrame.FilterDropdown) - _G.ClassTrainerFrame.FilterDropdown:Point('TOPRIGHT', -40, -64) + S:HandleDropDownBox(_G.ClassTrainerFrameFilterDropDown) + _G.ClassTrainerFrameFilterDropDown:Point('TOPRIGHT', -40, -64) _G.ClassTrainerListScrollFrame:StripTextures() S:HandleScrollBar(_G.ClassTrainerListScrollFrameScrollBar) diff --git a/ElvUI/Cata/Modules/Skins/WorldMap.lua b/ElvUI/Cata/Modules/Skins/WorldMap.lua index 2104840f12..96c1fc36a1 100644 --- a/ElvUI/Cata/Modules/Skins/WorldMap.lua +++ b/ElvUI/Cata/Modules/Skins/WorldMap.lua @@ -17,39 +17,31 @@ function S:WorldMapFrame() WorldMapFrame.MiniBorderFrame:CreateBackdrop('Transparent') WorldMapFrame.MiniBorderFrame.backdrop:Point('TOPLEFT', 6, -2) - S:HandleDropDownBox(_G.WorldMapZoneMinimapDropdown) - S:HandleDropDownBox(_G.WorldMapContinentDropdown) - S:HandleDropDownBox(_G.WorldMapZoneDropdown) + S:HandleDropDownBox(_G.WorldMapZoneMinimapDropdown, 160) + S:HandleDropDownBox(_G.WorldMapContinentDropdown, 160) + S:HandleDropDownBox(_G.WorldMapZoneDropdown, 160) S:HandleMaxMinFrame(_G.WorldMapFrame.MaximizeMinimizeFrame) - S:HandleCheckBox(_G.WorldMapTrackQuest) S:HandleCheckBox(_G.WorldMapShowDigsites) S:HandleCheckBox(_G.WorldMapQuestShowObjectives) - _G.WorldMapContinentDropdown:Point('TOPLEFT', WorldMapFrame, 'TOPLEFT', 230, -35) - _G.WorldMapContinentDropdown:Width(130) --- _G.WorldMapContinentDropdown:Height(23) + _G.WorldMapContinentDropdown:Point('TOPLEFT', WorldMapFrame, 'TOPLEFT', 330, -35) + _G.WorldMapContinentDropdown:Height(26) - _G.WorldMapZoneDropdown:Point('LEFT', _G.WorldMapContinentDropdown, 'RIGHT', 5, 0) - _G.WorldMapZoneDropdown:Width(130) --- _G.WorldMapZoneDropdown:Height(23) + _G.WorldMapZoneDropdown:Point('LEFT', _G.WorldMapContinentDropdown, 'RIGHT', 10, 0) + _G.WorldMapZoneDropdown:Height(26) - _G.WorldMapZoneMinimapDropdown:Point('RIGHT', _G.WorldMapContinentDropdown, 'LEFT', -20, 0) - _G.WorldMapZoneMinimapDropdown:Width(130) --- _G.WorldMapZoneMinimapDropdown:Height(23) + _G.WorldMapZoneMinimapDropdown:Point('RIGHT', _G.WorldMapContinentDropdown, 'LEFT', -10, 0) + _G.WorldMapZoneMinimapDropdown:Height(26) - _G.WorldMapZoomOutButton:Point('LEFT', _G.WorldMapZoneDropdown, 'RIGHT', 3, 0) - _G.WorldMapZoomOutButton:Height(20) + _G.WorldMapZoomOutButton:Point('LEFT', _G.WorldMapZoneDropdown, 'RIGHT', 10, 1) + _G.WorldMapZoomOutButton:Height(23) _G.WorldMapZoomOutButton:Width(100) _G.WorldMapZoomOutButton:SetFrameLevel(_G.WorldMapFrame.BlackoutFrame:GetFrameLevel() + 2) S:HandleButton(_G.WorldMapZoomOutButton) S:HandleSliderFrame(_G.OpacityFrameSlider) - S:HandleTrimScrollBar(_G.QuestScrollFrame.ScrollBar) - _G.QuestMapDetailsScrollFrame:StripTextures() - S:HandleScrollBar(_G.QuestMapDetailsScrollFrame.ScrollBar) - if E:IsAddOnEnabled('Questie') and _G.Questie_Toggle then S:HandleButton(_G.Questie_Toggle) end From 3a8ca7b58a66effed107bbab8bd9cb43e1f0196a Mon Sep 17 00:00:00 2001 From: Luckyone Date: Sat, 5 Oct 2024 09:11:10 +0200 Subject: [PATCH 28/40] Fix Trainer (Cata) --- ElvUI/Cata/Modules/Skins/Trainer.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ElvUI/Cata/Modules/Skins/Trainer.lua b/ElvUI/Cata/Modules/Skins/Trainer.lua index dadb3762c1..5ce5e8e80a 100644 --- a/ElvUI/Cata/Modules/Skins/Trainer.lua +++ b/ElvUI/Cata/Modules/Skins/Trainer.lua @@ -13,8 +13,8 @@ function S:Blizzard_TrainerUI() _G.ClassTrainerExpandButtonFrame:StripTextures() - S:HandleDropDownBox(_G.ClassTrainerFrameFilterDropDown) - _G.ClassTrainerFrameFilterDropDown:Point('TOPRIGHT', -40, -64) + S:HandleDropDownBox(_G.ClassTrainerFrame.FilterDropdown) + _G.ClassTrainerFrame.FilterDropdown:Point('TOPRIGHT', -40, -64) _G.ClassTrainerListScrollFrame:StripTextures() S:HandleScrollBar(_G.ClassTrainerListScrollFrameScrollBar) From 2d4a95dd6d222bb50d818392f66e134bf0c7694f Mon Sep 17 00:00:00 2001 From: Luckyone Date: Sat, 5 Oct 2024 09:13:02 +0200 Subject: [PATCH 29/40] Fix Archaeology (Cata) --- ElvUI/Cata/Modules/Skins/Archaeology.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ElvUI/Cata/Modules/Skins/Archaeology.lua b/ElvUI/Cata/Modules/Skins/Archaeology.lua index 209de45a8c..382fa46723 100644 --- a/ElvUI/Cata/Modules/Skins/Archaeology.lua +++ b/ElvUI/Cata/Modules/Skins/Archaeology.lua @@ -12,9 +12,9 @@ function S:Blizzard_ArchaeologyUI() S:HandleButton(ArchaeologyFrame.artifactPage.solveFrame.solveButton, true) S:HandleButton(ArchaeologyFrame.artifactPage.backButton, true) - S:HandleDropDownBox(_G.ArchaeologyFrame.raceFilterDropDown) - _G.ArchaeologyFrame.raceFilterDropDown.Text:ClearAllPoints() - _G.ArchaeologyFrame.raceFilterDropDown.Text:Point('LEFT', _G.ArchaeologyFrame.raceFilterDropDown.backdrop, 'LEFT', 4, 0) + S:HandleDropDownBox(_G.ArchaeologyFrameRaceFilter) + _G.ArchaeologyFrameRaceFilter.Text:ClearAllPoints() + _G.ArchaeologyFrameRaceFilter.Text:Point('LEFT', _G.ArchaeologyFrameRaceFilter.backdrop, 'LEFT', 4, 0) if E.private.skins.parchmentRemoverEnable then _G.ArchaeologyFrameBgLeft:Kill() From 877ea7e08792f74c14f40e0db37bb34394bf82b7 Mon Sep 17 00:00:00 2001 From: Luckyone Date: Sat, 5 Oct 2024 09:29:09 +0200 Subject: [PATCH 30/40] Skin QuestMap (Cata) --- ElvUI/Cata/Modules/Skins/WorldMap.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ElvUI/Cata/Modules/Skins/WorldMap.lua b/ElvUI/Cata/Modules/Skins/WorldMap.lua index 96c1fc36a1..32603ee1b7 100644 --- a/ElvUI/Cata/Modules/Skins/WorldMap.lua +++ b/ElvUI/Cata/Modules/Skins/WorldMap.lua @@ -22,8 +22,9 @@ function S:WorldMapFrame() S:HandleDropDownBox(_G.WorldMapZoneDropdown, 160) S:HandleMaxMinFrame(_G.WorldMapFrame.MaximizeMinimizeFrame) - S:HandleCheckBox(_G.WorldMapShowDigsites) S:HandleCheckBox(_G.WorldMapQuestShowObjectives) + S:HandleCheckBox(_G.WorldMapShowDigsites) + S:HandleCheckBox(_G.WorldMapTrackQuest) _G.WorldMapContinentDropdown:Point('TOPLEFT', WorldMapFrame, 'TOPLEFT', 330, -35) _G.WorldMapContinentDropdown:Height(26) @@ -41,6 +42,8 @@ function S:WorldMapFrame() S:HandleButton(_G.WorldMapZoomOutButton) S:HandleSliderFrame(_G.OpacityFrameSlider) + S:HandleScrollBar(_G.QuestMapDetailsScrollFrameScrollBar) + S:HandleScrollBar(_G.QuestScrollFrame.ScrollBar) if E:IsAddOnEnabled('Questie') and _G.Questie_Toggle then S:HandleButton(_G.Questie_Toggle) From efa8895a356748829e23dbe162561f5c7da10e2e Mon Sep 17 00:00:00 2001 From: Luckyone Date: Sat, 5 Oct 2024 09:32:10 +0200 Subject: [PATCH 31/40] Static position for tab3 even if tab2 is invisible --- ElvUI/Cata/Modules/Skins/Achievement.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/ElvUI/Cata/Modules/Skins/Achievement.lua b/ElvUI/Cata/Modules/Skins/Achievement.lua index 9d5d480209..7c51477955 100644 --- a/ElvUI/Cata/Modules/Skins/Achievement.lua +++ b/ElvUI/Cata/Modules/Skins/Achievement.lua @@ -302,6 +302,7 @@ function S:Blizzard_AchievementUI() _G.AchievementFrameTab1:ClearAllPoints() _G.AchievementFrameTab1:Point('TOPLEFT', _G.AchievementFrame, 'BOTTOMLEFT', -10, 0) _G.AchievementFrameTab2:Point('TOPLEFT', _G.AchievementFrameTab1, 'TOPRIGHT', -19, 0) + _G.AchievementFrameTab3:Point('TOPLEFT', _G.AchievementFrameTab2, 'TOPRIGHT', -19, 0) SkinStatusBar(_G.AchievementFrameSummaryCategoriesStatusBar) From 6dcda58b48a9db7df0c6f12b073bd817a23e1c28 Mon Sep 17 00:00:00 2001 From: Luckyone Date: Sat, 5 Oct 2024 09:34:56 +0200 Subject: [PATCH 32/40] Might as well make it dynamic --- ElvUI/Cata/Modules/Skins/Achievement.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ElvUI/Cata/Modules/Skins/Achievement.lua b/ElvUI/Cata/Modules/Skins/Achievement.lua index 7c51477955..f90a649ac9 100644 --- a/ElvUI/Cata/Modules/Skins/Achievement.lua +++ b/ElvUI/Cata/Modules/Skins/Achievement.lua @@ -8,6 +8,7 @@ local select = select local bitband = bit.band local hooksecurefunc = hooksecurefunc +local IsInGuild = IsInGuild local GetAchievementCriteriaInfo = GetAchievementCriteriaInfo local GetAchievementNumCriteria = GetAchievementNumCriteria @@ -302,7 +303,7 @@ function S:Blizzard_AchievementUI() _G.AchievementFrameTab1:ClearAllPoints() _G.AchievementFrameTab1:Point('TOPLEFT', _G.AchievementFrame, 'BOTTOMLEFT', -10, 0) _G.AchievementFrameTab2:Point('TOPLEFT', _G.AchievementFrameTab1, 'TOPRIGHT', -19, 0) - _G.AchievementFrameTab3:Point('TOPLEFT', _G.AchievementFrameTab2, 'TOPRIGHT', -19, 0) + _G.AchievementFrameTab3:Point('TOPLEFT', IsInGuild() and _G.AchievementFrameTab2 or _G.AchievementFrameTab1, 'TOPRIGHT', -19, 0) SkinStatusBar(_G.AchievementFrameSummaryCategoriesStatusBar) From e48fc0424efbc74d44bb05d31ef14e0bba17db84 Mon Sep 17 00:00:00 2001 From: Luckyone Date: Sat, 5 Oct 2024 09:47:47 +0200 Subject: [PATCH 33/40] Transmog updates (Cata) --- ElvUI/Cata/Modules/Skins/Collectables.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ElvUI/Cata/Modules/Skins/Collectables.lua b/ElvUI/Cata/Modules/Skins/Collectables.lua index 25162bba82..af58ce19b6 100644 --- a/ElvUI/Cata/Modules/Skins/Collectables.lua +++ b/ElvUI/Cata/Modules/Skins/Collectables.lua @@ -454,6 +454,10 @@ local function SkinTransmogFrames() local WardrobeTransmogFrame = _G.WardrobeTransmogFrame WardrobeTransmogFrame:StripTextures() + S:HandleButton(WardrobeTransmogFrame.OutfitDropdown.SaveButton) + S:HandleDropDownBox(WardrobeTransmogFrame.OutfitDropdown, 220) + WardrobeTransmogFrame.OutfitDropdown.SaveButton:ClearAllPoints() + WardrobeTransmogFrame.OutfitDropdown.SaveButton:Point('LEFT', WardrobeTransmogFrame.OutfitDropdown, 'RIGHT', 2, 0) for i = 1, #WardrobeTransmogFrame.SlotButtons do local slotButton = WardrobeTransmogFrame.SlotButtons[i] From 68ebccf8bc19767f714c6a782877fc4d20c47bcb Mon Sep 17 00:00:00 2001 From: Luckyone Date: Sun, 6 Oct 2024 11:07:39 +0200 Subject: [PATCH 34/40] Fix Chat Config skin (Cata) --- ElvUI/Cata/Modules/Skins/BlizzardOptions.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ElvUI/Cata/Modules/Skins/BlizzardOptions.lua b/ElvUI/Cata/Modules/Skins/BlizzardOptions.lua index 901b80d80e..ad2e6b07b3 100644 --- a/ElvUI/Cata/Modules/Skins/BlizzardOptions.lua +++ b/ElvUI/Cata/Modules/Skins/BlizzardOptions.lua @@ -136,7 +136,7 @@ function S:BlizzardOptions() return end for index in ipairs(frame.checkBoxTable) do - local checkBoxNameString = frame:GetName()..'CheckBox' + local checkBoxNameString = frame:GetName()..'Checkbox' local checkBoxName = checkBoxNameString..index local checkBox = _G[checkBoxName] local check = _G[checkBoxName..'Check'] @@ -153,7 +153,7 @@ function S:BlizzardOptions() hooksecurefunc('ChatConfig_UpdateTieredCheckboxes', function(frame, index) local group = frame.checkBoxTable[index] - local checkBox = _G[frame:GetName()..'CheckBox'..index] + local checkBox = _G[frame:GetName()..'Checkbox'..index] if checkBox then S:HandleCheckBox(checkBox) end From 1194d7fed509faf4db833966bae3ddf8e83d0d24 Mon Sep 17 00:00:00 2001 From: Luckyone Date: Sun, 6 Oct 2024 11:12:28 +0200 Subject: [PATCH 35/40] Update Community skin (Cata) --- ElvUI/Cata/Modules/Skins/Communities.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ElvUI/Cata/Modules/Skins/Communities.lua b/ElvUI/Cata/Modules/Skins/Communities.lua index 8339b49662..eb08abca56 100644 --- a/ElvUI/Cata/Modules/Skins/Communities.lua +++ b/ElvUI/Cata/Modules/Skins/Communities.lua @@ -213,8 +213,8 @@ function S:Blizzard_Communities() ClubFinderGuildFinderFrame:StripTextures() local ClubFinderGuildOptionsList = ClubFinderGuildFinderFrame.OptionsList - S:HandleDropDownBox(ClubFinderGuildOptionsList.ClubFilterDropdown) - S:HandleDropDownBox(ClubFinderGuildOptionsList.ClubSizeDropdown) + S:HandleDropDownBox(ClubFinderGuildOptionsList.ClubFilterDropdown, 100) + S:HandleDropDownBox(ClubFinderGuildOptionsList.ClubSizeDropdown, 100) ClubFinderGuildOptionsList.SearchBox:Size(118, 20) ClubFinderGuildOptionsList.Search:Size(118, 20) From 7f2189eb7c2234789c89cf66195330b097b192cc Mon Sep 17 00:00:00 2001 From: Luckyone Date: Sun, 6 Oct 2024 11:17:58 +0200 Subject: [PATCH 36/40] Fix Calendar skin (Cata) --- ElvUI/Cata/Modules/Skins/Calendar.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ElvUI/Cata/Modules/Skins/Calendar.lua b/ElvUI/Cata/Modules/Skins/Calendar.lua index 90ce02139a..66a23ed92d 100644 --- a/ElvUI/Cata/Modules/Skins/Calendar.lua +++ b/ElvUI/Cata/Modules/Skins/Calendar.lua @@ -133,6 +133,11 @@ function S:Blizzard_Calendar() _G.CalendarCreateEventDateLabel:Point('TOPLEFT', _G.CalendarCreateEventIcon, 'TOPRIGHT', 5, 0) HandleEventIcon(_G.CalendarCreateEventIcon) + S:HandleDropDownBox(_G.CalendarCreateEventFrame.HourDropdown, 52) + S:HandleDropDownBox(_G.CalendarCreateEventFrame.MinuteDropdown, 52) + S:HandleDropDownBox(_G.CalendarCreateEventFrame.AMPMDropdown, 57) + S:HandleDropDownBox(_G.CalendarCreateEventFrame.EventTypeDropdown, 120) + _G.CalendarClassButton1:Point('TOPLEFT', _G.CalendarClassButtonContainer, 'TOPLEFT', E.PixelMode and 3 or 5, 0) local lastClassButton From 4f2429e866c626b73601298d44a0f30ea2adb46d Mon Sep 17 00:00:00 2001 From: Luckyone Date: Sun, 6 Oct 2024 11:23:23 +0200 Subject: [PATCH 37/40] Update TokenFramePopup (Cata) --- ElvUI/Cata/Modules/Skins/Character.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ElvUI/Cata/Modules/Skins/Character.lua b/ElvUI/Cata/Modules/Skins/Character.lua index e832f66acc..c040966b91 100644 --- a/ElvUI/Cata/Modules/Skins/Character.lua +++ b/ElvUI/Cata/Modules/Skins/Character.lua @@ -151,9 +151,11 @@ local function UpdateCurrencySkins() local TokenFramePopup = _G.TokenFramePopup if TokenFramePopup then TokenFramePopup:ClearAllPoints() - TokenFramePopup:Point('TOPLEFT', _G.TokenFrame, 'TOPRIGHT', -33, -12) + TokenFramePopup:Point('TOPLEFT', _G.TokenFrame, 'TOPRIGHT', 1, 0) TokenFramePopup:StripTextures() TokenFramePopup:SetTemplate('Transparent') + S:HandleCheckBox(TokenFramePopupInactiveCheckbox) + S:HandleCheckBox(TokenFramePopupBackpackCheckbox) end local TokenFrameContainer = _G.TokenFrameContainer From 9134f0302d125445f39e1609f773dfbe428c6226 Mon Sep 17 00:00:00 2001 From: Luckyone Date: Sun, 6 Oct 2024 11:28:18 +0200 Subject: [PATCH 38/40] Use retail file for TimeManager --- ElvUI/Cata/Modules/Skins/TimeManager.lua | 85 +++++++++++------------- 1 file changed, 37 insertions(+), 48 deletions(-) diff --git a/ElvUI/Cata/Modules/Skins/TimeManager.lua b/ElvUI/Cata/Modules/Skins/TimeManager.lua index 4b0c7360ab..29034b68c9 100644 --- a/ElvUI/Cata/Modules/Skins/TimeManager.lua +++ b/ElvUI/Cata/Modules/Skins/TimeManager.lua @@ -2,13 +2,12 @@ local E, L, V, P, G = unpack(ElvUI) local S = E:GetModule('Skins') local _G = _G -local unpack, select = unpack, select +local unpack = unpack local hooksecurefunc = hooksecurefunc local function SetPlayTexture() _G.StopwatchPlayPauseButton:SetNormalTexture(E.Media.Textures.Play) end - local function SetPauseTexture() _G.StopwatchPlayPauseButton:SetNormalTexture(E.Media.Textures.Pause) end @@ -17,63 +16,53 @@ function S:Blizzard_TimeManager() if not (E.private.skins.blizzard.enable and E.private.skins.blizzard.timemanager) then return end local TimeManagerFrame = _G.TimeManagerFrame - S:HandleFrame(TimeManagerFrame, true) - TimeManagerFrame:Size(185, 240) - TimeManagerFrame:Point('TOPRIGHT', -1, -186) - - select(7, TimeManagerFrame:GetRegions()):Point('TOP', 0, -5) - - _G.TimeManagerFrameCloseButton:Point('TOPRIGHT', 4, 5) - - _G.TimeManagerStopwatchFrame:Point('TOPRIGHT', 10, -12) - - _G.TimeManagerStopwatchCheck:SetTemplate() - _G.TimeManagerStopwatchCheck:StyleButton(nil, true) - - _G.TimeManagerStopwatchCheck:GetNormalTexture():SetInside() - _G.TimeManagerStopwatchCheck:GetNormalTexture():SetTexCoord(unpack(E.TexCoords)) + S:HandlePortraitFrame(TimeManagerFrame) - _G.TimeManagerAlarmTimeFrame:Point('TOPLEFT', 12, -65) - - S:HandleDropDownBox(_G.TimeManagerAlarmTimeFrame.HourDropdown, 80) - S:HandleDropDownBox(_G.TimeManagerAlarmTimeFrame.MinuteDropdown, 80) - S:HandleDropDownBox(_G.TimeManagerAlarmTimeFrame.AMPMDropdown, 80) + local Alarm = _G.TimeManagerAlarmTimeFrame + S:HandleDropDownBox(Alarm.HourDropdown, 80) + S:HandleDropDownBox(Alarm.MinuteDropdown, 80) + S:HandleDropDownBox(Alarm.AMPMDropdown, 80) S:HandleEditBox(_G.TimeManagerAlarmMessageEditBox) - - _G.TimeManagerAlarmEnabledButton:Point('LEFT', 16, -45) - _G.TimeManagerAlarmEnabledButton:SetNormalTexture(E.ClearTexture) - _G.TimeManagerAlarmEnabledButton.SetNormalTexture = E.noop - _G.TimeManagerAlarmEnabledButton:SetPushedTexture(E.ClearTexture) - _G.TimeManagerAlarmEnabledButton.SetPushedTexture = E.noop - S:HandleButton(_G.TimeManagerAlarmEnabledButton) - - _G.TimeManagerMilitaryTimeCheck:Point('TOPLEFT', 155, -190) + S:HandleCheckBox(_G.TimeManagerAlarmEnabledButton) S:HandleCheckBox(_G.TimeManagerMilitaryTimeCheck) S:HandleCheckBox(_G.TimeManagerLocalTimeCheck) - _G.StopwatchFrame:CreateBackdrop('Transparent') - _G.StopwatchFrame.backdrop:Point('TOPLEFT', 0, -16) - _G.StopwatchFrame.backdrop:Point('BOTTOMRIGHT', 0, 2) + local TimeManagerStopwatchCheck = _G.TimeManagerStopwatchCheck + _G.TimeManagerStopwatchFrame:StripTextures() + TimeManagerStopwatchCheck:SetTemplate() + TimeManagerStopwatchCheck:GetNormalTexture():SetTexCoord(unpack(E.TexCoords)) + TimeManagerStopwatchCheck:GetNormalTexture():SetInside() - _G.StopwatchFrame:StripTextures() + local hover = TimeManagerStopwatchCheck:CreateTexture() -- hover + hover:SetColorTexture(1,1,1,0.3) + hover:Point('TOPLEFT',TimeManagerStopwatchCheck,2,-2) + hover:Point('BOTTOMRIGHT',TimeManagerStopwatchCheck,-2,2) + TimeManagerStopwatchCheck:SetHighlightTexture(hover) - _G.StopwatchTabFrame:StripTextures() + local StopwatchFrame = _G.StopwatchFrame + StopwatchFrame:StripTextures() + StopwatchFrame:CreateBackdrop('Transparent') + StopwatchFrame.backdrop:Point('TOPLEFT', 0, -17) + StopwatchFrame.backdrop:Point('BOTTOMRIGHT', 0, 2) + _G.StopwatchTabFrame:StripTextures() S:HandleCloseButton(_G.StopwatchCloseButton) - _G.StopwatchPlayPauseButton:CreateBackdrop(nil, true) - _G.StopwatchPlayPauseButton:SetSize(12, 12) - _G.StopwatchPlayPauseButton:SetNormalTexture(E.Media.Textures.Play) - _G.StopwatchPlayPauseButton:SetHighlightTexture(E.ClearTexture) - _G.StopwatchPlayPauseButton.backdrop:SetOutside(_G.StopwatchPlayPauseButton, 2, 2) - _G.StopwatchPlayPauseButton:HookScript('OnEnter', S.SetModifiedBackdrop) - _G.StopwatchPlayPauseButton:HookScript('OnLeave', S.SetOriginalBackdrop) - _G.StopwatchPlayPauseButton:Point('RIGHT', _G.StopwatchResetButton, 'LEFT', -4, 0) - S:HandleButton(_G.StopwatchResetButton) - _G.StopwatchResetButton:SetSize(16,16) - _G.StopwatchResetButton:SetNormalTexture(E.Media.Textures.Reset) - _G.StopwatchResetButton:Point('BOTTOMRIGHT', _G.StopwatchFrame, 'BOTTOMRIGHT', -4, 6) + --Play/Pause and Reset buttons + local StopwatchPlayPauseButton = _G.StopwatchPlayPauseButton + local StopwatchResetButton = _G.StopwatchResetButton + StopwatchPlayPauseButton:SetTemplate(nil, true) + StopwatchPlayPauseButton:Size(12) + StopwatchPlayPauseButton:SetNormalTexture(E.Media.Textures.Play) + StopwatchPlayPauseButton:SetHighlightTexture(E.ClearTexture) + StopwatchPlayPauseButton:HookScript('OnEnter', S.SetModifiedBackdrop) + StopwatchPlayPauseButton:HookScript('OnLeave', S.SetOriginalBackdrop) + StopwatchPlayPauseButton:Point('RIGHT', StopwatchResetButton, 'LEFT', -4, 0) + S:HandleButton(StopwatchResetButton) + StopwatchResetButton:Size(16) + StopwatchResetButton:SetNormalTexture(E.Media.Textures.Reset) + StopwatchResetButton:Point('BOTTOMRIGHT', StopwatchFrame, 'BOTTOMRIGHT', -4, 6) hooksecurefunc('Stopwatch_Play', SetPauseTexture) hooksecurefunc('Stopwatch_Pause', SetPlayTexture) From 3786c9ad49d9357e47b670fcc0138ecc38699dcb Mon Sep 17 00:00:00 2001 From: Simpy Date: Sun, 13 Oct 2024 06:27:08 -0400 Subject: [PATCH 39/40] ss --- ElvUI/Cata/Modules/Skins/Character.lua | 5 +++-- ElvUI/Cata/Modules/Skins/TimeManager.lua | 11 +++++++---- ElvUI/Classic/Modules/Skins/TimeManager.lua | 10 ++++++---- ElvUI/Mainline/Modules/Skins/TimeManager.lua | 10 ++++++---- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/ElvUI/Cata/Modules/Skins/Character.lua b/ElvUI/Cata/Modules/Skins/Character.lua index c040966b91..fa2ecbd243 100644 --- a/ElvUI/Cata/Modules/Skins/Character.lua +++ b/ElvUI/Cata/Modules/Skins/Character.lua @@ -154,8 +154,9 @@ local function UpdateCurrencySkins() TokenFramePopup:Point('TOPLEFT', _G.TokenFrame, 'TOPRIGHT', 1, 0) TokenFramePopup:StripTextures() TokenFramePopup:SetTemplate('Transparent') - S:HandleCheckBox(TokenFramePopupInactiveCheckbox) - S:HandleCheckBox(TokenFramePopupBackpackCheckbox) + + S:HandleCheckBox(_G.TokenFramePopupInactiveCheckbox) + S:HandleCheckBox(_G.TokenFramePopupBackpackCheckbox) end local TokenFrameContainer = _G.TokenFrameContainer diff --git a/ElvUI/Cata/Modules/Skins/TimeManager.lua b/ElvUI/Cata/Modules/Skins/TimeManager.lua index 29034b68c9..808f50d8f5 100644 --- a/ElvUI/Cata/Modules/Skins/TimeManager.lua +++ b/ElvUI/Cata/Modules/Skins/TimeManager.lua @@ -8,6 +8,7 @@ local hooksecurefunc = hooksecurefunc local function SetPlayTexture() _G.StopwatchPlayPauseButton:SetNormalTexture(E.Media.Textures.Play) end + local function SetPauseTexture() _G.StopwatchPlayPauseButton:SetNormalTexture(E.Media.Textures.Pause) end @@ -19,9 +20,11 @@ function S:Blizzard_TimeManager() S:HandlePortraitFrame(TimeManagerFrame) local Alarm = _G.TimeManagerAlarmTimeFrame - S:HandleDropDownBox(Alarm.HourDropdown, 80) - S:HandleDropDownBox(Alarm.MinuteDropdown, 80) - S:HandleDropDownBox(Alarm.AMPMDropdown, 80) + if Alarm then + S:HandleDropDownBox(Alarm.HourDropdown, 80) + S:HandleDropDownBox(Alarm.MinuteDropdown, 80) + S:HandleDropDownBox(Alarm.AMPMDropdown, 80) + end S:HandleEditBox(_G.TimeManagerAlarmMessageEditBox) S:HandleCheckBox(_G.TimeManagerAlarmEnabledButton) @@ -34,7 +37,7 @@ function S:Blizzard_TimeManager() TimeManagerStopwatchCheck:GetNormalTexture():SetTexCoord(unpack(E.TexCoords)) TimeManagerStopwatchCheck:GetNormalTexture():SetInside() - local hover = TimeManagerStopwatchCheck:CreateTexture() -- hover + local hover = TimeManagerStopwatchCheck:CreateTexture() hover:SetColorTexture(1,1,1,0.3) hover:Point('TOPLEFT',TimeManagerStopwatchCheck,2,-2) hover:Point('BOTTOMRIGHT',TimeManagerStopwatchCheck,-2,2) diff --git a/ElvUI/Classic/Modules/Skins/TimeManager.lua b/ElvUI/Classic/Modules/Skins/TimeManager.lua index 29034b68c9..f5b55fd248 100644 --- a/ElvUI/Classic/Modules/Skins/TimeManager.lua +++ b/ElvUI/Classic/Modules/Skins/TimeManager.lua @@ -19,9 +19,11 @@ function S:Blizzard_TimeManager() S:HandlePortraitFrame(TimeManagerFrame) local Alarm = _G.TimeManagerAlarmTimeFrame - S:HandleDropDownBox(Alarm.HourDropdown, 80) - S:HandleDropDownBox(Alarm.MinuteDropdown, 80) - S:HandleDropDownBox(Alarm.AMPMDropdown, 80) + if Alarm then + S:HandleDropDownBox(Alarm.HourDropdown, 80) + S:HandleDropDownBox(Alarm.MinuteDropdown, 80) + S:HandleDropDownBox(Alarm.AMPMDropdown, 80) + end S:HandleEditBox(_G.TimeManagerAlarmMessageEditBox) S:HandleCheckBox(_G.TimeManagerAlarmEnabledButton) @@ -34,7 +36,7 @@ function S:Blizzard_TimeManager() TimeManagerStopwatchCheck:GetNormalTexture():SetTexCoord(unpack(E.TexCoords)) TimeManagerStopwatchCheck:GetNormalTexture():SetInside() - local hover = TimeManagerStopwatchCheck:CreateTexture() -- hover + local hover = TimeManagerStopwatchCheck:CreateTexture() hover:SetColorTexture(1,1,1,0.3) hover:Point('TOPLEFT',TimeManagerStopwatchCheck,2,-2) hover:Point('BOTTOMRIGHT',TimeManagerStopwatchCheck,-2,2) diff --git a/ElvUI/Mainline/Modules/Skins/TimeManager.lua b/ElvUI/Mainline/Modules/Skins/TimeManager.lua index 29034b68c9..f5b55fd248 100644 --- a/ElvUI/Mainline/Modules/Skins/TimeManager.lua +++ b/ElvUI/Mainline/Modules/Skins/TimeManager.lua @@ -19,9 +19,11 @@ function S:Blizzard_TimeManager() S:HandlePortraitFrame(TimeManagerFrame) local Alarm = _G.TimeManagerAlarmTimeFrame - S:HandleDropDownBox(Alarm.HourDropdown, 80) - S:HandleDropDownBox(Alarm.MinuteDropdown, 80) - S:HandleDropDownBox(Alarm.AMPMDropdown, 80) + if Alarm then + S:HandleDropDownBox(Alarm.HourDropdown, 80) + S:HandleDropDownBox(Alarm.MinuteDropdown, 80) + S:HandleDropDownBox(Alarm.AMPMDropdown, 80) + end S:HandleEditBox(_G.TimeManagerAlarmMessageEditBox) S:HandleCheckBox(_G.TimeManagerAlarmEnabledButton) @@ -34,7 +36,7 @@ function S:Blizzard_TimeManager() TimeManagerStopwatchCheck:GetNormalTexture():SetTexCoord(unpack(E.TexCoords)) TimeManagerStopwatchCheck:GetNormalTexture():SetInside() - local hover = TimeManagerStopwatchCheck:CreateTexture() -- hover + local hover = TimeManagerStopwatchCheck:CreateTexture() hover:SetColorTexture(1,1,1,0.3) hover:Point('TOPLEFT',TimeManagerStopwatchCheck,2,-2) hover:Point('BOTTOMRIGHT',TimeManagerStopwatchCheck,-2,2) From 84a17e6b028fb02f0a7f74b7adb6cce58bcc2810 Mon Sep 17 00:00:00 2001 From: Simpy Date: Tue, 22 Oct 2024 05:51:07 -0400 Subject: [PATCH 40/40] fix error --- ElvUI/Core/Modules/Blizzard/TutorialFrames.lua | 8 ++++---- ElvUI/ElvUI_Mainline.toc | 2 +- ElvUI_Libraries/ElvUI_Libraries_Mainline.toc | 2 +- ElvUI_Options/ElvUI_Options_Mainline.toc | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ElvUI/Core/Modules/Blizzard/TutorialFrames.lua b/ElvUI/Core/Modules/Blizzard/TutorialFrames.lua index e171d4dc98..4762500ccb 100644 --- a/ElvUI/Core/Modules/Blizzard/TutorialFrames.lua +++ b/ElvUI/Core/Modules/Blizzard/TutorialFrames.lua @@ -64,9 +64,6 @@ local gameTutorials = { 'Class_FirstProfessionWatcher', 'Class_FirstProfessionTutorial', - -- Blizzard_Tutorials_Dracthyr - 'Class_DracthyrEssenceWatcher', - -- Blizzard_Tutorials_Classes 'Class_StarterTalentWatcher', 'Class_TalentPoints', @@ -81,7 +78,10 @@ local function ShutdownGT() -- shut some down, they are running but not used for _, name in next, gameTutorials do - _G[name]:Complete() + local frame = _G[name] + if frame then + frame:Complete() + end end end diff --git a/ElvUI/ElvUI_Mainline.toc b/ElvUI/ElvUI_Mainline.toc index 4cdfb14ba2..61b44ca06a 100644 --- a/ElvUI/ElvUI_Mainline.toc +++ b/ElvUI/ElvUI_Mainline.toc @@ -6,7 +6,7 @@ ## SavedVariablesPerCharacter: ElvCharacterDB ## OptionalDeps: SharedMedia, Tukui, Masque ## RequiredDeps: ElvUI_Libraries -## Interface: 110002 +## Interface: 110005 ## X-Tukui-ProjectID: -2 ## X-Tukui-ProjectFolders: ElvUI, ElvUI_Libraries, ElvUI_Options ## AddonCompartmentFunc: ElvUI_AddonCompartmentFunc diff --git a/ElvUI_Libraries/ElvUI_Libraries_Mainline.toc b/ElvUI_Libraries/ElvUI_Libraries_Mainline.toc index 19c0ada248..86d34047f7 100644 --- a/ElvUI_Libraries/ElvUI_Libraries_Mainline.toc +++ b/ElvUI_Libraries/ElvUI_Libraries_Mainline.toc @@ -2,7 +2,7 @@ ## Notes: Libraries that power ElvUI ## Author: Elv, Simpy ## Version: @project-version@ -## Interface: 110002 +## Interface: 110005 ## X-oUF: ElvUF ## IconTexture: Interface\AddOns\ElvUI\Core\Media\Textures\LogoAddon diff --git a/ElvUI_Options/ElvUI_Options_Mainline.toc b/ElvUI_Options/ElvUI_Options_Mainline.toc index 735cc4abbc..5f91f27189 100644 --- a/ElvUI_Options/ElvUI_Options_Mainline.toc +++ b/ElvUI_Options/ElvUI_Options_Mainline.toc @@ -2,7 +2,7 @@ ## Notes: Powers the configuration window.|n|cffff3333Does not store any profile data.|r ## Author: Elv, Simpy ## Version: @project-version@ -## Interface: 110002 +## Interface: 110005 ## RequiredDeps: ElvUI ## LoadOnDemand: 1 ## IconTexture: Interface\AddOns\ElvUI\Core\Media\Textures\LogoAddon