From 3e49d3cc2d2cc44a1a3a35de14eb9db90f0fb319 Mon Sep 17 00:00:00 2001
From: Nicolargo <nicolas@nicolargo.com>
Date: Sun, 25 May 2014 18:51:24 +0200
Subject: [PATCH] Correct issue on PROC stats if screen < 80 pixels v2

---
 glances/outputs/glances_curses.py      |  2 ++
 glances/plugins/glances_processlist.py | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/glances/outputs/glances_curses.py b/glances/outputs/glances_curses.py
index b0ac6306..29860d0c 100644
--- a/glances/outputs/glances_curses.py
+++ b/glances/outputs/glances_curses.py
@@ -334,9 +334,11 @@ class glancesCurses:
             stats_processlist = stats.get_plugin('processlist').get_stats_display(args=self.args)
             stats_alert = stats.get_plugin('alert').get_stats_display(args=self.args)
             stats_monitor = stats.get_plugin('monitor').get_stats_display(args=self.args)
+            # Display
             self.display_plugin(stats_processcount)
             self.display_plugin(stats_monitor)
             self.display_plugin(stats_processlist,
+                                display_optional=(screen_x > 102),
                                 max_y=(screen_y - self.get_stats_display_height(stats_alert) - 2))
             self.display_plugin(stats_alert)
 
diff --git a/glances/plugins/glances_processlist.py b/glances/plugins/glances_processlist.py
index 41ed571f..9b540abc 100644
--- a/glances/plugins/glances_processlist.py
+++ b/glances/plugins/glances_processlist.py
@@ -106,13 +106,13 @@ class Plugin(GlancesPlugin):
         msg = "{0:>6}".format(_("RES"))
         ret.append(self.curse_add_line(msg, optional=True))
         msg = "{0:>6}".format(_("PID"))
-        ret.append(self.curse_add_line(msg, optional=True))
+        ret.append(self.curse_add_line(msg))
         msg = " {0:10}".format(_("USER"))
-        ret.append(self.curse_add_line(msg, optional=True))
+        ret.append(self.curse_add_line(msg))
         msg = "{0:>4}".format(_("NI"))
-        ret.append(self.curse_add_line(msg, optional=True))
+        ret.append(self.curse_add_line(msg))
         msg = "{0:>2}".format(_("S"))
-        ret.append(self.curse_add_line(msg, optional=True))
+        ret.append(self.curse_add_line(msg))
         msg = "{0:>9}".format(_("TIME+"))
         ret.append(self.curse_add_line(msg, optional=True))
         msg = "{0:>6}".format(_("IOR/s"))
@@ -144,24 +144,24 @@ class Plugin(GlancesPlugin):
             ret.append(self.curse_add_line(msg, optional=True))
             # PID
             msg = "{0:>6}".format(p['pid'])
-            ret.append(self.curse_add_line(msg, optional=True))
+            ret.append(self.curse_add_line(msg))
             # USER
             msg = " {0:9}".format(p['username'][:9])
-            ret.append(self.curse_add_line(msg, optional=True))
+            ret.append(self.curse_add_line(msg))
             # NICE
             nice = p['nice']
             msg = "{0:>5}".format(nice)
             if nice != 0:
-                ret.append(self.curse_add_line(msg, decoration='NICE', optional=True))
+                ret.append(self.curse_add_line(msg, decoration='NICE'))
             else:
-                ret.append(self.curse_add_line(msg, optional=True))
+                ret.append(self.curse_add_line(msg))
             # STATUS
             status = p['status']
             msg = "{0:>2}".format(status)
             if status == 'R':
-                ret.append(self.curse_add_line(msg, decoration='STATUS', optional=True))
+                ret.append(self.curse_add_line(msg, decoration='STATUS'))
             else:
-                ret.append(self.curse_add_line(msg, optional=True))
+                ret.append(self.curse_add_line(msg))
             # TIME+
             if tag_proc_time:
                 try: