diff --git a/TitanBag/TitanBag.lua b/TitanBag/TitanBag.lua index 90ba680..8ae14ff 100644 --- a/TitanBag/TitanBag.lua +++ b/TitanBag/TitanBag.lua @@ -565,4 +565,6 @@ local function Create_Frames() end -Create_Frames() -- do the work +if TITAN_ID then -- it exists + Create_Frames() -- do the work +end diff --git a/TitanClock/TitanClock.lua b/TitanClock/TitanClock.lua index 05a6bef..73bb5d1 100644 --- a/TitanClock/TitanClock.lua +++ b/TitanClock/TitanClock.lua @@ -611,4 +611,6 @@ local function Create_Frames() end -Create_Frames() -- do the work +if TITAN_ID then -- it exists + Create_Frames() -- do the work +end diff --git a/TitanGold/TitanGold.lua b/TitanGold/TitanGold.lua index f5cdfb7..b0fe9bd 100644 --- a/TitanGold/TitanGold.lua +++ b/TitanGold/TitanGold.lua @@ -1240,4 +1240,6 @@ local function Create_Frames() end -Create_Frames() -- do the work +if TITAN_ID then -- it exists + Create_Frames() -- do the work +end diff --git a/TitanLocation/TitanLocation.lua b/TitanLocation/TitanLocation.lua index aa28cdd..735ee92 100755 --- a/TitanLocation/TitanLocation.lua +++ b/TitanLocation/TitanLocation.lua @@ -25,13 +25,6 @@ local LocationTimer = nil; -- Difference in the Blizzard frame for the world map local MapMinMaxFrame = {} -if Titan_Panel.game_ver == "Classic" -or Titan_Panel.game_ver == "Classic_Era" -then - MapMinMaxFrame = WorldMapFrame.MaximizeMinimizeFrame -else - MapMinMaxFrame = WorldMapFrame.BorderFrame.MaximizeMinimizeFrame -end -- ******************************** Functions ******************************* @@ -237,7 +230,7 @@ function TitanPanelLocationButton_OnEvent(self, event, ...) if event == "PLAYER_ENTERING_WORLD" then if not TitanGetVar(TITAN_LOCATION_ID, "ShowLocOnMiniMap") and MinimapBorderTop and MinimapBorderTop:IsShown() then - TitanPanelLocationButton_LocOnMiniMap() + TitanPanelLocationButton_LocOnMiniMap("PEW") end end @@ -372,7 +365,7 @@ function TitanPanelRightClickMenu_PrepareLocationMenu() info.text = L["TITAN_LOCATION_MENU_SHOW_LOC_ON_MINIMAP_TEXT"]; info.func = function() TitanToggleVar(TITAN_LOCATION_ID, "ShowLocOnMiniMap"); - TitanPanelLocationButton_LocOnMiniMap() + TitanPanelLocationButton_LocOnMiniMap("config") end info.checked = TitanGetVar(TITAN_LOCATION_ID, "ShowLocOnMiniMap"); info.disabled = InCombatLockdown() @@ -528,7 +521,13 @@ function TitanPanelLocationButton_ToggleCursorLocationOnMap() end end -function TitanPanelLocationButton_LocOnMiniMap() +--[[ +-- ************************************************************************** +-- NAME : TitanPanelLocationButton_LocOnMiniMap() +-- DESC : Show / hide the location above the mini map per user settings +-- ************************************************************************** +--]] +function TitanPanelLocationButton_LocOnMiniMap(reason) if TitanGetVar(TITAN_LOCATION_ID, "ShowLocOnMiniMap") then MinimapBorderTop:Show() MinimapZoneTextButton:Show() @@ -538,8 +537,13 @@ function TitanPanelLocationButton_LocOnMiniMap() MinimapZoneTextButton:Hide() MiniMapWorldMapButton:Hide() end + -- adjust MiniMap frame if needed - TitanPanel_AdjustFrames(false); + if reason == "config" then + TitanPanel_AdjustFrames(false); + else + -- 2024 Jan - Do not adjust; allow Titan to handle on PEW + end end --[[ @@ -750,6 +754,15 @@ local function Create_Frames() return -- if already created end + -- Set the version of the map to use + if Titan_Panel.game_ver == "Classic" + or Titan_Panel.game_ver == "Classic_Era" + then + MapMinMaxFrame = WorldMapFrame.MaximizeMinimizeFrame + else + MapMinMaxFrame = WorldMapFrame.BorderFrame.MaximizeMinimizeFrame + end + -- general container frame local f = CreateFrame("Frame", nil, UIParent) -- f:Hide() @@ -778,4 +791,6 @@ local function Create_Frames() end -Create_Frames() -- do the work +if TITAN_ID then -- it exists + Create_Frames() -- do the work +end diff --git a/TitanLootType/TitanLootType_Mainline.toc b/TitanLootType/TitanLootType_Mainline.toc index 4f342c9..4c82021 100644 --- a/TitanLootType/TitanLootType_Mainline.toc +++ b/TitanLootType/TitanLootType_Mainline.toc @@ -4,7 +4,7 @@ ## Notes: Adds group loot and instance difficulty information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: -## OptionalDeps: Titan, TitanClassic -## Dependencies: +## OptionalDeps: +## Dependencies: Titan ## X-Child-Of: Titan TitanLootType.lua diff --git a/TitanLootType/TitanLootType_Vanilla.toc b/TitanLootType/TitanLootType_Vanilla.toc index 7834fab..0952df1 100644 --- a/TitanLootType/TitanLootType_Vanilla.toc +++ b/TitanLootType/TitanLootType_Vanilla.toc @@ -4,7 +4,7 @@ ## Notes: Adds group loot and instance difficulty information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: TitanClassicLootTypeSaved -## OptionalDeps: Titan, TitanClassic -## Dependencies: +## OptionalDeps: +## Dependencies: TitanClassic ## X-Child-Of: TitanClassic TitanClassicLootType.xml diff --git a/TitanLootType/TitanLootType_Wrath.toc b/TitanLootType/TitanLootType_Wrath.toc index 4f12d7f..127e3cc 100644 --- a/TitanLootType/TitanLootType_Wrath.toc +++ b/TitanLootType/TitanLootType_Wrath.toc @@ -4,7 +4,7 @@ ## Notes: Adds group loot and instance difficulty information to Titan Panel ## Author: Titan Panel Development Team (http://www.titanpanel.org) ## SavedVariables: TitanClassicLootTypeSaved -## OptionalDeps: Titan, TitanClassic -## Dependencies: +## OptionalDeps: +## Dependencies: TitanClassic ## X-Child-Of: TitanClassic TitanClassicLootType.xml diff --git a/TitanPerformance/TitanPerformance.lua b/TitanPerformance/TitanPerformance.lua index ce8a8f3..be845b0 100644 --- a/TitanPerformance/TitanPerformance.lua +++ b/TitanPerformance/TitanPerformance.lua @@ -961,4 +961,6 @@ local function Create_Frames() end -Create_Frames() -- do the work +if TITAN_ID then -- it exists + Create_Frames() -- do the work +end diff --git a/TitanRepair/TitanRepair.lua b/TitanRepair/TitanRepair.lua index b91369d..f16c5fc 100644 --- a/TitanRepair/TitanRepair.lua +++ b/TitanRepair/TitanRepair.lua @@ -13,7 +13,7 @@ local TITAN_TOOLTIP = "Titan"..TITAN_REPAIR_ID.."Tooltip" local NYL = "nyl" local L = LibStub("AceLocale-3.0"):GetLocale(TITAN_ID, true) -local TitanRepair = LibStub("AceAddon-3.0"):NewAddon(TITAN_REPAIR_ID, "AceHook-3.0", "AceTimer-3.0") +local TitanRepair = {} -- for LibStub("AceAddon-3.0")... set on create frames local _G = getfenv(0); local TR = TitanRepair TR.ITEM_STATUS = {}; @@ -732,21 +732,6 @@ function TitanPanelRepairButton_OnLoad(self) }; end -StaticPopupDialogs["REPAIR_CONFIRMATION"] = { - text = L["REPAIR_LOCALE"]["confirmation"], - button1 = YES, - button2 = NO, - OnAccept = function(self) - TitanRepair_RepairItems(); - end, - OnShow = function(self) - MoneyFrame_Update(self.moneyFrame, TR.repair_total); - end, - hasMoneyFrame = 1, - timeout = 0, - hideOnEscape = 1 -}; - --[[ Titan -- ************************************************************************** -- NAME : TitanPanelRepairButton_OnEvent(self, event, a1, ...) @@ -1365,7 +1350,26 @@ local function Create_Frames() window:SetScript("OnHide", function(self, button) RepairHide(self) end) - end --- Create needed Repair plugin frames here on load rather than in XML. -Create_Frames() + StaticPopupDialogs["REPAIR_CONFIRMATION"] = { + text = L["REPAIR_LOCALE"]["confirmation"], + button1 = YES, + button2 = NO, + OnAccept = function(self) + TitanRepair_RepairItems(); + end, + OnShow = function(self) + MoneyFrame_Update(self.moneyFrame, TR.repair_total); + end, + hasMoneyFrame = 1, + timeout = 0, + hideOnEscape = 1 + }; + + +end + +if TITAN_ID then -- it exists + TitanRepair = LibStub("AceAddon-3.0"):NewAddon(TITAN_REPAIR_ID, "AceHook-3.0", "AceTimer-3.0") + Create_Frames() -- do the work +end diff --git a/TitanVolume/TitanVolume.lua b/TitanVolume/TitanVolume.lua index fc8a591..0fdbf26 100644 --- a/TitanVolume/TitanVolume.lua +++ b/TitanVolume/TitanVolume.lua @@ -615,4 +615,6 @@ local function Create_Frames() end -Create_Frames() -- do the work +if TITAN_ID then -- it exists + Create_Frames() -- do the work +end diff --git a/TitanXP/TitanXP.lua b/TitanXP/TitanXP.lua index c6848e3..1d90b15 100644 --- a/TitanXP/TitanXP.lua +++ b/TitanXP/TitanXP.lua @@ -556,4 +556,6 @@ local function Create_Frames() end -Create_Frames() -- do the work +if TITAN_ID then -- it exists + Create_Frames() -- do the work +end