From 900d0d0ea51afd26fac22213651388dfd6e4ed8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matja=C5=BE=20Depolli?= <matjaz.depolli@ijs.si>
Date: Fri, 25 Oct 2019 12:54:16 +0200
Subject: [PATCH] modded resourceusage

---
 modules/resourceusage/settings.go |  2 ++
 modules/resourceusage/widget.go   | 15 +++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/modules/resourceusage/settings.go b/modules/resourceusage/settings.go
index ad71791d..7e0ebae2 100644
--- a/modules/resourceusage/settings.go
+++ b/modules/resourceusage/settings.go
@@ -12,11 +12,13 @@ const (
 
 type Settings struct {
 	common *cfg.Common
+	cpuCombined bool
 }
 
 func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
 	settings := Settings{
 		common: cfg.NewCommonSettingsFromModule(name, defaultTitle, defaultFocusable, ymlConfig, globalConfig),
+		cpuCombined: ymlConfig.UBool("cpuCombined"),
 	}
 
 	return &settings
diff --git a/modules/resourceusage/widget.go b/modules/resourceusage/widget.go
index 84f18f4d..6990e234 100644
--- a/modules/resourceusage/widget.go
+++ b/modules/resourceusage/widget.go
@@ -44,7 +44,8 @@ func NewWidget(app *tview.Application, settings *Settings) *Widget {
 
 // MakeGraph - Load the dead drop stats
 func MakeGraph(widget *Widget) {
-	cpuStats, err := cpu.Percent(time.Duration(0), true)
+
+	cpuStats, err := cpu.Percent(time.Duration(0), !widget.settings.cpuCombined)
 	if err != nil {
 		return
 	}
@@ -56,8 +57,15 @@ func MakeGraph(widget *Widget) {
 		stat = math.Min(100, stat)
 		stat = math.Max(0, stat)
 
+		var label string
+		if (widget.settings.cpuCombined) {
+			label = "CPU"
+		} else {
+			label = fmt.Sprint(i)
+		}
+		
 		bar := view.Bar{
-			Label:      fmt.Sprint(i),
+			Label:      label,
 			Percent:    int(stat),
 			ValueLabel: fmt.Sprintf("%d%%", int(stat)),
 			LabelColor: "red",
@@ -119,9 +127,8 @@ func (widget *Widget) Refresh() {
 		return
 	}
 
-	widget.View.Clear()
-
 	widget.app.QueueUpdateDraw(func() {
+		widget.View.Clear()	
 		display(widget)
 	})
 }