Quantcast

- Updated TOC to 6.00.06

urnati [11-10-22 - 13:07]
- Updated TOC to 6.00.06
- Moved Titan template declarations from Panel to Templates to ensure they are found on clean install
- Updated Location so cursor coords survive a change in scaling; added back flag to not show coords on world map
- Cleanup "Y offset" routine
- Allow Gold to be left / center
- Added a couple debug statements
- Added a 'already created' check to aout hide
- Remove 'screen adjust' option from code; no longer needed with DragonFlight UI edit mode
Filename
Titan/LDBToTitan.lua
Titan/Titan.toc
Titan/TitanAutoHide.lua
Titan/TitanConfig.lua
Titan/TitanMovable.lua
Titan/TitanPanel.lua
Titan/TitanPanel.xml
Titan/TitanPanelTemplate.lua
Titan/TitanPanelTemplate.xml
Titan/TitanUtils.lua
Titan/TitanVariables.lua
TitanBag/TitanBag.toc
TitanClock/TitanClock.toc
TitanGold/TitanGold.lua
TitanGold/TitanGold.toc
TitanLocation/TitanLocation.lua
TitanLocation/TitanLocation.toc
TitanLootType/TitanLootType.toc
TitanPerformance/TitanPerformance.toc
TitanRepair/TitanRepair.toc
TitanVolume/TitanVolume.toc
TitanXP/TitanXP.toc
diff --git a/Titan/LDBToTitan.lua b/Titan/LDBToTitan.lua
index 4644cfe..8974c32 100644
--- a/Titan/LDBToTitan.lua
+++ b/Titan/LDBToTitan.lua
@@ -557,11 +557,15 @@ NOTE:
 :NOTE
 --]]
 function LDBToTitan:TitanLDBCreateObject(_, name, obj)
-	--TitanDebug("Attempting to register "..name..".");
+ 	if TITAN_PANEL_VARS.debug.ldb_setup then
+		TitanDebug(tostring(name).." Attempting to register ");
+	end

 	-- couple sanity checks
 	if not obj or not name then
---		TitanDebug(.."LDB request to create Titan plugin was unrecognizable!!!!")
+		if TITAN_PANEL_VARS.debug.ldb_setup then
+			TitanDebug("LDB request to create Titan plugin was unrecognizable!!!!");
+		end
 		return
 	end

@@ -581,19 +585,23 @@ function LDBToTitan:TitanLDBCreateObject(_, name, obj)
 	else
 		-- Create enough of a plugin to tell the user / developer
 		-- that this plugin failed miserably
+		local issue = "Unsupported LDB type '"..tostring(obj.type).."'"
 		local plugin =
 			{
 			self = nil,
 			button = nil,
 			isChild = nil,
 			name = (name or "?"),
-			issue = "Unsupported LDB type '"..obj.type.."'",
+			issue = issue,
 			notes = "",
 			status = TITAN_REGISTER_FAILED,
 			category = "",
 			plugin_type = (obj.type or ""),
 			}
 		TitanUtils_PluginFail(plugin)
+		if TITAN_PANEL_VARS.debug.ldb_setup then
+			TitanDebug(TITAN_REGISTER_FAILED.." "..issue);
+		end
 		return -- get out, there is nothing more that can be done
 	end

@@ -716,6 +724,12 @@ function LDBToTitan:TitanLDBCreateObject(_, name, obj)
 		iconG = (obj.iconG or nil),
 	};

+	if TITAN_PANEL_VARS.debug.ldb_setup then
+		TitanDebug(""
+			.." type: '"..tostring(registry.ldb).."' "
+		)
+	end
+
 	-- Set the plugin category, if it exists, else default to "General"
 	-- Per the 1.1 LDB spec we check for a tocname attrib first,
 	-- if found we use it, if not we assume that the DO "name"
@@ -761,21 +775,25 @@ function LDBToTitan:TitanLDBCreateObject(_, name, obj)
 	if obj.type == "macro" then  -- custom
 		newTitanFrame = CreateFrame("Button",
 			"TitanPanel"..NAME_PREFIX..name.."Button",
-			UIParent, "TitanPanelComboTemplate, SecureActionButtonTemplate")
+			UIParent, "SecureActionButtonTemplate, TitanPanelComboTemplate")
 		newTitanFrame:SetAttribute("type", "macro")
 		newTitanFrame:SetAttribute("macrotext", obj.commandtext)
---[[
-print("T_LDB"
-.." "..tostring(name).." "
-.." '"..tostring(obj.commandtext).."' "
-)
---]]
+		if TITAN_PANEL_VARS.debug.ldb_setup then
+			TitanDebug(""
+				.." macro cmd: '"..tostring(obj.commandtext).."' "
+			)
+		end
 	else
 		newTitanFrame = CreateFrame("Button",
 			"TitanPanel"..NAME_PREFIX..name.."Button",
 			UIParent, "TitanPanelComboTemplate")
 	end

+	newTitanFrame.TitanCreatedBy = "LDB"
+	newTitanFrame.TitanType = "macro"
+	newTitanFrame.TitanName = (name or "?")
+	newTitanFrame.TitanAction = (obj.commandtext or "None")
+
 	newTitanFrame.registry = registry
 	newTitanFrame:SetFrameStrata("FULLSCREEN");
 	newTitanFrame:SetToplevel(true);
@@ -820,6 +838,20 @@ print("T_LDB"
 			CALLBACK_PREFIX..name.."_OnDoubleClick", "TitanLDBHandleScripts")
 	end

+	if TITAN_PANEL_VARS.debug.ldb_setup then
+		TitanDebug(""
+			.." id: '"..tostring(registry.id).."' "
+			.." type: '"..tostring(registry.ldb).."' "
+			.." type: '"..tostring(registry.ldb).."' "
+		)
+	end
+	if TITAN_PANEL_VARS.debug.ldb_setup then
+		TitanDebug(""
+			.." id: '"..tostring(registry.id).."' "
+			.." registered"
+		)
+	end
+
 	-- If plugins have already been registered and loaded then get this one loaded
 	-- This works because the .registry is now set
 	if Titan__InitializedPEW then
diff --git a/Titan/Titan.toc b/Titan/Titan.toc
index f4961c4..e6219b6 100644
--- a/Titan/Titan.toc
+++ b/Titan/Titan.toc
@@ -1,7 +1,7 @@
 ## Interface: 100000
-## Title: Titan Panel [|cffeda55f_Core_|r] |cff00aa006.00.05.100000|r
+## Title: Titan Panel [|cffeda55f_Core_|r] |cff00aa006.00.06.100000|r
 ## Author: Titan Panel Development Team
-## Version: 6.00.05.100000
+## Version: 6.00.06.100000
 ## 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/TitanAutoHide.lua b/Titan/TitanAutoHide.lua
index 76af2d2..e1e5c59 100644
--- a/Titan/TitanAutoHide.lua
+++ b/Titan/TitanAutoHide.lua
@@ -197,10 +197,10 @@ local function Create_Hide_Button(name, f)
 end

 local function Create_Frames()
-	if _G[TITAN_BUTTON] then
+	if _G["Titan_Bar__Display_Bar"] then
 		return -- if already created
 	end
-
+
 	-- Display & Hide bars
 	local top1_d = CreateFrame("Button", "Titan_Bar__Display_Bar", UIParent, "Titan_Bar__Display_Template")
 	top1_d:SetFrameStrata("DIALOG")
diff --git a/Titan/TitanConfig.lua b/Titan/TitanConfig.lua
index d1a729a..b516790 100644
--- a/Titan/TitanConfig.lua
+++ b/Titan/TitanConfig.lua
@@ -104,54 +104,6 @@ local function TitanPanel_TicketReload()
 	StaticPopup_Show("TITAN_RELOAD");
 end

-local function TitanPanel_ScreenAdjustReload()
-	if TitanPanelGetVar("ScreenAdjust") then
-		-- if set then clear it - the screen will adjust
-		TitanPanelBarButton_ToggleScreenAdjust()
-	else
-		-- if NOT set then need a reload - the screen will NOT adjust
-		StaticPopupDialogs["TITAN_RELOAD"] = {
-			text = TitanUtils_GetNormalText(L["TITAN_PANEL_MENU_TITLE"]).."\n\n"
-				..L["TITAN_PANEL_RELOAD"],
-			button1 = ACCEPT,
-			button2 = CANCEL,
-			OnAccept = function(self)
-				TitanPanelToggleVar("ScreenAdjust");
-				ReloadUI();
-				end,
-			showAlert = 1,
-			timeout = 0,
-			whileDead = 1,
-			hideOnEscape = 1
-		};
-		StaticPopup_Show("TITAN_RELOAD");
-	end
-end
-local function TitanPanel_AuxScreenAdjustReload()
-	if TitanPanelGetVar("AuxScreenAdjust") then
-		-- if set then clear it - the screen will adjust
-		TitanPanelBarButton_ToggleAuxScreenAdjust()
-	else
-		-- if NOT set then need a reload - the screen will NOT adjust
-		StaticPopupDialogs["TITAN_RELOAD"] = {
-			text = TitanUtils_GetNormalText(L["TITAN_PANEL_MENU_TITLE"]).."\n\n"
-				..L["TITAN_PANEL_RELOAD"],
-			button1 = ACCEPT,
-			button2 = CANCEL,
-			OnAccept = function(self)
-				TitanPanelToggleVar("AuxScreenAdjust");
-				ReloadUI();
---				TitanPanelBarButton_ToggleAuxScreenAdjust();
-				end,
-			showAlert = 1,
-			timeout = 0,
-			whileDead = 1,
-			hideOnEscape = 1
-		};
-		StaticPopup_Show("TITAN_RELOAD");
-	end
-end
-
 -------------
 -- skins config section
 --[[ local
diff --git a/Titan/TitanMovable.lua b/Titan/TitanMovable.lua
index d34ec6e..cf996b4 100755
--- a/Titan/TitanMovable.lua
+++ b/Titan/TitanMovable.lua
@@ -63,26 +63,21 @@ function TitanMovable_GetPanelYOffset(framePosition) -- used by other addons
 	-- requested position is returned
 	local barnum_top = 0
 	local barnum_bot = 0
-	-- If user has the top adjust set then determine the
-	-- top offset
-	if not TitanPanelGetVar("ScreenAdjust") then
-		if TitanPanelGetVar("Bar_Show") then
-			barnum_top = 1
-		end
-		if TitanPanelGetVar("Bar2_Show") then
-			barnum_top = 2
-		end
+	-- If user has the top set then determine the top offset
+	if TitanPanelGetVar("Bar_Show") then
+		barnum_top = 1
 	end
-	-- If user has the top adjust set then determine the
-	-- bottom offset
-	if not TitanPanelGetVar("AuxScreenAdjust") then
-		if TitanPanelGetVar("AuxBar_Show") then
-			barnum_bot = 1
-		end
-		if TitanPanelGetVar("AuxBar2_Show") then
-			barnum_bot = 2
-		end
+	if TitanPanelGetVar("Bar2_Show") then
+		barnum_top = 2
+	end
+	-- If user has the bottom set then determine the bottom offset
+	if TitanPanelGetVar("AuxBar_Show") then
+		barnum_bot = 1
+	end
+	if TitanPanelGetVar("AuxBar2_Show") then
+		barnum_bot = 2
 	end
+
 	local scale = TitanPanelGetVar("Scale")
 	-- return the requested offset
 	-- 0 will be returned if the user has no bars showing
@@ -117,8 +112,12 @@ function TitanPanel_AdjustFrames(force, reason)
 			)
 	end

--- DF no longer react to hooks - now react to PEW and Titan user config changes.
+-- DF Titan no longer react to hooks to move frames
 	-- Adjust frame positions top and bottom based on user choices
+			Titan_AdjustFrame("MicroButtonAndBagsBar", "MenuAndBagVerticalAdjOn", "MenuAndBagVerticalAdj")
+			Titan_AdjustFrame("StatusTrackingBarManager", "XPBarVerticalAdjOn", "XPBarVerticalAdj")
+
+--[[
 	if hooks_done then
 		if reason == "Init: PEW (Player Entering World)"
 		or reason == "MenuAndBagVerticalAdj" then
@@ -129,6 +128,7 @@ function TitanPanel_AdjustFrames(force, reason)
 			Titan_AdjustFrame("StatusTrackingBarManager", "XPBarVerticalAdjOn", "XPBarVerticalAdj")
 		end
 	end
+--]]
 end

 --[[ Titan
diff --git a/Titan/TitanPanel.lua b/Titan/TitanPanel.lua
index b39ee50..fa9fc25 100644
--- a/Titan/TitanPanel.lua
+++ b/Titan/TitanPanel.lua
@@ -292,6 +292,8 @@ end)
 -- Cannot seem to move the 'top' part of the frame.
 _G[TITAN_PANEL_CONTROL]:RegisterEvent("PET_BATTLE_OPENING_START");
 _G[TITAN_PANEL_CONTROL]:RegisterEvent("PET_BATTLE_CLOSE");
+-- Adjust a couple frames per user
+_G[TITAN_PANEL_CONTROL]:RegisterEvent("EDIT_MODE_LAYOUTS_UPDATED");


 --[[ Titan
@@ -402,7 +404,6 @@ function TitanPanel_PlayerEnteringWorld()

 	-- Move frames
 	TitanMovable_SecureFrames()
-	TitanPanel_AdjustFrames(true, "Init: PEW (Player Entering World)")

 end

@@ -501,6 +502,10 @@ function TitanPanelBarButton:PET_BATTLE_CLOSE()
 	TitanPanelBarButton_DisplayBarsWanted("PET_BATTLE_CLOSE")
 end
 --
+function TitanPanelBarButton:EDIT_MODE_LAYOUTS_UPDATED(layout_info, from_server)
+	TitanPanel_AdjustFrames(true, "EDIT_MODE_LAYOUTS_UPDATED "..tostring(from_server))
+end
+
 --

 --[[ Titan
@@ -1062,35 +1067,6 @@ function TitanPanelBarButton_ToggleAutoHide(frame)
 end

 --[[ Titan
-NAME: TitanPanelBarButton_ToggleScreenAdjust
-DESC: Toggle whether Titan adjusts 'top' frames around Titan bars per the user's new choice.
-VAR:  None
-NOTE:
-- Another addon can tell Titan to NOT adjust some or all frames.
-:NOTE
---]]
-function TitanPanelBarButton_ToggleScreenAdjust()
-	-- Turn on / off adjusting of other frames around Titan
-	TitanPanelToggleVar("ScreenAdjust");
-	TitanPanel_AdjustFrames(true, "Config: on/off adj top frames")
-end
-
---[[ Titan
-NAME: TitanPanelBarButton_ToggleAuxScreenAdjust
-DESC: Toggle whether Titan adjusts 'bottom' frames around Titan bars per the user's new choice.
-VAR:  None
-OUT:  None
-NOTE:
-- Another addon can tell Titan to NOT adjust some or all frames.
-:NOTE
---]]
-function TitanPanelBarButton_ToggleAuxScreenAdjust()
-	-- turn on / off adjusting of frames at the bottom of the screen
-	TitanPanelToggleVar("AuxScreenAdjust");
-	TitanPanel_AdjustFrames(true, "Config: on/off adj bottom frames")
-end
-
---[[ Titan
 NAME: TitanPanelBarButton_ForceLDBLaunchersRight
 DESC: Force all plugins created from LDB addons, visible or not, to be on the right side of the Titan bar. Any visible plugin will be forced to the right side on the same bar it is currently on.
 VAR:  None
diff --git a/Titan/TitanPanel.xml b/Titan/TitanPanel.xml
index f23171e..eb6f9e6 100644
--- a/Titan/TitanPanel.xml
+++ b/Titan/TitanPanel.xml
@@ -1,34 +1,9 @@
 <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">

-	<GameTooltip name="TitanPanelTooltip" inherits="GameTooltipTemplate" parent="UIParent" hidden="true"/>
-	<Button name="TitanPanelBarButtonHiderTemplate" frameStrata="BACKGROUND" toplevel="true" movable="true" parent="UIParent" virtual="true">
-		<Scripts>
-			<OnLoad>
-				self:RegisterForClicks("LeftButtonUp", "RightButtonDown")
-			</OnLoad>
-		</Scripts>
-		<Size>
-			<AbsDimension x="2560" y="24"/>
-		</Size>
-	</Button>
-
-	<!--
-	This is a control frame used to capture events Titan is interested in.
-	Other buttons will be used for display.
-	-->
-	<Button name="TitanPanelBarButton" frameStrata="BACKGROUND" parent="UIParent">
-		<Size>
-			<AbsDimension x="0" y="0"/>
-		</Size>
-	</Button>
-
-	<Button name="Titan_Bar__Display_Template" frameStrata="DIALOG" toplevel="true" movable="true" parent="UIParent" virtual="true">
-	</Button>
-
 	<!--
-	These two frames are placed at the bottom of the top
-	and top of the bottom to give addons a notion of what
+	These two frames are placed at the bottom of the top bar(s)
+	and top of the bottom bar(s) to give addons a notion of what
 	space Titan is using.
 	A non zero size is needed for the anchors to respond properly.
 	-->
diff --git a/Titan/TitanPanelTemplate.lua b/Titan/TitanPanelTemplate.lua
index 600893a..867dd8a 100644
--- a/Titan/TitanPanelTemplate.lua
+++ b/Titan/TitanPanelTemplate.lua
@@ -643,6 +643,17 @@ function TitanPanelButton_OnClick(self, button, isChildButton) -- Used by plugin
 			TitanUtils_GetButtonID(self:GetName()));
 	end

+--[[
+if self.TitanType == "macro" then
+print("TPB OnClick"
+.." "..tostring(self:GetName()).." "
+.." "..tostring(button).." "
+.." "..tostring(issecure()).." "
+.." "..tostring(self:GetAttribute("type")).." "
+.." "..tostring(self:GetAttribute("macrotext")).." "
+)
+end
+--]]
 	if id then
 		local controlFrame = TitanUtils_GetControlFrame(id);
 		local rightClickMenu = _G["TitanPanelRightClickMenu"];
diff --git a/Titan/TitanPanelTemplate.xml b/Titan/TitanPanelTemplate.xml
index 611b11e..d46219d 100644
--- a/Titan/TitanPanelTemplate.xml
+++ b/Titan/TitanPanelTemplate.xml
@@ -141,5 +141,32 @@

 				self:EnableMouseWheel(true);
 			</OnLoad>
-		</Scripts>	</Slider>
+		</Scripts>
+	</Slider>
+
+	<GameTooltip name="TitanPanelTooltip" inherits="GameTooltipTemplate" parent="UIParent" hidden="true"/>
+	<Button name="TitanPanelBarButtonHiderTemplate" frameStrata="BACKGROUND" toplevel="true" movable="true" parent="UIParent" virtual="true">
+		<Scripts>
+			<OnLoad>
+				self:RegisterForClicks("LeftButtonUp", "RightButtonDown")
+			</OnLoad>
+		</Scripts>
+		<Size>
+			<AbsDimension x="2560" y="24"/>
+		</Size>
+	</Button>
+
+	<!--
+	This is a control frame used to capture events Titan is interested in.
+	Other buttons will be used for display.
+	-->
+	<Button name="TitanPanelBarButton" frameStrata="BACKGROUND" parent="UIParent">
+		<Size>
+			<AbsDimension x="0" y="0"/>
+		</Size>
+	</Button>
+
+	<Button name="Titan_Bar__Display_Template" frameStrata="DIALOG" toplevel="true" movable="true" parent="UIParent" virtual="true">
+	</Button>
+
 </Ui>
diff --git a/Titan/TitanUtils.lua b/Titan/TitanUtils.lua
index 37bbc5f..70a4a5f 100644
--- a/Titan/TitanUtils.lua
+++ b/Titan/TitanUtils.lua
@@ -17,6 +17,7 @@ TITAN_PANEL_VARS = {}
 TITAN_PANEL_VARS.debug = {}
 TITAN_PANEL_VARS.debug.movable = false
 TITAN_PANEL_VARS.debug.events = false
+TITAN_PANEL_VARS.debug.ldb_setup = false

 local _G = getfenv(0);
 local L = LibStub("AceLocale-3.0"):GetLocale(TITAN_ID, true)
diff --git a/Titan/TitanVariables.lua b/Titan/TitanVariables.lua
index cfa3844..95ec97f 100644
--- a/Titan/TitanVariables.lua
+++ b/Titan/TitanVariables.lua
@@ -246,14 +246,12 @@ TITAN_PANEL_SAVED_VARIABLES = {
 	FontName = TPC.FONT_NAME,
 	FrameStrata = "LOW",
 	FontSize = TPC.FONT_SIZE,
-	ScreenAdjust = false,
 	LogAdjust = false,
 	MinimapAdjust = false,
 	BagAdjust = 1,
 	TicketAdjust = 1,
 	Position = 1,
 	ButtonAlign = 1,
-	AuxScreenAdjust = false,
 	LockButtons = false,
 	LockAutoHideInCombat = false,
 	VersionShown = 1,
diff --git a/TitanBag/TitanBag.toc b/TitanBag/TitanBag.toc
index 0c2b04c..9a76253 100644
--- a/TitanBag/TitanBag.toc
+++ b/TitanBag/TitanBag.toc
@@ -1,10 +1,10 @@
 ## Interface: 100000
-## Title: Titan Panel [|cffeda55fBag|r] |cff00aa006.00.05.100000|r
+## Title: Titan Panel [|cffeda55fBag|r] |cff00aa006.00.06.100000|r
 ## Notes: Adds bag and free slot information to Titan Panel
 ## Author: Titan Panel Development Team (http://www.titanpanel.org)
 ## SavedVariables:
 ## OptionalDeps:
 ## Dependencies: Titan
-## Version: 6.00.05.100000
+## Version: 6.00.06.100000
 ## X-Child-Of: Titan
 TitanBag.lua
diff --git a/TitanClock/TitanClock.toc b/TitanClock/TitanClock.toc
index c907ee9..d9a3943 100644
--- a/TitanClock/TitanClock.toc
+++ b/TitanClock/TitanClock.toc
@@ -1,10 +1,10 @@
 ## Interface: 100000
-## Title: Titan Panel [|cffeda55fClock|r] |cff00aa006.00.05.100000|r
+## Title: Titan Panel [|cffeda55fClock|r] |cff00aa006.00.06.100000|r
 ## Notes: Adds a clock to Titan Panel
 ## Author: Titan Panel Development Team (http://www.titanpanel.org)
 ## SavedVariables:
 ## OptionalDeps:
 ## Dependencies: Titan
-## Version: 6.00.05.100000
+## Version: 6.00.06.100000
 ## X-Child-Of: Titan
 TitanClock.lua
diff --git a/TitanGold/TitanGold.lua b/TitanGold/TitanGold.lua
index ddd46c9..2316045 100644
--- a/TitanGold/TitanGold.lua
+++ b/TitanGold/TitanGold.lua
@@ -189,7 +189,7 @@ function TitanPanelGoldButton_OnLoad(self)
 			ShowLabelText = true,
 			ShowRegularText = false,
 			ShowColoredText = false,
-			DisplayOnRightSide = false
+			DisplayOnRightSide = true,
 		},
 		savedVariables = {
 			Initialized = true,
@@ -203,6 +203,7 @@ function TitanPanelGoldButton_OnLoad(self)
 			ShowIcon = true,
 			ShowLabelText = false,
 			ShowColoredText = true,
+			DisplayOnRightSide = false,
 			UseSeperatorComma = true,
 			UseSeperatorPeriod = false,
 			MergeServers = false,
diff --git a/TitanGold/TitanGold.toc b/TitanGold/TitanGold.toc
index c70c97c..5778f0f 100644
--- a/TitanGold/TitanGold.toc
+++ b/TitanGold/TitanGold.toc
@@ -1,10 +1,10 @@
 ## Interface: 100000
-## Title: Titan Panel [|cffeda55fGold|r] |cff00aa006.00.05.100000|r
+## Title: Titan Panel [|cffeda55fGold|r] |cff00aa006.00.06.100000|r
 ## Notes: Keeps track of all gold held by a player's toons on a per server/faction basis.
 ## Author: Titan Panel Development Team (http://www.titanpanel.org)
 ## SavedVariables: GoldSave
 ## OptionalDeps:
 ## Dependencies: Titan
-## Version: 6.00.05.100000
+## Version: 6.00.06.100000
 ## X-Child-Of: Titan
 TitanGold.lua
diff --git a/TitanLocation/TitanLocation.lua b/TitanLocation/TitanLocation.lua
index a99a0e7..ffb46b7 100755
--- a/TitanLocation/TitanLocation.lua
+++ b/TitanLocation/TitanLocation.lua
@@ -491,6 +491,32 @@ print("TLoc"
 .." p "..tostring(playerLocationText).." "
 )
 --]==]
+
+		-- Potision the text
+		if WorldMapFrame.BorderFrame.MaximizeMinimizeFrame.MaximizeButton:IsShown() then
+			if WorldMapFrame.TitanSizePrev == "small" then
+				-- no change
+			else
+				TitanMapPlayerLocation:ClearAllPoints();
+				TitanMapCursorLocation:ClearAllPoints();
+				TitanMapPlayerLocation:SetPoint("RIGHT", WorldMapFrame.BorderFrame.MaximizeMinimizeFrame, "LEFT", 0, 0)
+				TitanMapCursorLocation:SetPoint("LEFT", WorldMapFrame.BorderFrame.Tutorial, "RIGHT", 0, 0)
+				WorldMapFrame.TitanSize = "small"
+			end
+		else -- map should be 'full' screen
+			if WorldMapFrame.TitanSizePrev == "large" then
+				-- no change
+			else
+				TitanMapPlayerLocation:ClearAllPoints();
+				TitanMapCursorLocation:ClearAllPoints();
+				TitanMapPlayerLocation:SetPoint("RIGHT", WorldMapFrame.BorderFrame.MaximizeMinimizeFrame, "LEFT", 0, 0)
+				TitanMapCursorLocation:SetPoint("TOP", TitanMapPlayerLocation, "BOTTOM", 0, -5)
+--				TitanMapPlayerLocation:SetPoint("RIGHT", WorldMapFrame.BorderFrame.MaximizeMinimizeFrame, "BOTTOMRIGHT", 0, -4)
+--				TitanMapCursorLocation:SetPoint("TOP", TitanMapPlayerLocation, "BOTTOM", 0, 0)
+				WorldMapFrame.TitanSize = "large"
+			end
+		end
+
 end

 --[[
@@ -539,6 +565,13 @@ function TitanPanelLocation_CreateMapFrames()
 		end
 		frame:HookScript("OnShow", function()
 			frame.updateTicker = frame.updateTicker or C_Timer.NewTicker(0.07, updateFunc);
+			if WorldMapFrame.BorderFrame.MaximizeMinimizeFrame.MaximizeButton:IsShown() then
+				WorldMapFrame.TitanSize = "small"
+				WorldMapFrame.TitanSizePrev = "none"
+			else
+				WorldMapFrame.TitanSize = "large"
+				WorldMapFrame.TitanSizePrev = "none"
+			end
 		end);
 		frame:HookScript("OnHide", function()
 			if (frame.updateTicker) then
@@ -550,49 +583,10 @@ function TitanPanelLocation_CreateMapFrames()
 		-- create the font strings and update their position based in minimizing/maximizing the main map
 		local playertext = frame:CreateFontString("TitanMapPlayerLocation", "ARTWORK", "GameFontNormal");
 		local cursortext = frame:CreateFontString("TitanMapCursorLocation", "ARTWORK", "GameFontNormal");
-		hooksecurefunc(WorldMapFrame.BorderFrame.MaximizeMinimizeFrame, "Maximize", function()
-			playertext:ClearAllPoints();
-			cursortext:ClearAllPoints();
-			playertext:SetPoint("LEFT", WorldMapFrame.BorderFrame.MaximizeMinimizeFrame, "TOPRIGHT", 0, 0)
---			playertext:SetPoint("TOPRIGHT", WorldMapFrame, "TOPRIGHT", -10, -28)
-			cursortext:SetPoint("RIGHT", WorldMapFrame.BorderFrame.Tutorial, "LEFT", 0, 8)
---			cursortext:SetPoint("TOPRIGHT", WorldMapFrame, "TOPRIGHT", -10, -43)
---[==[
-print("TLoc max"
-.." p "..tostring(playertext and true or false).." "
-.." c "..tostring(cursortext and true or false).." "
-)
---]==]
-		end);
-		hooksecurefunc(WorldMapFrame.BorderFrame.MaximizeMinimizeFrame, "Minimize", function()
-			playertext:ClearAllPoints();
-			cursortext:ClearAllPoints();
-			playertext:SetPoint("TOPRIGHT", WorldMapFrame, "TOPRIGHT", -50, -5)
---			playertext:SetPoint("TOPRIGHT", WorldMapFrame, "TOPRIGHT", -50, 15)
-			cursortext:SetPoint("TOPLEFT", WorldMapFrame, "TOPLEFT", 95, -5)
---			cursortext:SetPoint("TOPLEFT", WorldMapFrame, "TOPLEFT", 95, 5)
---[==[
-print("TLoc min"
-.." p "..tostring(playertext and true or false).." "
-.."  "..tostring(playertext:GetText()).." "
-.."  "..tostring(frame:GetFrameStrata()).." "
-.."  "..tostring(frame:GetFrameLevel()).." "
-.." c "..tostring(cursortext and true or false).." "
-.."  "..tostring(cursortext:GetText()).." "
-.."  "..tostring(WorldMapFrame:GetFrameStrata()).." "
-.."  "..tostring(WorldMapFrame:GetFrameLevel()).." "
-)
---]==]
-		end);
---[==[
-print("TLoc"
-.." f "..tostring(frame and true or false).." "
-.." ut "..tostring(frame.updateTicker and true or false).." "
-.." p "..tostring(playertext and true or false).." "
-.." c "..tostring(cursortext and true or false).." "
-)
---]==]
-
+		playertext:ClearAllPoints();
+		cursortext:ClearAllPoints();
+		playertext:SetPoint("TOPRIGHT", WorldMapFrameCloseButton, "BOTTOMRIGHT", 0, 0)
+		cursortext:SetPoint("TOP", playertext, "BOTTOM", 0, 0)
 	end
 end

diff --git a/TitanLocation/TitanLocation.toc b/TitanLocation/TitanLocation.toc
index b3163ea..fb71e23 100644
--- a/TitanLocation/TitanLocation.toc
+++ b/TitanLocation/TitanLocation.toc
@@ -1,10 +1,10 @@
 ## Interface: 100000
-## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa006.00.05.100000|r
+## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa006.00.06.100000|r
 ## Notes: Adds coordinates and location information to Titan Panel
 ## Author: Titan Panel Development Team (http://www.titanpanel.org)
 ## SavedVariables:
 ## OptionalDeps:
 ## Dependencies: Titan
-## Version: 6.00.05.100000
+## Version: 6.00.06.100000
 ## X-Child-Of: Titan
 TitanLocation.lua
diff --git a/TitanLootType/TitanLootType.toc b/TitanLootType/TitanLootType.toc
index 9cf8b7a..0c78673 100644
--- a/TitanLootType/TitanLootType.toc
+++ b/TitanLootType/TitanLootType.toc
@@ -1,10 +1,10 @@
 ## Interface: 100000
-## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa006.00.05.100000|r
+## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa006.00.06.100000|r
 ## Notes: Adds group loot and instance difficulty information to Titan Panel
 ## Author: Titan Panel Development Team (http://www.titanpanel.org)
 ## SavedVariables:
 ## OptionalDeps:
 ## Dependencies: Titan
-## Version: 6.00.05.100000
+## Version: 6.00.06.100000
 ## X-Child-Of: Titan
 TitanLootType.lua
diff --git a/TitanPerformance/TitanPerformance.toc b/TitanPerformance/TitanPerformance.toc
index 0c97e9d..48027ea 100644
--- a/TitanPerformance/TitanPerformance.toc
+++ b/TitanPerformance/TitanPerformance.toc
@@ -1,10 +1,10 @@
 ## Interface: 100000
-## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa006.00.05.100000|r
+## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa006.00.06.100000|r
 ## Notes: Adds FPS and Garbage collection information to Titan Panel
 ## Author: Titan Panel Development Team (http://www.titanpanel.org)
 ## SavedVariables:
 ## OptionalDeps:
 ## Dependencies: Titan
-## Version: 6.00.05.100000
+## Version: 6.00.06.100000
 ## X-Child-Of: Titan
 TitanPerformance.lua
diff --git a/TitanRepair/TitanRepair.toc b/TitanRepair/TitanRepair.toc
index e7b6767..3a93184 100644
--- a/TitanRepair/TitanRepair.toc
+++ b/TitanRepair/TitanRepair.toc
@@ -1,10 +1,10 @@
 ## Interface: 100000
-## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa006.00.05.100000|r
+## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa006.00.06.100000|r
 ## Notes: Provides a configurable durability display. Also adds the ability to auto repair items and inventory at vendors
 ## Author: Titan Panel Development Team (http://www.titanpanel.org)
 ## SavedVariables:
 ## OptionalDeps:
 ## Dependencies: Titan
-## Version: 6.00.05.100000
+## Version: 6.00.06.100000
 ## X-Child-Of: Titan
 TitanRepair.lua
diff --git a/TitanVolume/TitanVolume.toc b/TitanVolume/TitanVolume.toc
index 13bbe5e..62300a0 100644
--- a/TitanVolume/TitanVolume.toc
+++ b/TitanVolume/TitanVolume.toc
@@ -1,10 +1,10 @@
 ## Interface: 100000
-## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa006.00.05.23.7.100000|r
+## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa006.00.06.23.7.100000|r
 ## Notes: Adds a volume control icon on your Titan Bar
 ## Author: Titan Panel Development Team (http://www.titanpanel.org)
 ## SavedVariables:
 ## OptionalDeps:
 ## Dependencies: Titan
-## Version: 6.00.05.100000
+## Version: 6.00.06.100000
 ## X-Child-Of: Titan
 TitanVolume.lua
diff --git a/TitanXP/TitanXP.toc b/TitanXP/TitanXP.toc
index 5446d49..f6e4d08 100644
--- a/TitanXP/TitanXP.toc
+++ b/TitanXP/TitanXP.toc
@@ -1,10 +1,10 @@
 ## Interface: 100000
-## Title: Titan Panel [|cffeda55fXP|r] |cff00aa006.00.05.100000|r
+## Title: Titan Panel [|cffeda55fXP|r] |cff00aa006.00.06.100000|r
 ## Notes: Adds information to Titan Panel about XP earned and time to level
 ## Author: Titan Panel Development Team (http://www.titanpanel.org)
 ## SavedVariables:
 ## OptionalDeps:
 ## Dependencies: Titan
-## Version: 6.00.05.100000
+## Version: 6.00.06.100000
 ## X-Child-Of: Titan
 TitanXP.lua