commit e33d4d946086da38d7415f45dc954826864250b6
author Narendran Gopalakrishnan <g_narendran142@yahoo.com> Mon Nov 09 18:38:51 2020 +0100
committer BenBE <BenBE@geshi.org> Tue Nov 24 19:05:48 2020 +0100
tree c71d42d938ca7f11d76b2ff207136fc85a3835b3
parent be604196308279ca886c7420bdc9465cb89f168e

Include merge status with column title when enabled

ProcessList.c

diff --git a/ProcessList.c b/ProcessList.c
index bf67dab..6339546 100644
--- a/ProcessList.c
+++ b/ProcessList.c
@@ -77,10 +77,11 @@
          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)");
       }
    }
 }