From 7762df9fa27cd625a11c4bb7825a516423666234 Mon Sep 17 00:00:00 2001 From: MilleXIV Date: Thu, 21 Jul 2016 17:44:46 -0400 Subject: [PATCH] Adding worldPing setting --- modules/system.lua | 17 +++++++++++------ settings.lua | 1 + 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/modules/system.lua b/modules/system.lua index bec0ae8..5bb94e4 100644 --- a/modules/system.lua +++ b/modules/system.lua @@ -18,11 +18,11 @@ local systemFrame = CreateFrame("Frame",nil, cfg.SXframe) systemFrame:SetPoint("RIGHT", -290,0) systemFrame:SetSize(120, 16) --------------------------------------------------------------------- - + local addoncompare = function(a, b) return a.memory > b.memory end - + local function systemBarOnEnter() if not cfg.system.showTooltip then return end GameTooltip:SetOwner(systemFrame, cfg.tooltipPos) @@ -108,7 +108,7 @@ end) pingFrame:SetScript("OnLeave", function() pingIcon:SetVertexColor(unpack(cfg.color.normal)) onHover = false - systemBarOnLeave() + systemBarOnLeave() end) pingFrame:SetScript("OnClick", function(self, button, down) @@ -152,7 +152,7 @@ end) fpsFrame:SetScript("OnLeave", function() fpsIcon:SetVertexColor(unpack(cfg.color.normal)) onHover = false - systemBarOnLeave() + systemBarOnLeave() end) fpsFrame:SetScript("OnClick", function(self, button, down) @@ -183,7 +183,12 @@ end local function updatePerformanceText() local fps = floor(GetFramerate()) local BWIn, BWOut, LCHome, LCWorld = GetNetStats() - pingText:SetText(LCHome.."ms") + local pingString = LCHome.."ms"; + if cfg.system.showWorldPing then + pingString = pingString.." "..LCWorld.."ms" + end + + pingText:SetText(pingString) pingFrame:SetSize(pingText:GetStringWidth()+18, 16) fpsText:SetText(fps.."fps") fpsFrame:SetSize(fpsText:GetStringWidth()+18, 16) @@ -220,4 +225,4 @@ if event == "MODIFIER_STATE_CHANGED" then end end end -end) \ No newline at end of file +end) diff --git a/settings.lua b/settings.lua index 07976aa..432f343 100644 --- a/settings.lua +++ b/settings.lua @@ -75,6 +75,7 @@ cfg.system = { showTooltip = true, -- SHOWS A LIST OF ADDONS AND HOW MUCH SYSTEM THEY USE addonList = 10, -- SHOW HOW MANY ADDONS TO SHOW ON HOVER addonListShift = 25, -- SHOW HOW MANY ADDONS TO SHOW ON HOVER WHILE SHIFT IS DOWN + showWorldPing = true, } cfg.gold = { -- 1.7.9.5