From d8868e15d312721f4e80f25f08ac72dadf2e49ee Mon Sep 17 00:00:00 2001 From: HonorGoG Date: Tue, 25 Jun 2019 14:16:32 -0700 Subject: [PATCH] - Changes necessary to get TPC to load without error in the beta. --- TitanClassic/TitanClassicMovable.lua | 86 ++++---------------- TitanClassic/TitanPanelClassicTemplate.xml | 2 +- TitanClassicAmmo/TitanClassicAmmo.xml | 2 +- TitanClassicBag/TitanClassicBag.xml | 2 +- TitanClassicClock/TitanClassicClock.xml | 2 +- TitanClassicGold/TitanClassicGold.xml | 2 +- TitanClassicLocation/TitanClassicLocation.xml | 2 +- TitanClassicLootType/TitanClassicLootType.xml | 2 +- .../TitanClassicPerformance.xml | 2 +- TitanClassicRepair/TitanClassicRepair.xml | 2 +- TitanClassicVolume/TitanClassicVolume.xml | 2 +- TitanClassicXP/TitanClassicXP.xml | 2 +- 12 files changed, 29 insertions(+), 79 deletions(-) diff --git a/TitanClassic/TitanClassicMovable.lua b/TitanClassic/TitanClassicMovable.lua index 6bb47c0..3419b45 100755 --- a/TitanClassic/TitanClassicMovable.lua +++ b/TitanClassic/TitanClassicMovable.lua @@ -277,27 +277,27 @@ local function CheckConflicts() if (IsAddOnLoaded(addon)) then -- user has enabled TitanDebug (addon.." active : Titan will not adjust frames that "..addon.." could control") -- Check would be : BT4Bar.config.enabled to check if the frame exists and if it is enabled in BT4 - TitanMovable_AddonAdjust("MainMenuBar", true) - TitanMovable_AddonAdjust("MicroButtonAndBagsBar", true) - TitanMovable_AddonAdjust("MultiBarRight", true) - TitanMovable_AddonAdjust("ExtraActionBarFrame", true) - TitanMovable_AddonAdjust("OverrideActionBar", true) -- not sure about this one... +-- TitanMovable_AddonAdjust("MainMenuBar", true) +-- TitanMovable_AddonAdjust("MicroButtonAndBagsBar", true) +-- TitanMovable_AddonAdjust("MultiBarRight", true) +-- TitanMovable_AddonAdjust("ExtraActionBarFrame", true) +-- TitanMovable_AddonAdjust("OverrideActionBar", true) -- not sure about this one... end addon = "ElvUI" if (IsAddOnLoaded(addon)) then -- user has enabled TitanDebug (addon.." active : Titan will not adjust frames that "..addon.." could control") -- ElvUI controls the whole UI - TitanMovable_AddonAdjust("PlayerFrame", true) - TitanMovable_AddonAdjust("TargetFrame", true) - TitanMovable_AddonAdjust("PartyMemberFrame1", true) - TitanMovable_AddonAdjust("TicketStatusFrame", true) - TitanMovable_AddonAdjust("BuffFrame", true) - TitanMovable_AddonAdjust("MinimapCluster", true) - TitanMovable_AddonAdjust("MultiBarRight", true) - TitanMovable_AddonAdjust("OverrideActionBar", true) - TitanMovable_AddonAdjust("MicroButtonAndBagsBar", true) - TitanMovable_AddonAdjust("MainMenuBar", true) - TitanMovable_AddonAdjust("ExtraActionBarFrame", true) +-- TitanMovable_AddonAdjust("PlayerFrame", true) +-- TitanMovable_AddonAdjust("TargetFrame", true) +-- TitanMovable_AddonAdjust("PartyMemberFrame1", true) +-- TitanMovable_AddonAdjust("TicketStatusFrame", true) +-- TitanMovable_AddonAdjust("BuffFrame", true) +-- TitanMovable_AddonAdjust("MinimapCluster", true) +-- TitanMovable_AddonAdjust("MultiBarRight", true) +-- TitanMovable_AddonAdjust("OverrideActionBar", true) +-- TitanMovable_AddonAdjust("MicroButtonAndBagsBar", true) +-- TitanMovable_AddonAdjust("MainMenuBar", true) +-- TitanMovable_AddonAdjust("ExtraActionBarFrame", true) end end @@ -311,58 +311,8 @@ OUT: top_bottom - Frame is at top or bottom, expecting Titan constant for top or local function MoveFrame(frame_ptr, start_y, top_bottom, force) local frame = _G[frame_ptr] - if frame and (frame:IsUserPlaced() or - frame.MALockPointHook -- Allow MoveAnything to be used w/o error - ) - then - -- skip this frame - else - if DoAdjust(top_bottom, force) and frame:IsShown() then - local y = TitanMovable_GetPanelYOffset(top_bottom) + (start_y or 0) -- includes scale adjustment - local point, relativeTo, relativePoint, xOfs, yOfs = frame:GetPoint() - -- check for nil which will cause an error - if point and relativeTo and relativePoint and xOfs then -- do not care about yOfs - -- should be safe... --- frame:ClearAllPoints(); --- frame:SetPoint(point, relativeTo:GetName(), relativePoint, xOfs, y) ---[[ - if frame == ExtraActionBarFrame then - TitanDebug ("MoveFrame :" - .." "..tostring(frame:GetName()) - .." point:"..tostring(point) - .." relativeTo:"..tostring(relativeTo:GetName()) - .." relativePoint:"..tostring(relativePoint) - .." xOfs:"..tostring(xOfs) - .." y:"..tostring(y) - ) - end ---]] - SetPosition(frame, point, relativeTo:GetName(), relativePoint, xOfs, y) - else - -- do not proceed ---[[ - TitanDebug ("MoveFrame nil :" - .." "..tostring(frame:GetName()) - .."point:"..tostring(point) - .."relativeTo:"..tostring(relativeTo:GetName()) - .."relativePoint:"..tostring(relativePoint) - .."xOfs:"..tostring(xOfs) - ) ---]] - end - else - --[[ - Some frames such as the ticket frame may not be visible or even created - --]] ---[[ - TitanDebug ("MoveFrame no adj :" - .." "..tostring(frame:GetName()) - .." adj: "..tostring(DoAdjust(top_bottom, force)) - .." shown: "..tostring(frame:IsShown()) - ) ---]] - end - end +-- Urnati : Removing MA check as MoveAnything may not migrate to Classic and the logic is causing frame nils. + end --[[ local diff --git a/TitanClassic/TitanPanelClassicTemplate.xml b/TitanClassic/TitanPanelClassicTemplate.xml index c8c0796..d063544 100644 --- a/TitanClassic/TitanPanelClassicTemplate.xml +++ b/TitanClassic/TitanPanelClassicTemplate.xml @@ -1,6 +1,6 @@ -