From 1b1051050bbad7fa2b346e2a8445d2b801739db6 Mon Sep 17 00:00:00 2001 From: petrucci4prez Date: Sun, 5 Aug 2018 14:45:41 -0400 Subject: [PATCH] split arc into static and dynamic drawing --- core | 2 +- drawing/Memory.lua | 3 ++- drawing/Processor.lua | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core b/core index f9e96aa..9ff0dee 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit f9e96aa82dfc3c0772350fbe2e73f050ca38f39d +Subproject commit 9ff0deec0e7d77be7d6dd322c57889fe37d316ca diff --git a/drawing/Memory.lua b/drawing/Memory.lua index b0ef31d..3552cbb 100644 --- a/drawing/Memory.lua +++ b/drawing/Memory.lua @@ -203,6 +203,7 @@ local draw_static = function(cr) Line.draw(header.underline, cr) Arc.draw(inner_ring, cr) + Dial.draw_static(dial, cr) Text.draw(swap.label, cr) TextColumn.draw(cache.labels, cr) @@ -214,7 +215,7 @@ end local draw_dynamic = function(cr) update(cr) - Dial.draw(dial, cr) + Dial.draw_dynamic(dial, cr) Arc.draw(cache_arc, cr) CriticalText.draw(total_used, cr) diff --git a/drawing/Processor.lua b/drawing/Processor.lua index c3b4c72..c41fada 100644 --- a/drawing/Processor.lua +++ b/drawing/Processor.lua @@ -258,6 +258,7 @@ local draw_static = function(cr) for c = 1, NUM_PHYSICAL_CORES do local this_core = cores[c] Arc.draw(this_core.inner_ring, cr) + CompoundDial.draw_static(this_core.dials, cr) end Text.draw(process.label, cr) @@ -275,7 +276,7 @@ local draw_dynamic = function(cr) for c = 1, NUM_PHYSICAL_CORES do local this_core = cores[c] - CompoundDial.draw(this_core.dials, cr) + CompoundDial.draw_dynamic(this_core.dials, cr) CriticalText.draw(this_core.coretemp_text, cr) end