--- orig/TitanMovable.lua 2005-10-20 14:37:00.000000000 +1000 +++ new/TitanMovable.lua 2005-10-24 20:41:28.000000000 +1000 @@ -245,11 +245,15 @@ else if ( arg1 ~= 0 ) then this:Show(); - TemporaryEnchantFrame:SetPoint("TOPRIGHT", this:GetParent():GetName(), "TOPRIGHT", -205, 0 - this:GetHeight() + panelYOffset); -- ATTN + if ( not TemporaryEnchantFrame:IsUserPlaced() ) then + TemporaryEnchantFrame:SetPoint("TOPRIGHT", this:GetParent():GetName(), "TOPRIGHT", -205, 0 - this:GetHeight() + panelYOffset); -- ATTN + end refreshTime = GMTICKET_CHECK_INTERVAL; else this:Hide(); - TemporaryEnchantFrame:SetPoint("TOPRIGHT", "UIParent", "TOPRIGHT", -205, -13 + panelYOffset); -- ATTN + if ( not TemporaryEnchantFrame:IsUserPlaced() ) then + TemporaryEnchantFrame:SetPoint("TOPRIGHT", "UIParent", "TOPRIGHT", -205, -13 + panelYOffset); -- ATTN + end end end end @@ -296,16 +300,18 @@ end function Titan_CastingBarFrame_UpdatePosition() - local panelYOffset = TitanMovable_GetPanelYOffset(TITAN_PANEL_PLACE_BOTTOM, TitanPanelGetVar("BothBars")); - - local castingBarPosition = 60 + panelYOffset; - if ( PetActionBarFrame:IsVisible() or ShapeshiftBarFrame:IsVisible() ) then - castingBarPosition = castingBarPosition + 40; - end - if ( MultiBarBottomLeft:IsVisible() or MultiBarBottomRight:IsVisible() ) then - castingBarPosition = castingBarPosition + 40; + if ( not CastingBarFrame:IsUserPlaced() ) then + local panelYOffset = TitanMovable_GetPanelYOffset(TITAN_PANEL_PLACE_BOTTOM, TitanPanelGetVar("BothBars")); + + local castingBarPosition = 60 + panelYOffset; + if ( PetActionBarFrame:IsVisible() or ShapeshiftBarFrame:IsVisible() ) then + castingBarPosition = castingBarPosition + 40; + end + if ( MultiBarBottomLeft:IsVisible() or MultiBarBottomRight:IsVisible() ) then + castingBarPosition = castingBarPosition + 40; + end + CastingBarFrame:SetPoint("BOTTOM", "UIParent", "BOTTOM", 0, castingBarPosition); end - CastingBarFrame:SetPoint("BOTTOM", "UIParent", "BOTTOM", 0, castingBarPosition); end function Titan_UIParent_ManageRightSideFrames() @@ -315,19 +321,23 @@ local anchorY = 0 + panelYOffset; -- Update group loot frame anchor - if ( MultiBarBottomRight:IsVisible() or MultiBarBottomLeft:IsVisible() ) then - GroupLootFrame1:SetPoint("BOTTOM", "UIParent", "BOTTOM", 0, 102 + panelYOffset); - else - GroupLootFrame1:SetPoint("BOTTOM", "UIParent", "BOTTOM", 0, 60 + panelYOffset); + if ( not GroupLootFrame1:IsUserPlaced() ) then + if ( MultiBarBottomRight:IsVisible() or MultiBarBottomLeft:IsVisible() ) then + GroupLootFrame1:SetPoint("BOTTOM", "UIParent", "BOTTOM", 0, 102 + panelYOffset); + else + GroupLootFrame1:SetPoint("BOTTOM", "UIParent", "BOTTOM", 0, 60 + panelYOffset); + end end -- Update tutorial anchor - if ( MultiBarBottomRight:IsVisible() or MultiBarBottomLeft:IsVisible() ) then - TutorialFrameParent:SetPoint("BOTTOM", "UIParent", "BOTTOM", 0, 94 + panelYOffset); - FramerateLabel:SetPoint("BOTTOM", "WorldFrame", "BOTTOM", 0, 104 + panelYOffset); - else - TutorialFrameParent:SetPoint("BOTTOM", "UIParent", "BOTTOM", 0, 52 + panelYOffset); - FramerateLabel:SetPoint("BOTTOM", "WorldFrame", "BOTTOM", 0, 64 + panelYOffset); + if ( not TutorialFrameParent:IsUserPlaced() ) then + if ( MultiBarBottomRight:IsVisible() or MultiBarBottomLeft:IsVisible() ) then + TutorialFrameParent:SetPoint("BOTTOM", "UIParent", "BOTTOM", 0, 94 + panelYOffset); + FramerateLabel:SetPoint("BOTTOM", "WorldFrame", "BOTTOM", 0, 104 + panelYOffset); + else + TutorialFrameParent:SetPoint("BOTTOM", "UIParent", "BOTTOM", 0, 52 + panelYOffset); + FramerateLabel:SetPoint("BOTTOM", "WorldFrame", "BOTTOM", 0, 64 + panelYOffset); + end end -- Update bag anchor @@ -348,15 +358,21 @@ anchorX = 0; end -- Setup y anchors - QuestTimerFrame:SetPoint("TOPRIGHT", "MinimapCluster", "BOTTOMRIGHT", -anchorX, anchorY); - if ( QuestTimerFrame:IsVisible() ) then - anchorY = anchorY - QuestTimerFrame:GetHeight(); - end - DurabilityFrame:SetPoint("TOPRIGHT", "MinimapCluster", "BOTTOMRIGHT", -anchorX-20, anchorY); - if ( DurabilityFrame:IsVisible() ) then - anchorY = anchorY - DurabilityFrame:GetHeight(); + if ( not QuestTimerFrame:IsUserPlaced() ) then + QuestTimerFrame:SetPoint("TOPRIGHT", "MinimapCluster", "BOTTOMRIGHT", -anchorX, anchorY); + if ( QuestTimerFrame:IsVisible() ) then + anchorY = anchorY - QuestTimerFrame:GetHeight(); + end + end + if ( not DurabilityFrame:IsUserPlaced() ) then + DurabilityFrame:SetPoint("TOPRIGHT", "MinimapCluster", "BOTTOMRIGHT", -anchorX-20, anchorY); + if ( DurabilityFrame:IsVisible() ) then + anchorY = anchorY - DurabilityFrame:GetHeight(); + end + end + if ( not QuestWatchFrame:IsUserPlaced() ) then + QuestWatchFrame:SetPoint("TOPRIGHT", "MinimapCluster", "BOTTOMRIGHT", -anchorX, anchorY); end - QuestWatchFrame:SetPoint("TOPRIGHT", "MinimapCluster", "BOTTOMRIGHT", -anchorX, anchorY); -- Update combat log anchor FCF_UpdateCombatLogPosition();