diff --git a/Titan/Titan.toc b/Titan/Titan.toc index 079d5de..39549b3 100644 --- a/Titan/Titan.toc +++ b/Titan/Titan.toc @@ -1,7 +1,7 @@ ## Interface: 80000 -## Title: Titan Panel |cff00aa005.14.6.80000|r +## Title: Titan Panel |cff00aa005.14.7.80000|r ## Author: Titan Development Team -## Version: 5.14.6.80000 +## Version: 5.14.7.80000 ## SavedVariables: TitanAll, TitanSettings, TitanSkins, ServerTimeOffsets, ServerHourFormat ## OptionalDeps: Ace3, AceGUI-3.0-SharedMediaWidgets, LibSharedMedia-3.0, LibQTip-1.0, !LibUIDropDownMenu ## Notes: Adds a display bar on the top and/or bottom of the screen. Allows users to show and control information/launcher plugins. diff --git a/Titan/TitanMovable.lua b/Titan/TitanMovable.lua index 566ffbe..08cb120 100755 --- a/Titan/TitanMovable.lua +++ b/Titan/TitanMovable.lua @@ -79,8 +79,6 @@ local TitanMovableData = { position = TITAN_PANEL_PLACE_TOP, addonAdj = false}, MinimapCluster = {frameName = "MinimapCluster", frameArchor = "TOPRIGHT", xArchor = "RIGHT", y = 0, position = TITAN_PANEL_PLACE_TOP, addonAdj = false}, --- WorldStateAlwaysUpFrame = {frameName = "WorldStateAlwaysUpFrame", frameArchor = "TOP", xArchor = "CENTER", y = -15, --- position = TITAN_PANEL_PLACE_TOP, addonAdj = false}, MainMenuBar = {frameName = "MainMenuBar", frameArchor = "BOTTOM", xArchor = "CENTER", y = 0, position = TITAN_PANEL_PLACE_BOTTOM, addonAdj = false}, MultiBarRight = {frameName = "MultiBarRight", frameArchor = "BOTTOMRIGHT", xArchor = "RIGHT", y = 98, @@ -309,7 +307,7 @@ function TitanMovableFrame_MoveFrames(position) frameArchor = frameData.frameArchor; end - if (frame and (frame:IsUserPlaced())) + if (frame and (frame:IsUserPlaced()) and frameName ~= "MainMenuBar") then -- The user has positioned the frame adj_frame = false @@ -746,22 +744,20 @@ function TitanMovable_SecureFrames() end if not TitanPanelAce:IsHooked(TicketStatusFrame, "Show", Titan_Hook_Adjust_Both) then - -- Titan Hooks to Blizzard Frame positioning functions - --TitanPanelAce:SecureHook("TicketStatusFrame_OnShow", Titan_Hook_Adjust_Both) -- HelpFrame.xml - --TitanPanelAce:SecureHook("TicketStatusFrame_OnHide", Titan_Hook_Adjust_Both) -- HelpFrame.xml TitanPanelAce:SecureHook(TicketStatusFrame, "Show", Titan_Hook_Adjust_Both) -- HelpFrame.xml TitanPanelAce:SecureHook(TicketStatusFrame, "Hide", Titan_Hook_Adjust_Both) -- HelpFrame.xml TitanPanelAce:SecureHook(MainMenuBar, "Show", Titan_Hook_Adjust_Both) -- HelpFrame.xml TitanPanelAce:SecureHook(MainMenuBar, "Hide", Titan_Hook_Adjust_Both) -- HelpFrame.xml TitanPanelAce:SecureHook(OverrideActionBar, "Show", Titan_Hook_Adjust_Both) -- HelpFrame.xml TitanPanelAce:SecureHook(OverrideActionBar, "Hide", Titan_Hook_Adjust_Both) -- HelpFrame.xml --- TitanPanelAce:SecureHook(OverrideActionBar, "Show", Titan_ManageFramesTest1) -- HelpFrame.xml --- TitanPanelAce:SecureHook(OverrideActionBar, "Hide", Titan_ManageFramesTest1) -- HelpFrame.xml TitanPanelAce:SecureHook("UpdateContainerFrameAnchors", Titan_ContainerFrames_Relocate) -- ContainerFrame.lua TitanPanelAce:SecureHook(WorldMapFrame.BorderFrame.MaximizeMinimizeFrame.MinimizeButton, "Show", Titan_Hook_Adjust_Both) -- WorldMapFrame.lua --- TitanPanelAce:SecureHook(WorldMapFrame, "Show", Titan_Hook_Adjust_Both) -- WorldMapFrame.lua --- TitanPanelAce:SecureHook(WorldMapFrame, "Hide", Titan_Hook_Adjust_Both) -- WorldMapFrame.lua TitanPanelAce:SecureHook("BuffFrame_Update", Titan_Hook_Adjust_Both) -- BuffFrame.lua + + TitanPrint("MainMenuBar:SetUserPlaced", "plain") + MainMenuBar:SetMovable(true); + MainMenuBar:SetUserPlaced(true); + MainMenuBar:SetMovable(false); end if not TitanPanelAce:IsHooked("VideoOptionsFrameOkay_OnClick", Titan_AdjustUIScale) then @@ -773,6 +769,4 @@ function TitanMovable_SecureFrames() TitanPanelAce:SecureHook("VideoOptionsFrameOkay_OnClick", Titan_AdjustUIScale) -- VideoOptionsFrame.lua TitanPanelAce:SecureHook(VideoOptionsFrame, "Hide", Titan_AdjustUIScale) -- VideoOptionsFrame.xml end - --- TitanPanelAce:SecureHook(OverrideActionBar, "SetPoint", Titan_ManageFramesTest1) -- end diff --git a/TitanBag/TitanBag.toc b/TitanBag/TitanBag.toc index a8284b8..4ec413d 100644 --- a/TitanBag/TitanBag.toc +++ b/TitanBag/TitanBag.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fBag|r] |cff00aa005.14.6.80000|r +## Title: Titan Panel [|cffeda55fBag|r] |cff00aa005.14.7.80000|r ## Notes: Adds bag and free slot information to Titan Panel ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.14.6.80000 +## Version: 5.14.7.80000 ## X-Child-Of: Titan TitanBag.xml diff --git a/TitanClock/TitanClock.toc b/TitanClock/TitanClock.toc index f5a10d1..fcf4f1b 100644 --- a/TitanClock/TitanClock.toc +++ b/TitanClock/TitanClock.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fClock|r] |cff00aa005.14.6.80000|r +## Title: Titan Panel [|cffeda55fClock|r] |cff00aa005.14.7.80000|r ## Notes: Adds a clock to Titan Panel ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.14.6.80000 +## Version: 5.14.7.80000 ## X-Child-Of: Titan TitanClock.xml diff --git a/TitanGold/TitanGold.toc b/TitanGold/TitanGold.toc index b0504aa..2b3b299 100644 --- a/TitanGold/TitanGold.toc +++ b/TitanGold/TitanGold.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fGold|r] |cff00aa005.14.6.80000|r +## Title: Titan Panel [|cffeda55fGold|r] |cff00aa005.14.7.80000|r ## Notes: Keeps track of all gold held by a player's toons on a per server/faction basis. ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: GoldSave ## OptionalDeps: ## Dependencies: Titan -## Version: 5.14.6.80000 +## Version: 5.14.7.80000 ## X-Child-Of: Titan TitanGold.xml diff --git a/TitanLocation/TitanLocation.lua b/TitanLocation/TitanLocation.lua index e102346..f0193d1 100755 --- a/TitanLocation/TitanLocation.lua +++ b/TitanLocation/TitanLocation.lua @@ -186,7 +186,7 @@ end -- ************************************************************************** function TitanPanelLocationButton_OnEvent(self, event, ...) if event == "PLAYER_ENTERING_WORLD" then - if TitanGetVar(TITAN_LOCATION_ID, "ShowLocOnMiniMap") and MinimapBorderTop and MinimapBorderTop:IsShown() then + if not TitanGetVar(TITAN_LOCATION_ID, "ShowLocOnMiniMap") and MinimapBorderTop and MinimapBorderTop:IsShown() then TitanPanelLocationButton_LocOnMiniMap() end end @@ -471,12 +471,17 @@ function TitanMapFrame_OnUpdate(self, elapsed) -- calc cursor position on the map local cursorLocationText, playerLocationText; local x, y = GetCursorPosition(); + --[[if WorldMapFrame:IsMaximized() then + x, y = WorldMapFrame:GetNormalizedCursorPosition(); + else + x, y = WorldMapFrame.ScrollContainer:GetNormalizedCursorPosition(); + end]] x = x / WorldMapFrame:GetEffectiveScale(); y = y / WorldMapFrame:GetEffectiveScale(); - local centerX, centerY = WorldMapFrame:GetCenter(); - local width = WorldMapFrame:GetWidth(); - local height = WorldMapFrame:GetHeight(); + local centerX, centerY = WorldMapFrame.ScrollContainer:GetCenter(); + local width = WorldMapFrame.ScrollContainer:GetWidth(); + local height = WorldMapFrame.ScrollContainer:GetHeight(); local cx = ((x - (centerX - (width/2))) / width) -- OFFSET_X local cy = ((centerY + (height/2) - y ) / height) -- OFFSET_Y -- cut off if the cursor coords are beyond the map, show 0,0 @@ -496,6 +501,7 @@ function TitanMapFrame_OnUpdate(self, elapsed) TitanMapCursorLocation:SetText(format(L["TITAN_LOCATION_MAP_CURSOR_COORDS_TEXT"], TitanUtils_GetHighlightText(cursorLocationText))); else + TitanMapPlayerLocation:SetText(""); TitanMapCursorLocation:SetText(""); end @@ -510,7 +516,7 @@ function TitanMapFrame_OnUpdate(self, elapsed) TitanMapCursorLocation:SetPoint("TOPRIGHT", WorldMapFrame, "TOPRIGHT", -10, -43) else TitanMapPlayerLocation:SetPoint("TOPRIGHT", WorldMapFrame, "TOPRIGHT", -50, -5) - TitanMapCursorLocation:SetPoint("TOPRIGHT", WorldMapFrame, "TOPRIGHT", -200, -5) + TitanMapCursorLocation:SetPoint("TOPLEFT", WorldMapFrame, "TOPLEFT", 95, -5) end end diff --git a/TitanLocation/TitanLocation.toc b/TitanLocation/TitanLocation.toc index f879f8d..06ed082 100644 --- a/TitanLocation/TitanLocation.toc +++ b/TitanLocation/TitanLocation.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa005.14.6.80000|r +## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa005.14.7.80000|r ## Notes: Adds coordinates and location information to Titan Panel ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.14.6.80000 +## Version: 5.14.7.80000 ## X-Child-Of: Titan TitanLocation.xml diff --git a/TitanLootType/TitanLootType.toc b/TitanLootType/TitanLootType.toc index f195a4a..d684c6d 100644 --- a/TitanLootType/TitanLootType.toc +++ b/TitanLootType/TitanLootType.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa005.14.6.80000|r +## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa005.14.7.80000|r ## Notes: Adds group loot and instance difficulty information to Titan Panel ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.14.6.80000 +## Version: 5.14.7.80000 ## X-Child-Of: Titan TitanLootType.xml diff --git a/TitanPerformance/TitanPerformance.toc b/TitanPerformance/TitanPerformance.toc index f6293fe..2bdba71 100644 --- a/TitanPerformance/TitanPerformance.toc +++ b/TitanPerformance/TitanPerformance.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa005.14.6.80000|r +## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa005.14.7.80000|r ## Notes: Adds FPS and Garbage collection information to Titan Panel ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.14.6.80000 +## Version: 5.14.7.80000 ## X-Child-Of: Titan TitanPerformance.xml diff --git a/TitanRepair/TitanRepair.toc b/TitanRepair/TitanRepair.toc index a74073f..16b0aeb 100644 --- a/TitanRepair/TitanRepair.toc +++ b/TitanRepair/TitanRepair.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa005.14.6.80000|r +## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa005.14.7.80000|r ## Notes: Provides a configurable durability display. Also adds the ability to auto repair items and inventory at vendors ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.14.6.80000 +## Version: 5.14.7.80000 ## X-Child-Of: Titan TitanRepair.xml diff --git a/TitanVolume/TitanVolume.toc b/TitanVolume/TitanVolume.toc index 2efe5cd..5e2a2de 100644 --- a/TitanVolume/TitanVolume.toc +++ b/TitanVolume/TitanVolume.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa005.14.6.80000|r +## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa005.14.7.80000|r ## Notes: Adds a volume control icon on your Titan Bar ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.14.6.80000 +## Version: 5.14.7.80000 ## X-Child-Of: Titan TitanVolume.xml diff --git a/TitanXP/TitanXP.toc b/TitanXP/TitanXP.toc index 42e0cff..ce7c2d8 100644 --- a/TitanXP/TitanXP.toc +++ b/TitanXP/TitanXP.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fXP|r] |cff00aa005.14.6.80000|r +## Title: Titan Panel [|cffeda55fXP|r] |cff00aa005.14.7.80000|r ## Notes: Adds information to Titan Panel about XP earned and time to level ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.14.6.80000 +## Version: 5.14.7.80000 ## X-Child-Of: Titan TitanXP.xml