diff --git a/Titan/Titan.toc b/Titan/Titan.toc index e055b23..dde6d37 100644 --- a/Titan/Titan.toc +++ b/Titan/Titan.toc @@ -1,7 +1,7 @@ ## Interface: 80000 -## Title: Titan Panel |cff00aa005.14.8.80000|r +## Title: Titan Panel |cff00aa005.14.9.80000|r ## Author: Titan Development Team -## Version: 5.14.8.80000 +## Version: 5.14.9.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 14825b8..1308d7e 100755 --- a/Titan/TitanMovable.lua +++ b/Titan/TitanMovable.lua @@ -3,7 +3,8 @@ NAME: TitanMovable.lua DESC: Contains the routines to adjust the Blizzard frames to make room for the Titan bars the user has selected. There are a select set of Blizzard frames at the top of screen and at the bottom of the screen that Titan will move. Each frame adjusted has an entry in MData which is local and not directly accessible via addons. -However addons can tell Titan to not adjust some or all frames using TitanUtils_AddonAdjust(frame, bool). Addons that replace all or parts of the Blizzard UI use this. +However addons can tell Titan to not adjust some or all frames using TitanUtils_AddonAdjust(frame, bool). +Addons that replace all or parts of the Blizzard UI use this. The user can turn turn on / off the adjusting of all top frames or all bottom frames. :DESC @@ -152,7 +153,10 @@ OUT: top_bottom - Frame is at top or bottom, expecting Titan constant for top or --]] local function MoveFrame(frame_ptr, start_y, top_bottom) local frame = _G[frame_ptr] - if frame and frame:IsUserPlaced() then + if frame and (frame:IsUserPlaced() + or frame.MALockPointHook -- Allow MoveAnything to be used w/o error + ) + then -- skip this frame else if frame:IsShown() then @@ -187,7 +191,19 @@ local function MoveMenuFrame(frame_ptr, start_y, top_bottom) yOffset = yOffset + 14; end frame:ClearAllPoints(); - frame:SetPoint("BOTTOM", "UIParent", "BOTTOM", xOffset, yOffset); + -- This is a hack because GetPoint on MainMenuBar often returns all nil + -- If the scale is is around .85 or higher the bag menu overlaps the main menu + local fscale = tonumber(GetCVar("uiScale")) + local xadj = (fscale * 100) - 85 + if xadj <= 0 then + xOfs = 0 + else + -- Slide the menu bar left depending on scaling to allow bag menu room + xOfs = xadj * 6 * -1 + end + frame:SetPoint("BOTTOM", "UIParent", "BOTTOM", xOfs, yOffset); + else + -- Unknown frame... end end @@ -316,7 +332,7 @@ local MData = { move = function () MoveFrame("TargetFrame", 0, TITAN_PANEL_PLACE_TOP) end, addonAdj = false, }, [3] = {frameName = "PartyMemberFrame1", - move = function () MoveFrame("PartyMemberFrame1", -128, TITAN_PANEL_PLACE_TOP) end, + move = function () MoveFrame("PartyMemberFrame1", 20, TITAN_PANEL_PLACE_TOP) end, addonAdj = false, }, [4] = {frameName = "TicketStatusFrame", move = function () MoveFrame("TicketStatusFrame", 0, TITAN_PANEL_PLACE_TOP) end, @@ -348,14 +364,16 @@ local MData = { addonAdj = false, }, [7] = {frameName = "MultiBarRight", move = function () - -- account for Reputation Status Bar (doh) + local yOffset = 0 +--[[ local yOffset = 98 - local playerlevel = UnitLevel("player"); - if ReputationWatchStatusBar - and ReputationWatchStatusBar:IsVisible() - and playerlevel < _G["MAX_PLAYER_LEVEL"] then - yOffset = yOffset + 8; - end + local playerlevel = UnitLevel("player"); + if ReputationWatchStatusBar + and ReputationWatchStatusBar:IsVisible() + and playerlevel < _G["MAX_PLAYER_LEVEL"] then + yOffset = yOffset + 8; + end +--]] MoveFrame("MultiBarRight", yOffset, TITAN_PANEL_PLACE_BOTTOM) end, addonAdj = false, }, [8] = {frameName = "OverrideActionBar", @@ -364,7 +382,7 @@ local MData = { [9] = {frameName = "MicroButtonAndBagsBar", move = function () MoveFrame("MicroButtonAndBagsBar", 0, TITAN_PANEL_PLACE_BOTTOM) end, addonAdj = false, }, - [10] = {frameName = "MainMenuBar", + [10] = {frameName = "MainMenuBar", -- MainMenuBar move = function () MoveMenuFrame("MainMenuBar", 0, TITAN_PANEL_PLACE_BOTTOM) end, addonAdj = false, }, @@ -413,6 +431,7 @@ Then update the chat and open bag frames. OUT: None --]] local function TitanMovableFrame_MoveFrames() + local move_count = 0 if not InCombatLockdown() then for i = 1,#MData,1 do if MData[i] then @@ -420,15 +439,18 @@ local function TitanMovableFrame_MoveFrames() -- An addon has taken control of the frame so skip else -- Adjust the frame per MData - MData[i].move() + local ok, msg = pcall(function () MData[i].move() end) + if ok then + -- all is well + else + TitanPrint("Cannot Move" + .." '"..(MData[i].frameName or "?").."." + .." "..msg, "error") + end end end end ---[[ -move_count = move_count + 1 -TitanPrint("Move " -.." "..move_count -) +--[ --]] Titan_FCF_UpdateDockPosition(); -- chat UpdateContainerFrameAnchors(); -- Move bags as needed diff --git a/TitanBag/TitanBag.toc b/TitanBag/TitanBag.toc index 208a89f..effeca9 100644 --- a/TitanBag/TitanBag.toc +++ b/TitanBag/TitanBag.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fBag|r] |cff00aa005.14.8.80000|r +## Title: Titan Panel [|cffeda55fBag|r] |cff00aa005.14.9.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.8.80000 +## Version: 5.14.9.80000 ## X-Child-Of: Titan TitanBag.xml diff --git a/TitanClock/TitanClock.toc b/TitanClock/TitanClock.toc index 25c78f2..c4d2f37 100644 --- a/TitanClock/TitanClock.toc +++ b/TitanClock/TitanClock.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fClock|r] |cff00aa005.14.8.80000|r +## Title: Titan Panel [|cffeda55fClock|r] |cff00aa005.14.9.80000|r ## Notes: Adds a clock to Titan Panel ## Author: Titan Development Team (http://www.titanpanel.org) ## SavedVariables: ## OptionalDeps: ## Dependencies: Titan -## Version: 5.14.8.80000 +## Version: 5.14.9.80000 ## X-Child-Of: Titan TitanClock.xml diff --git a/TitanGold/TitanGold.toc b/TitanGold/TitanGold.toc index bab5e90..aa7e7ed 100644 --- a/TitanGold/TitanGold.toc +++ b/TitanGold/TitanGold.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fGold|r] |cff00aa005.14.8.80000|r +## Title: Titan Panel [|cffeda55fGold|r] |cff00aa005.14.9.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.8.80000 +## Version: 5.14.9.80000 ## X-Child-Of: Titan TitanGold.xml diff --git a/TitanLocation/TitanLocation.toc b/TitanLocation/TitanLocation.toc index 6636b07..c150a6d 100644 --- a/TitanLocation/TitanLocation.toc +++ b/TitanLocation/TitanLocation.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa005.14.8.80000|r +## Title: Titan Panel [|cffeda55fLocation|r] |cff00aa005.14.9.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.8.80000 +## Version: 5.14.9.80000 ## X-Child-Of: Titan TitanLocation.xml diff --git a/TitanLootType/TitanLootType.toc b/TitanLootType/TitanLootType.toc index 55ceea6..0e72701 100644 --- a/TitanLootType/TitanLootType.toc +++ b/TitanLootType/TitanLootType.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa005.14.8.80000|r +## Title: Titan Panel [|cffeda55fLootType|r] |cff00aa005.14.9.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.8.80000 +## Version: 5.14.9.80000 ## X-Child-Of: Titan TitanLootType.xml diff --git a/TitanPerformance/TitanPerformance.toc b/TitanPerformance/TitanPerformance.toc index a0bf461..ddf70ea 100644 --- a/TitanPerformance/TitanPerformance.toc +++ b/TitanPerformance/TitanPerformance.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa005.14.8.80000|r +## Title: Titan Panel [|cffeda55fPerformance|r] |cff00aa005.14.9.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.8.80000 +## Version: 5.14.9.80000 ## X-Child-Of: Titan TitanPerformance.xml diff --git a/TitanRepair/TitanRepair.toc b/TitanRepair/TitanRepair.toc index deda335..85766d6 100644 --- a/TitanRepair/TitanRepair.toc +++ b/TitanRepair/TitanRepair.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa005.14.8.80000|r +## Title: Titan Panel [|cffeda55fRepair|r] |cff00aa005.14.9.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.8.80000 +## Version: 5.14.9.80000 ## X-Child-Of: Titan TitanRepair.xml diff --git a/TitanVolume/TitanVolume.toc b/TitanVolume/TitanVolume.toc index 4a19669..c0692e2 100644 --- a/TitanVolume/TitanVolume.toc +++ b/TitanVolume/TitanVolume.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa005.14.8.80000|r +## Title: Titan Panel [|cffeda55fVolume|r] |cff00aa005.14.9.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.8.80000 +## Version: 5.14.9.80000 ## X-Child-Of: Titan TitanVolume.xml diff --git a/TitanXP/TitanXP.toc b/TitanXP/TitanXP.toc index 6c9198b..9844052 100644 --- a/TitanXP/TitanXP.toc +++ b/TitanXP/TitanXP.toc @@ -1,10 +1,10 @@ ## Interface: 80000 -## Title: Titan Panel [|cffeda55fXP|r] |cff00aa005.14.8.80000|r +## Title: Titan Panel [|cffeda55fXP|r] |cff00aa005.14.9.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.8.80000 +## Version: 5.14.9.80000 ## X-Child-Of: Titan TitanXP.xml