From 41924b8f9ca6c4f6ac42a3b350e27ac2eb3244bf Mon Sep 17 00:00:00 2001 From: SmallPox Date: Sun, 5 Nov 2023 14:04:18 +0100 Subject: [PATCH] possible fixes for 10.1.7.51972 I have removed and commented on all the errors that occur when starting the UI so far. However, since I am currently using the free version and can only level up to level 20, I cannot say for sure if everything is working perfectly. I'm not sure yet if I will come back and completely fix the UI, but for now, it should be up and running. --- .../theme/blizzard/FrameXML/LFGFrame.lua | 5 ++++- .../theme/blizzard/FrameXML/LootFrame.lua | 4 +++- .../theme/blizzard/FrameXML/MerchantFrame.lua | 20 ++++++++++++------- .../blizzard/FrameXML/ObjectiveTracker.lua | 4 +++- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/src/modules/theme/blizzard/FrameXML/LFGFrame.lua b/src/modules/theme/blizzard/FrameXML/LFGFrame.lua index e3353687..daad56fe 100644 --- a/src/modules/theme/blizzard/FrameXML/LFGFrame.lua +++ b/src/modules/theme/blizzard/FrameXML/LFGFrame.lua @@ -142,7 +142,10 @@ tinsert(C.BlizzThemes, function() iconTexture:SetTexture(C.Assets.Textures.RoleLfgIcons) local bg = F.CreateBDFrame(iconTexture) - hooksecurefunc('LFGDungeonReadyPopup_Update', function() + -- DEBUG: LFGDungeonReadyPopup_Update to LFGDungeonReadyPopup_OnUpdate + -- Don't know is this working + hooksecurefunc('LFGDungeonReadyPopup_OnUpdate', function() + print(_G.LFGDungeonReadyDialog) _G.LFGDungeonReadyDialog:SetBackdrop(nil) leaderFrame:SetShown(_G.LFGDungeonReadyDialogRoleIconLeaderIcon:IsShown()) diff --git a/src/modules/theme/blizzard/FrameXML/LootFrame.lua b/src/modules/theme/blizzard/FrameXML/LootFrame.lua index d94c033e..ff4b6d67 100644 --- a/src/modules/theme/blizzard/FrameXML/LootFrame.lua +++ b/src/modules/theme/blizzard/FrameXML/LootFrame.lua @@ -96,7 +96,9 @@ tinsert(C.BlizzThemes, function() _G.BONUS_ROLL_CURRENT_COUNT = _G.BONUS_ROLL_CURRENT_COUNT:gsub(from, to) -- Loot Roll Frame - hooksecurefunc('GroupLootFrame_OpenNewFrame', function() + -- DEBUG: change from GroupLootFrame_OpenNewFrame to GroupLootContainer_OpenNewFrame + -- Don't know is this working + hooksecurefunc('GroupLootContainer_OpenNewFrame', function() for i = 1, _G.NUM_GROUP_LOOT_FRAMES do local frame = _G['GroupLootFrame' .. i] if not frame.styled then diff --git a/src/modules/theme/blizzard/FrameXML/MerchantFrame.lua b/src/modules/theme/blizzard/FrameXML/MerchantFrame.lua index 8601031e..86c8db31 100644 --- a/src/modules/theme/blizzard/FrameXML/MerchantFrame.lua +++ b/src/modules/theme/blizzard/FrameXML/MerchantFrame.lua @@ -28,6 +28,11 @@ local function reskinMerchantItem(item) end local function reskinMerchantInteract(button) + -- CHANGES: + -- add button:GetRegions():Hide() + -- add F.ReskinIcon(button.Icon) + button:GetRegions():Hide() + F.ReskinIcon(button.Icon) button:SetPushedTexture(0) button:GetHighlightTexture():SetColorTexture(1, 1, 1, 0.25) F.CreateBDFrame(button) @@ -66,15 +71,16 @@ tinsert(C.BlizzThemes, function() end _G.MerchantBuyBackItem:SetHeight(44) - reskinMerchantItem(_G.MerchantBuyBackItem) - - reskinMerchantInteract(_G.MerchantGuildBankRepairButton) - _G.MerchantGuildBankRepairButtonIcon:SetTexCoord(0.595, 0.8075, 0.05, 0.52) - reskinMerchantInteract(_G.MerchantRepairAllButton) - _G.MerchantRepairAllIcon:SetTexCoord(0.31375, 0.53, 0.06, 0.52) + -- CHANGES: + -- Add New Icons + -- Remove:SetTexCoord + reskinMerchantItem(_G.MerchantBuyBackItem) + reskinMerchantInteract(_G.MerchantGuildBankRepairButton) + reskinMerchantInteract(_G.MerchantRepairAllButton) + reskinMerchantInteract(_G.MerchantRepairItemButton) + reskinMerchantInteract(_G.MerchantSellAllJunkButton) - reskinMerchantInteract(_G.MerchantRepairItemButton) local ic = _G.MerchantRepairItemButton:GetRegions() ic:SetTexture('Interface\\Icons\\INV_Hammer_20') ic:SetTexCoord(unpack(C.TEX_COORD)) diff --git a/src/modules/theme/blizzard/FrameXML/ObjectiveTracker.lua b/src/modules/theme/blizzard/FrameXML/ObjectiveTracker.lua index 2ce284ef..d77ba158 100644 --- a/src/modules/theme/blizzard/FrameXML/ObjectiveTracker.lua +++ b/src/modules/theme/blizzard/FrameXML/ObjectiveTracker.lua @@ -272,7 +272,9 @@ tinsert(C.BlizzThemes, function() hooksecurefunc('Scenario_ChallengeMode_SetUpAffixes', F.AffixesSetup) -- Rewards on bonus tracker - hooksecurefunc('BonusObjectiveTracker_AnimateReward', function(block) + -- DEBUG: BonusObjectiveTracker_AnimateReward to BonusObjectiveTracker_AddReward + -- Don't know is this working + hooksecurefunc('BonusObjectiveTracker_AddReward', function(block) local rewardsFrame = block.module.rewardsFrame local rewards = rewardsFrame.Rewards for i = #rewards, 1, -1 do