Merge branch 'develop' of https://github.com/nicolargo/glances into issue1105

This commit is contained in:
nicolargo 2018-01-16 22:04:59 +01:00
commit 43aeb4f2e7
2 changed files with 7 additions and 6 deletions

View File

@ -235,8 +235,7 @@ Homebrew
.. code-block:: console
$ brew install python
$ pip install glances
$ brew install glances
MacPorts
````````

View File

@ -2,7 +2,7 @@
#
# This file is part of Glances.
#
# Copyright (C) 2017 Nicolargo <nicolas@nicolargo.com>
# Copyright (C) 2018 Nicolargo <nicolas@nicolargo.com>
#
# Glances is free software; you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
@ -527,9 +527,11 @@ class _GlancesCurses(object):
# Adapt number of processes to the available space
max_processes_displayed = (
self.screen.getmaxyx()[0] - 11 -
self.get_stats_display_height(__stat_display["alert"]) -
self.get_stats_display_height(__stat_display["docker"])
)
(0 if 'alert' not in __stat_display else
self.get_stats_display_height(__stat_display["alert"])) -
(0 if 'docker' not in __stat_display else
self.get_stats_display_height(__stat_display["docker"])))
try:
if self.args.enable_process_extended and not self.args.process_tree:
max_processes_displayed -= 4