From caf6fc63c1fc5fa3c73e12e7a9650d79fce98522 Mon Sep 17 00:00:00 2001 From: Bradley Cicenas Date: Mon, 17 Sep 2018 01:33:52 +0000 Subject: [PATCH] add config toggle for full-row cursor --- config/switch.go | 11 ++++++++--- cwidgets/compact/main.go | 33 +++++++++++++++++++-------------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/config/switch.go b/config/switch.go index 1658669..36a8a91 100644 --- a/config/switch.go +++ b/config/switch.go @@ -5,17 +5,22 @@ var switches = []*Switch{ &Switch{ Key: "sortReversed", Val: false, - Label: "Reverse Sort Order", + Label: "Reverse sort order", }, &Switch{ Key: "allContainers", Val: true, - Label: "Show All Containers", + Label: "Show all containers", + }, + &Switch{ + Key: "fullRowCursor", + Val: true, + Label: "Highlight entire cursor row (vs. name only)", }, &Switch{ Key: "enableHeader", Val: true, - Label: "Enable Status Header", + Label: "Enable status header", }, &Switch{ Key: "scaleCpu", diff --git a/cwidgets/compact/main.go b/cwidgets/compact/main.go index 093df93..af948fc 100644 --- a/cwidgets/compact/main.go +++ b/cwidgets/compact/main.go @@ -1,6 +1,7 @@ package compact import ( + "github.com/bcicen/ctop/config" "github.com/bcicen/ctop/logging" "github.com/bcicen/ctop/models" ui "github.com/gizak/termui" @@ -153,25 +154,29 @@ func (row *Compact) all() []ui.GridBufferer { } func (row *Compact) Highlight() { - row.Bg.Highlight() row.Name.Highlight() - row.Cid.Highlight() - row.Cpu.Highlight() - row.Mem.Highlight() - row.Net.Highlight() - row.IO.Highlight() - row.Pids.Highlight() + if config.GetSwitchVal("fullRowCursor") { + row.Bg.Highlight() + row.Cid.Highlight() + row.Cpu.Highlight() + row.Mem.Highlight() + row.Net.Highlight() + row.IO.Highlight() + row.Pids.Highlight() + } } func (row *Compact) UnHighlight() { - row.Bg.UnHighlight() row.Name.UnHighlight() - row.Cid.UnHighlight() - row.Cpu.UnHighlight() - row.Mem.UnHighlight() - row.Net.UnHighlight() - row.IO.UnHighlight() - row.Pids.UnHighlight() + if config.GetSwitchVal("fullRowCursor") { + row.Bg.UnHighlight() + row.Cid.UnHighlight() + row.Cpu.UnHighlight() + row.Mem.UnHighlight() + row.Net.UnHighlight() + row.IO.UnHighlight() + row.Pids.UnHighlight() + } } type RowBg struct {