From 2f47c5b7f3aff5cfb5e9eb36e951bdd9648618cd Mon Sep 17 00:00:00 2001 From: fgprodigal Date: Mon, 3 Aug 2020 09:39:31 +0800 Subject: [PATCH] Update Install --- Core/Install.lua | 56 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 42 insertions(+), 14 deletions(-) diff --git a/Core/Install.lua b/Core/Install.lua index 548decc..5edff59 100644 --- a/Core/Install.lua +++ b/Core/Install.lua @@ -310,7 +310,7 @@ function RayUI:SetupLayout(layout) self:SetMoverPosition("QuestTimerFrameMover", "TOPRIGHT", E.UIParent, "TOPRIGHT", -232, -241) self:SetMoverPosition("ReputationBarMover", "BOTTOM", E.UIParent, "BOTTOM", 0, 32) self:SetMoverPosition("SpecializationBarMover", "BOTTOM", E.UIParent, "BOTTOM", 243, 4) - self:SetMoverPosition("SquareMinimapButtonBarMover", "TOPRIGHT", _G.Minimap, "BOTTOMRIGHT", 1, -1) + self:SetMoverPosition("SquareMinimapButtonBarMover", "TOPRIGHT", _G.MinimapPanel, "BOTTOMRIGHT", 1, -1) self:SetMoverPosition("TalkingHeadFrameMover", "TOP", E.UIParent, "TOP", 0, -80) self:SetMoverPosition("TaxiButtonMover", "BOTTOM", E.UIParent, "BOTTOM", 0, 202) self:SetMoverPosition("TimeManagerFrameMover", "TOPRIGHT", E.UIParent, "TOPRIGHT", -39, -231) @@ -324,6 +324,8 @@ function RayUI:SetupLayout(layout) self:SetMoverPosition("iFilger_ItemCooldownsMover", "BOTTOM", E.UIParent, "BOTTOM", 270, 184) self:SetMoverPosition("iFilger_BuffsMover", "BOTTOM", E.UIParent, "BOTTOM", -135, 470) + self:SetMoverPosition("DTPanelMiddleDataPanelMover", "BOTTOM", E.UIParent, "BOTTOM", 0, 4) + PluginInstallStepComplete.message = self.Title..L["Layout Set"] PluginInstallStepComplete:Show() end @@ -1311,11 +1313,48 @@ function RayUI:SetupVariables(colorMode) E.db["datatexts"]["minimapPanels"] = false E.db["datatexts"]["noCombatHover"] = true E.db["datatexts"]["panelBackdrop"] = false + local exists = E.global["datatexts"]["customPanels"]["MiddleDataPanel"] and true or false + if not exists then E.global["datatexts"]["customPanels"]["MiddleDataPanel"] = E:CopyTable({}, E.global.datatexts.newPanelInfo) end + E.global["datatexts"]["customPanels"]["MiddleDataPanel"]["enable"] = true + E.global["datatexts"]["customPanels"]["MiddleDataPanel"]["border"] = true + E.global["datatexts"]["customPanels"]["MiddleDataPanel"]["tooltipYOffset"] = 4 + E.global["datatexts"]["customPanels"]["MiddleDataPanel"]["numPoints"] = 3 + E.global["datatexts"]["customPanels"]["MiddleDataPanel"]["tooltipAnchor"] = "ANCHOR_TOP" + E.global["datatexts"]["customPanels"]["MiddleDataPanel"]["frameLevel"] = 1 + E.global["datatexts"]["customPanels"]["MiddleDataPanel"]["backdrop"] = true + E.global["datatexts"]["customPanels"]["MiddleDataPanel"]["growth"] = "HORIZONTAL" + E.global["datatexts"]["customPanels"]["MiddleDataPanel"]["width"] = 355 + E.global["datatexts"]["customPanels"]["MiddleDataPanel"]["fonts"]["enable"] = false + E.global["datatexts"]["customPanels"]["MiddleDataPanel"]["fonts"]["font"] = "PT Sans Narrow" + E.global["datatexts"]["customPanels"]["MiddleDataPanel"]["fonts"]["fontSize"] = 12 + E.global["datatexts"]["customPanels"]["MiddleDataPanel"]["fonts"]["fontOutline"] = "OUTLINE" + E.global["datatexts"]["customPanels"]["MiddleDataPanel"]["frameStrata"] = "LOW" + E.global["datatexts"]["customPanels"]["MiddleDataPanel"]["name"] = "MiddleDataPanel" + E.global["datatexts"]["customPanels"]["MiddleDataPanel"]["mouseover"] = false + E.global["datatexts"]["customPanels"]["MiddleDataPanel"]["height"] = 18 + E.global["datatexts"]["customPanels"]["MiddleDataPanel"]["tooltipXOffset"] = 0 + E.global["datatexts"]["customPanels"]["MiddleDataPanel"]["visibility"] = "[petbattle] hide;show" + E.global["datatexts"]["customPanels"]["MiddleDataPanel"]["panelTransparency"] = true + E.db["datatexts"]["panels"]["MiddleDataPanel"] = E.db["datatexts"]["panels"]["MiddleDataPanel"] or {} + E.db["datatexts"]["panels"]["MiddleDataPanel"][1] = "Durability" + E.db["datatexts"]["panels"]["MiddleDataPanel"][2] = "System" + E.db["datatexts"]["panels"]["MiddleDataPanel"][3] = "MovementSpeed" + E.db["datatexts"]["panels"]["MiddleDataPanel"]["enable"] = true + if not exists then + E.DataTexts:BuildPanelFrame("MiddleDataPanel", E.global.datatexts.customPanels["MiddleDataPanel"]) + end E.db["datatexts"]["panels"]["BottomMiniPanel"] = "Time" - E.db["datatexts"]["panels"]["LeftChatDataPanel"]["middle"] = "Friends" - E.db["datatexts"]["panels"]["LeftChatDataPanel"]["right"] = "Guild" + E.db["datatexts"]["panels"]["RightChatDataPanel"][1] = "Bags" + E.db["datatexts"]["panels"]["RightChatDataPanel"][2] = "BfA Missions" + E.db["datatexts"]["panels"]["RightChatDataPanel"]["panelTransparency"] = true E.db["datatexts"]["panels"]["RightChatDataPanel"]["left"] = "Bags" E.db["datatexts"]["panels"]["RightChatDataPanel"]["middle"] = "BfA Missions" + E.db["datatexts"]["panels"]["MinimapPanel"]["panelTransparency"] = true + E.db["datatexts"]["panels"]["LeftChatDataPanel"][2] = "Combat/Arena Time" + E.db["datatexts"]["panels"]["LeftChatDataPanel"][3] = "DPS" + E.db["datatexts"]["panels"]["LeftChatDataPanel"]["panelTransparency"] = true + E.db["datatexts"]["panels"]["LeftChatDataPanel"]["right"] = "Guild" + E.db["datatexts"]["panels"]["LeftChatDataPanel"]["middle"] = "Friends" E.db["datatexts"]["panelTransparency"] = true E.db["datatexts"]["wordWrap"] = true @@ -1678,17 +1717,6 @@ function RayUI:SetupVariables(colorMode) E.db["mui"]["cooldownFlash"]["iconSize"] = 100 E.db["mui"]["cooldownFlash"]["maxAlpha"] = 0.7 E.db["mui"]["databars"]["progressbar"] = false - E.db["mui"]["datatexts"]["middle"]["backdrop"] = false - E.db["mui"]["datatexts"]["middle"]["transparent"] = false - E.db["mui"]["datatexts"]["middle"]["width"] = 355 - E.db["mui"]["datatexts"]["panels"]["ChatTab_Datatext_Panel"]["left"] = "Bags" - E.db["mui"]["datatexts"]["panels"]["ChatTab_Datatext_Panel"]["middle"] = "Durability" - E.db["mui"]["datatexts"]["panels"]["ChatTab_Datatext_Panel"]["right"] = "Gold" - E.db["mui"]["datatexts"]["panels"]["mUIMiddleDTPanel"]["left"] = "Durability" - E.db["mui"]["datatexts"]["panels"]["mUIMiddleDTPanel"]["middle"] = "System" - E.db["mui"]["datatexts"]["panels"]["mUIMiddleDTPanel"]["right"] = "MovementSpeed" - E.db["mui"]["datatexts"]["rightChatTabDatatextPanel"]["enable"] = false - E.db["mui"]["datatexts"]["threatBar"]["textSize"] = 12 E.db["mui"]["general"]["hideErrorFrame"] = false E.db["mui"]["general"]["LoginMsg"] = false E.db["mui"]["general"]["splashScreen"] = false -- GitLab