diff --git a/Titan/Titan.toc b/Titan/Titan.toc index 66f0210..079d5de 100644 --- a/Titan/Titan.toc +++ b/Titan/Titan.toc @@ -1,7 +1,7 @@ ## Interface: 80000 -## Title: Titan Panel |cff00aa005.14.5.80000|r +## Title: Titan Panel |cff00aa005.14.6.80000|r ## Author: Titan Development Team -## Version: 5.14.5.80000 +## Version: 5.14.6.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 ac9e3be..566ffbe 100755 --- a/Titan/TitanMovable.lua +++ b/Titan/TitanMovable.lua @@ -299,11 +299,6 @@ function TitanMovableFrame_MoveFrames(position) -- move them... if not InCombatLockdown() then - if (WorldMapFrame:IsShown() and WorldMapFrame:IsMaximized()) then - --TitanVariables_SetPanelStrata("LOW") - else - --TitanVariables_SetPanelStrata(TitanPanelGetVar("FrameStrata")) - end local adj_frame = true for index, value in pairs(TitanMovable) do adj_frame = true -- assume the frame is to be adjusted diff --git a/Titan/TitanPanel.lua b/Titan/TitanPanel.lua index 7264493..22267ba 100644 --- a/Titan/TitanPanel.lua +++ b/Titan/TitanPanel.lua @@ -413,8 +413,6 @@ function TitanPanel_PlayerEnteringWorld() end -- Init panel frame strata - -- *** Remove the following one line at the end of 2018 *** - TitanPanelSetVar("FrameStrata", "LOW") TitanVariables_SetPanelStrata(TitanPanelGetVar("FrameStrata")) -- Titan Panel has initialized its variables and registered plugins. diff --git a/TitanBag/TitanBag.toc b/TitanBag/TitanBag.toc index 9b51a41..a8284b8 100644 --- a/TitanBag/TitanBag.toc +++ b/TitanBag/TitanBag.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fBag|r] |cff00aa005.14.5.80000|r +## Title: Titan Panel [|cffeda55fBag|r] |cff00aa005.14.6.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.5.80000 +## Version: 5.14.6.80000 ## X-Child-Of: Titan TitanBag.xml diff --git a/TitanClock/TitanClock.toc b/TitanClock/TitanClock.toc index 2e71c85..f5a10d1 100644 --- a/TitanClock/TitanClock.toc +++ b/TitanClock/TitanClock.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fClock|r] |cff00aa005.14.5.80000|r +## Title: Titan Panel [|cffeda55fClock|r] |cff00aa005.14.6.80000|r ## Notes: Adds a clock to Titan Panel ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.14.5.80000 +## Version: 5.14.6.80000 ## X-Child-Of: Titan TitanClock.xml diff --git a/TitanGold/TitanGold.toc b/TitanGold/TitanGold.toc index 8a2eb23..b0504aa 100644 --- a/TitanGold/TitanGold.toc +++ b/TitanGold/TitanGold.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fGold|r] |cff00aa005.14.5.80000|r +## Title: Titan Panel [|cffeda55fGold|r] |cff00aa005.14.6.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.5.80000 +## Version: 5.14.6.80000 ## X-Child-Of: Titan TitanGold.xml diff --git a/TitanLocation/TitanLocation.lua b/TitanLocation/TitanLocation.lua index b240db0..e102346 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 not TitanGetVar(TITAN_LOCATION_ID, "ShowLocOnMiniMap") and MinimapBorderTop and MinimapBorderTop:IsShown() then + if TitanGetVar(TITAN_LOCATION_ID, "ShowLocOnMiniMap") and MinimapBorderTop and MinimapBorderTop:IsShown() then TitanPanelLocationButton_LocOnMiniMap() end end @@ -243,10 +243,6 @@ function TitanPanelLocationButton_OnClick(self, button) activeWindow:Insert(message); end else - --WorldMap_ToggleSizeUp(); - if (not GetCVarBool("miniWorldMap")) then - --/; # Deprecated in WoW 8.0.1 - end ToggleFrame(WorldMapFrame); end end @@ -454,7 +450,6 @@ function TitanMapFrame_OnUpdate(self, elapsed) -- Determine the text to show for player coords - if WorldMapFrame:IsMaximized() then self.px, self.py = TitanPanelGetPlayerMapPosition(); if self.px == nil then self.px = 0 end if self.py == nil then self.py = 0 end @@ -470,9 +465,6 @@ function TitanMapFrame_OnUpdate(self, elapsed) end end TitanMapPlayerLocation:SetText(format(L["TITAN_LOCATION_MAP_PLAYER_COORDS_TEXT"], TitanUtils_GetHighlightText(playerLocationText))); - else - TitanMapPlayerLocation:SetText(""); - end -- Determine the text to show for cursor coords @@ -514,13 +506,11 @@ function TitanMapFrame_OnUpdate(self, elapsed) TitanMapCursorLocation:ClearAllPoints() if WorldMapFrame:IsMaximized() then - x_offset = (WorldMapFrame:GetWidth() / 1.2) -- left fifth of map - - (TitanMapPlayerLocation:GetWidth() / 1.8) -- center of coords TitanMapPlayerLocation:SetPoint("TOPRIGHT", WorldMapFrame, "TOPRIGHT", -10, -28) TitanMapCursorLocation:SetPoint("TOPRIGHT", WorldMapFrame, "TOPRIGHT", -10, -43) else - --TitanMapCursorLocation:SetText(""); - --TitanMapPlayerLocation:SetPoint("TOPRIGHT", WorldMapFrame, "TOPRIGHT", 65, -20) + TitanMapPlayerLocation:SetPoint("TOPRIGHT", WorldMapFrame, "TOPRIGHT", -50, -5) + TitanMapCursorLocation:SetPoint("TOPRIGHT", WorldMapFrame, "TOPRIGHT", -200, -5) end end @@ -555,10 +545,10 @@ function TitanPanelLocation_CreateMapFrames() if (TPL_CMF_IsFirstTime and not _G["CT_MapMod"]) then TPL_CMF_IsFirstTime = false; local frame = CreateFrame("FRAME", "TitanMapFrame", WorldMapFrame.BorderFrame) - local font1 = frame:CreateFontString("TitanMapPlayerLocation", "ARTWORK", "GameFontNormal"); - font1:SetPoint("TOPRIGHT",WorldMapFrame,"TOPRIGHT",0,0); - local font2 = frame:CreateFontString("TitanMapCursorLocation", "ARTWORK", "GameFontNormal"); - font2:SetPoint("TOPRIGHT",WorldMapFrame,"TOPRIGHT",0,0); + local playertext = frame:CreateFontString("TitanMapPlayerLocation", "ARTWORK", "GameFontNormal"); + playertext:SetPoint("TOPRIGHT",WorldMapFrame,"TOPRIGHT",0,0); + local cursortext = frame:CreateFontString("TitanMapCursorLocation", "ARTWORK", "GameFontNormal"); + cursortext:SetPoint("TOPRIGHT",WorldMapFrame,"TOPRIGHT",0,0); frame:HookScript("OnUpdate",TitanMapFrame_OnUpdate); end end); diff --git a/TitanLocation/TitanLocation.toc b/TitanLocation/TitanLocation.toc index c01d332..f879f8d 100644 --- a/TitanLocation/TitanLocation.toc +++ b/TitanLocation/TitanLocation.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa005.14.5.80000|r +## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa005.14.6.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.5.80000 +## Version: 5.14.6.80000 ## X-Child-Of: Titan TitanLocation.xml diff --git a/TitanLootType/TitanLootType.toc b/TitanLootType/TitanLootType.toc index 7a59c3d..f195a4a 100644 --- a/TitanLootType/TitanLootType.toc +++ b/TitanLootType/TitanLootType.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa005.14.5.80000|r +## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa005.14.6.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.5.80000 +## Version: 5.14.6.80000 ## X-Child-Of: Titan TitanLootType.xml diff --git a/TitanPerformance/TitanPerformance.toc b/TitanPerformance/TitanPerformance.toc index 337329d..f6293fe 100644 --- a/TitanPerformance/TitanPerformance.toc +++ b/TitanPerformance/TitanPerformance.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa005.14.5.80000|r +## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa005.14.6.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.5.80000 +## Version: 5.14.6.80000 ## X-Child-Of: Titan TitanPerformance.xml diff --git a/TitanRepair/TitanRepair.toc b/TitanRepair/TitanRepair.toc index afd4533..a74073f 100644 --- a/TitanRepair/TitanRepair.toc +++ b/TitanRepair/TitanRepair.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa005.14.5.80000|r +## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa005.14.6.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.5.80000 +## Version: 5.14.6.80000 ## X-Child-Of: Titan TitanRepair.xml diff --git a/TitanVolume/TitanVolume.toc b/TitanVolume/TitanVolume.toc index 06afde2..2efe5cd 100644 --- a/TitanVolume/TitanVolume.toc +++ b/TitanVolume/TitanVolume.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa005.14.5.80000|r +## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa005.14.6.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.5.80000 +## Version: 5.14.6.80000 ## X-Child-Of: Titan TitanVolume.xml diff --git a/TitanXP/TitanXP.toc b/TitanXP/TitanXP.toc index bb931e0..42e0cff 100644 --- a/TitanXP/TitanXP.toc +++ b/TitanXP/TitanXP.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fXP|r] |cff00aa005.14.5.80000|r +## Title: Titan Panel [|cffeda55fXP|r] |cff00aa005.14.6.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.5.80000 +## Version: 5.14.6.80000 ## X-Child-Of: Titan TitanXP.xml