From e33d4d946086da38d7415f45dc954826864250b6 Mon Sep 17 00:00:00 2001 From: Narendran Gopalakrishnan Date: Mon, 9 Nov 2020 18:38:51 +0100 Subject: [PATCH] Include merge status with column title when enabled --- ProcessList.c | 9 +++++---- 1 file 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)"); } } }