diff --git a/ElvUI/Locales/enUS.lua b/ElvUI/Locales/enUS.lua index 3767dbf..ae974bb 100644 --- a/ElvUI/Locales/enUS.lua +++ b/ElvUI/Locales/enUS.lua @@ -9,6 +9,9 @@ L["%s is attempting to share the profile %s with you. Would you like to accept t L["%s: %s tried to call the protected function '%s'."] = true L["(Hold Shift) Memory Usage"] = true L["(Modifer Click) Collect Garbage"] = true +L["Automatic Client Garbage Collector is currently active"] = true +L["This prevents reporting addon memory usage"] = true +L["To change behavior use /cvar allowAddonMemoryUsage 1"] = true L["A raid marker feature is available by pressing Escape -> Keybinds scroll to the bottom under ElvUI and setting a keybind for the raid marker."] = true L["A setting you have changed will change an option for this character only. This setting that you have changed will be uneffected by changing user profiles. Changing this setting requires that you reload your User Interface."] = true L["ABOVE_THREAT_FORMAT"] = "%s: %.0f%% [%.0f%% above |cff%02x%02x%02x%s|r]" diff --git a/ElvUI/Modules/DataTexts/System.lua b/ElvUI/Modules/DataTexts/System.lua index ab2fefa..548959c 100644 --- a/ElvUI/Modules/DataTexts/System.lua +++ b/ElvUI/Modules/DataTexts/System.lua @@ -164,38 +164,45 @@ local function OnEnter(self) local _, _, homeLatency = GetNetStats() DT.tooltip:AddDoubleLine(L["Home Latency:"], format(homeLatencyString, homeLatency), 0.69, 0.31, 0.31, 0.84, 0.75, 0.65) - DT.tooltip:AddDoubleLine(L["Total Memory:"], formatMem(totalMemory), 0.69, 0.31, 0.31, 0.84, 0.75, 0.65) + if C_CVar.GetBool("allowAddonMemoryUsage") then + DT.tooltip:AddDoubleLine(L["Total Memory:"], formatMem(totalMemory), 0.69, 0.31, 0.31, 0.84, 0.75, 0.65) - local totalCPU - if cpuProfiling then - totalCPU = UpdateCPU() - DT.tooltip:AddDoubleLine(L["Total CPU:"], format(homeLatencyString, totalCPU), 0.69, 0.31, 0.31, 0.84, 0.75, 0.65) - end - - DT.tooltip:AddLine(" ") - - local addon, red, green - - if IsShiftKeyDown() or not cpuProfiling then - for i = 1, #memoryTable do - addon = memoryTable[i] - red = addon[3] / totalMemory - green = 1 - red - DT.tooltip:AddDoubleLine(addon[2], formatMem(addon[3]), 1, 1, 1, red, green + .5, 0) - end - else - for i = 1, #cpuTable do - addon = cpuTable[i] - red = addon[3] / totalCPU - green = 1 - red - DT.tooltip:AddDoubleLine(addon[2], format(homeLatencyString, addon[3]), 1, 1, 1, red, green + .5, 0) + local totalCPU + if cpuProfiling then + totalCPU = UpdateCPU() + DT.tooltip:AddDoubleLine(L["Total CPU:"], format(homeLatencyString, totalCPU), 0.69, 0.31, 0.31, 0.84, 0.75, 0.65) end DT.tooltip:AddLine(" ") - DT.tooltip:AddLine(L["(Hold Shift) Memory Usage"]) - end - DT.tooltip:AddLine(L["(Modifer Click) Collect Garbage"]) + local addon, red, green + + if IsShiftKeyDown() or not cpuProfiling then + for i = 1, #memoryTable do + addon = memoryTable[i] + red = addon[3] / totalMemory + green = 1 - red + DT.tooltip:AddDoubleLine(addon[2], formatMem(addon[3]), 1, 1, 1, red, green + .5, 0) + end + else + for i = 1, #cpuTable do + addon = cpuTable[i] + red = addon[3] / totalCPU + green = 1 - red + DT.tooltip:AddDoubleLine(addon[2], format(homeLatencyString, addon[3]), 1, 1, 1, red, green + .5, 0) + end + + DT.tooltip:AddLine(" ") + DT.tooltip:AddLine(L["(Hold Shift) Memory Usage"]) + end + + DT.tooltip:AddLine(L["(Modifer Click) Collect Garbage"]) + else + DT.tooltip:AddLine(" ") + DT.tooltip:AddLine(L["Automatic Client Garbage Collector is currently active"]) + DT.tooltip:AddLine(L["This prevents reporting addon memory usage"]) + DT.tooltip:AddLine(L["To change behavior use /cvar allowAddonMemoryUsage 1"]) + end DT.tooltip:Show() enteredFrame = true end