summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicolargo <nicolas@nicolargo.com>2022-08-08 11:11:46 +0200
committernicolargo <nicolas@nicolargo.com>2022-08-08 11:11:46 +0200
commit100395434d335ac80bf07f5e83dbaa1b57da7950 (patch)
tree114c27ef60e05719f945ec9d5716fd484e4d34cc
parent7c5bbe6c5acd587475e514c729129122d04aa620 (diff)
Correct display issue when screen size is too low
-rw-r--r--glances/outputs/glances_curses.py2
-rw-r--r--glances/plugins/glances_ip.py26
2 files changed, 9 insertions, 19 deletions
diff --git a/glances/outputs/glances_curses.py b/glances/outputs/glances_curses.py
index b87b00ea..1993a2ba 100644
--- a/glances/outputs/glances_curses.py
+++ b/glances/outputs/glances_curses.py
@@ -771,7 +771,7 @@ class _GlancesCurses(object):
self.space_between_column = 3
if 'ip' in stat_display:
self.new_column()
- self.display_plugin(stat_display["ip"])
+ self.display_plugin(stat_display["ip"], display_optional=(self.term_window.getmaxyx()[1] >= 100))
self.new_column()
self.display_plugin(
stat_display["uptime"], add_space=-(self.get_stats_display_width(stat_display["cloud"]) != 0)
diff --git a/glances/plugins/glances_ip.py b/glances/plugins/glances_ip.py
index 7f81535c..71320a75 100644
--- a/glances/plugins/glances_ip.py
+++ b/glances/plugins/glances_ip.py
@@ -138,16 +138,6 @@ class Plugin(GlancesPlugin):
return self.stats
- def update_views(self):
- """Update stats views."""
- # Call the father's method
- super(Plugin, self).update_views()
-
- # Add specifics information
- # Optional
- for key in iterkeys(self.stats):
- self.views[key]['optional'] = True
-
def msg_curse(self, args=None, max_width=None):
"""Return the dict to display in the curse interface."""
# Init the return message
@@ -159,18 +149,18 @@ class Plugin(GlancesPlugin):
# Build the string message
msg = ' - '
- ret.append(self.curse_add_line(msg))
+ ret.append(self.curse_add_line(msg, optional=True))
# Start with the private IP information
msg = 'IP '
- ret.append(self.curse_add_line(msg, 'TITLE'))
+ ret.append(self.curse_add_line(msg, 'TITLE', optional=True))
if 'address' in self.stats:
msg = '{}'.format(self.stats['address'])
- ret.append(self.curse_add_line(msg))
+ ret.append(self.curse_add_line(msg, optional=True))
if 'mask_cidr' in self.stats:
# VPN with no internet access (issue #842)
msg = '/{}'.format(self.stats['mask_cidr'])
- ret.append(self.curse_add_line(msg))
+ ret.append(self.curse_add_line(msg, optional=True))
# Then with the public IP information
try:
@@ -181,8 +171,8 @@ class Plugin(GlancesPlugin):
else:
if self.stats['public_address']:
msg = ' Pub '
- ret.append(self.curse_add_line(msg, 'TITLE'))
- ret.append(self.curse_add_line(msg_pub))
+ ret.append(self.curse_add_line(msg, 'TITLE', optional=True))
+ ret.append(self.curse_add_line(msg_pub, optional=True))
if 'public_info' in self.stats and self.stats['public_info']:
field_result = []
@@ -196,8 +186,8 @@ class Plugin(GlancesPlugin):
and field[1] in self.stats['public_info'][field[0]]
):
field_result.append('{}'.format(self.stats['public_info'][field[0]][field[1]]))
- ret.append(self.curse_add_line(' '))
- ret.append(self.curse_add_line('/'.join(field_result)))
+ ret.append(self.curse_add_line(' ', optional=True))
+ ret.append(self.curse_add_line('/'.join(field_result), optional=True))
return ret