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<BT bar name>.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 @@ <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd"> - <Script file="TitanPanelTemplate.lua" /> + <Script file="TitanPanelClassicTemplate.lua" /> <Button name="TitanPanelButtonTemplate" hidden="true" movable="true" virtual="true"> <!-- Removed on 20181229 to deal with the new LibUIDropDownMenu <Frames> diff --git a/TitanClassicAmmo/TitanClassicAmmo.xml b/TitanClassicAmmo/TitanClassicAmmo.xml index c97a5fa..f74aeec 100644 --- a/TitanClassicAmmo/TitanClassicAmmo.xml +++ b/TitanClassicAmmo/TitanClassicAmmo.xml @@ -1,6 +1,6 @@ <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd"> - <Script file="TitanAmmo.lua"/> + <Script file="TitanClassicAmmo.lua"/> <Frame parent="UIParent"> <Frames> <Button name="TitanPanelAmmoButton" inherits="TitanPanelComboTemplate" frameStrata="FULLSCREEN" toplevel="true"> diff --git a/TitanClassicBag/TitanClassicBag.xml b/TitanClassicBag/TitanClassicBag.xml index 8ad97b1..86e1276 100644 --- a/TitanClassicBag/TitanClassicBag.xml +++ b/TitanClassicBag/TitanClassicBag.xml @@ -1,6 +1,6 @@ <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd"> - <Script file="TitanBag.lua"/> + <Script file="TitanClassicBag.lua"/> <Frame parent="UIParent"> <Frames> <Button name="TitanPanelBagButton" inherits="TitanPanelComboTemplate" frameStrata="FULLSCREEN" toplevel="true"> diff --git a/TitanClassicClock/TitanClassicClock.xml b/TitanClassicClock/TitanClassicClock.xml index a37cf72..70093b0 100644 --- a/TitanClassicClock/TitanClassicClock.xml +++ b/TitanClassicClock/TitanClassicClock.xml @@ -1,6 +1,6 @@ <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd"> - <Script file="TitanClock.lua"/> + <Script file="TitanClassicClock.lua"/> <Frame name="TitanPanelClockControlFrameTemplate" virtual="true" hidden="true"> <Size> <AbsDimension x="90" y="200" /> diff --git a/TitanClassicGold/TitanClassicGold.xml b/TitanClassicGold/TitanClassicGold.xml index e714411..ad1dc70 100644 --- a/TitanClassicGold/TitanClassicGold.xml +++ b/TitanClassicGold/TitanClassicGold.xml @@ -1,6 +1,6 @@ <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd"> - <Script file="TitanGold.lua"/> + <Script file="TitanClassicGold.lua"/> <Frame parent="UIParent"> <Frames> <Button name="TitanPanelGoldButton" inherits="TitanPanelComboTemplate" frameStrata="FULLSCREEN" toplevel="true"> diff --git a/TitanClassicLocation/TitanClassicLocation.xml b/TitanClassicLocation/TitanClassicLocation.xml index 453e6d2..009a5d0 100644 --- a/TitanClassicLocation/TitanClassicLocation.xml +++ b/TitanClassicLocation/TitanClassicLocation.xml @@ -1,6 +1,6 @@ <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd"> - <Script file="TitanLocation.lua"/> + <Script file="TitanClassicLocation.lua"/> <Frame parent="UIParent"> <Frames> <Button name="TitanPanelLocationButton" inherits="TitanPanelComboTemplate" frameStrata="FULLSCREEN" toplevel="true"> diff --git a/TitanClassicLootType/TitanClassicLootType.xml b/TitanClassicLootType/TitanClassicLootType.xml index 814c8fb..c324e60 100644 --- a/TitanClassicLootType/TitanClassicLootType.xml +++ b/TitanClassicLootType/TitanClassicLootType.xml @@ -1,6 +1,6 @@ <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd"> - <Script file="TitanLootType.lua"/> + <Script file="TitanClassicLootType.lua"/> <Frame parent="UIParent"> <Frames> <Button name="TitanPanelLootTypeButton" inherits="TitanPanelComboTemplate" frameStrata="FULLSCREEN" toplevel="true"> diff --git a/TitanClassicPerformance/TitanClassicPerformance.xml b/TitanClassicPerformance/TitanClassicPerformance.xml index 4e37b2c..0fda4e0 100644 --- a/TitanClassicPerformance/TitanClassicPerformance.xml +++ b/TitanClassicPerformance/TitanClassicPerformance.xml @@ -1,6 +1,6 @@ <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd"> - <Script file="TitanPerformance.lua"/> + <Script file="TitanClassicPerformance.lua"/> <Frame name="TitanPanelPerfControlFrameTemplate" virtual="true" hidden="true"> <Size> <AbsDimension x="120" y="170" /> diff --git a/TitanClassicRepair/TitanClassicRepair.xml b/TitanClassicRepair/TitanClassicRepair.xml index 0de1119..412e97b 100644 --- a/TitanClassicRepair/TitanClassicRepair.xml +++ b/TitanClassicRepair/TitanClassicRepair.xml @@ -1,6 +1,6 @@ <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd"> - <Script file="TitanRepair.lua"/> + <Script file="TitanClassicRepair.lua"/> <GameTooltip name="TitanRepairTooltip" inherits="GameTooltipTemplate" parent="UIParent" hidden="true"/> <Frame parent="UIParent"> diff --git a/TitanClassicVolume/TitanClassicVolume.xml b/TitanClassicVolume/TitanClassicVolume.xml index dc839b9..d260c91 100644 --- a/TitanClassicVolume/TitanClassicVolume.xml +++ b/TitanClassicVolume/TitanClassicVolume.xml @@ -1,6 +1,6 @@ <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd"> - <Script file="TitanVolume.lua"/> + <Script file="TitanClassicVolume.lua"/> <Frame name="TitanPanelVolumeControlFrameTemplate" virtual="true" hidden="true"> <Size> <AbsDimension x="400" y="200" /> diff --git a/TitanClassicXP/TitanClassicXP.xml b/TitanClassicXP/TitanClassicXP.xml index 3cddfc8..7db2533 100644 --- a/TitanClassicXP/TitanClassicXP.xml +++ b/TitanClassicXP/TitanClassicXP.xml @@ -1,6 +1,6 @@ <Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/ ..\FrameXML\UI.xsd"> - <Script file="TitanXP.lua"/> + <Script file="TitanClassicXP.lua"/> <Frame parent="UIParent"> <Frames> <Button name="TitanPanelXPButton" inherits="TitanPanelComboTemplate" frameStrata="FULLSCREEN" toplevel="true">