diff --git a/Titan/TitanConfig.lua b/Titan/TitanConfig.lua index 950471d..1f97162 100644 --- a/Titan/TitanConfig.lua +++ b/Titan/TitanConfig.lua @@ -395,7 +395,7 @@ local function TitanUpdateAdj(t, pos) name = "Vertical Adjustment", --L["TITAN_PANEL_TRANS_MENU_TEXT_SHORT"], order = position, min = -200, - max = 200, + max = 600, step = 1, get = function(info) local frame_str = info[1] diff --git a/TitanClassic/TitanClassic.toc b/TitanClassic/TitanClassic.toc index 5c72d41..a82b778 100644 --- a/TitanClassic/TitanClassic.toc +++ b/TitanClassic/TitanClassic.toc @@ -1,5 +1,5 @@ ## Interface: 11507, 50500 -## Title: Titan Panel [|cffeda55f_Core_|r] |cff00aa008.3.2|r +## Title: Titan Panel [|cffeda55f_Classic_|r] |cff00aa008.3.2|r ## Author: Titan Panel Dev Team ## Version: 8.3.2 ## IconTexture: Interface\Icons\Achievement_Dungeon_UlduarRaid_Titan_01 diff --git a/TitanLocation/TitanLocation.lua b/TitanLocation/TitanLocation.lua index 9c44ebf..f3d9ab4 100755 --- a/TitanLocation/TitanLocation.lua +++ b/TitanLocation/TitanLocation.lua @@ -179,20 +179,20 @@ local function SetCoordText(player, cursor) player_frame:SetText(player or ""); cursor_frame:SetText(cursor or ""); + player_frame:ClearAllPoints() + cursor_frame:ClearAllPoints() - if TITAN_ID == "Titan" then - -- Determine where to show the text - player_frame:ClearAllPoints() - cursor_frame:ClearAllPoints() + local mloc = TitanGetVar(TITAN_LOCATION_ID, "CoordsLoc") - local mloc = TitanGetVar(TITAN_LOCATION_ID, "CoordsLoc") + if WorldMapFrame.MiniBorderFrame then -- older style world map + -- Determine where to show the text if mloc == "Top" then if WorldMapFrame:IsMaximized() then - TitanMapPlayerLocation:SetPoint("TOPLEFT", WorldMapFrame.BorderFrame, "TOPLEFT", 10, -5) + player_frame:SetPoint("TOPLEFT", WorldMapFrame.BorderFrame, "TOPLEFT", 10, -5) else - TitanMapPlayerLocation:SetPoint("TOPLEFT", WorldMapFrame.MiniBorderFrame, "TOPLEFT", 20, -33) + player_frame:SetPoint("TOPLEFT", WorldMapFrame.MiniBorderFrame, "TOPLEFT", 20, -5) end - TitanMapCursorLocation:SetPoint("RIGHT", WorldMapFrame.MaximizeMinimizeFrame, "LEFT", 0, 0) + cursor_frame:SetPoint("RIGHT", WorldMapFrame.MaximizeMinimizeFrame, "LEFT", 0, 0) elseif mloc == "Bottom" then player_frame:SetPoint("BOTTOMRIGHT", world_frame, "BOTTOM", -10, 10) cursor_frame:SetPoint("BOTTOMLEFT", world_frame, "BOTTOM", 0, 10) @@ -204,20 +204,21 @@ local function SetCoordText(player, cursor) end else -- current retail -- Position the text - local anchor = world_frame.BorderFrame.MaximizeMinimizeFrame - if world_frame:IsMaximized() then - -- map should be 'full' screen - player_frame:ClearAllPoints(); - cursor_frame:ClearAllPoints(); - player_frame:SetPoint("RIGHT", anchor, "LEFT", 0, 0) - cursor_frame:SetPoint("TOP", player_frame, "BOTTOM", 0, -5) - world_frame.TitanSize = "large" + if mloc == "Top" then + if WorldMapFrame:IsMaximized() then + player_frame:SetPoint("TOPLEFT", world_frame, "TOPLEFT", 20, -5) + else + player_frame:SetPoint("TOPLEFT", world_frame, "TOPLEFT", 100, -5) + end + cursor_frame:SetPoint("TOPLEFT", player_frame, "TOPRIGHT", 5, 0) + elseif mloc == "Bottom" then + player_frame:SetPoint("BOTTOMRIGHT", world_frame, "BOTTOM", -10, 10) + cursor_frame:SetPoint("BOTTOMLEFT", world_frame, "BOTTOM", 0, 10) else - player_frame:ClearAllPoints(); - cursor_frame:ClearAllPoints(); - player_frame:SetPoint("RIGHT", anchor, "LEFT", 0, 0) - cursor_frame:SetPoint("LEFT", world_frame.BorderFrame.Tutorial, "RIGHT", 0, 0) - world_frame.TitanSize = "small" + -- Correct to the default of bottom + TitanSetVar(TITAN_LOCATION_ID, "CoordsLoc", "Bottom") + player_frame:SetPoint("BOTTOMRIGHT", world_frame, "BOTTOM", -10, 10) + cursor_frame:SetPoint("BOTTOMLEFT", world_frame, "BOTTOM", 0, 10) end end end