diff options
| author | Narendran Gopalakrishnan <g_narendran142@yahoo.com> | 2020-11-09 18:38:51 +0100 |
|---|---|---|
| committer | BenBE <BenBE@geshi.org> | 2020-11-24 19:05:48 +0100 |
| commit | e33d4d946086da38d7415f45dc954826864250b6 (patch) | |
| tree | c71d42d938ca7f11d76b2ff207136fc85a3835b3 /ProcessList.c | |
| parent | be604196308279ca886c7420bdc9465cb89f168e (diff) | |
Include merge status with column title when enabled
Diffstat (limited to 'ProcessList.c')
| -rw-r--r-- | ProcessList.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ProcessList.c b/ProcessList.c index bf67dab8..6339546a 100644 --- a/ProcessList.c +++ b/ProcessList.c @@ -77,10 +77,11 @@ void ProcessList_printHeader(ProcessList* this, RichString* header) { field = "- "; } - if (!this->settings->treeView && this->settings->sortKey == fields[i]) { - RichString_append(header, CRT_colors[PANEL_SELECTION_FOCUS], field); - } else { - RichString_append(header, CRT_colors[PANEL_HEADER_FOCUS], field); + int color = (!this->settings->treeView && this->settings->sortKey == fields[i]) ? + CRT_colors[PANEL_SELECTION_FOCUS] : CRT_colors[PANEL_HEADER_FOCUS]; + RichString_append(header, color, field); + if (COMM == fields[i] && this->settings->showMergedCommand) { + RichString_append(header, color, "(merged)"); } } } |