From a863ff77dba20bb4880cb0235c994c74dd46cd60 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sat, 11 Apr 2020 11:37:30 +0200 Subject: [PATCH] Further fixes to format_grid --- evennia/utils/utils.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/evennia/utils/utils.py b/evennia/utils/utils.py index fc407ea90d..cba9423cd0 100644 --- a/evennia/utils/utils.py +++ b/evennia/utils/utils.py @@ -1746,18 +1746,13 @@ def format_grid(elements, width=78, sep=" "): wl = wls[ie] lrow = len(row) debug = row.replace(" ", ".") - # from evennia import set_trace;set_trace() - if ie >= nelements - 1: - # last element in list - make sure to add it - if lrow + wl > width: - # last slot extends outside grid, move to next line - row += " " * (width - lrow) - rows.append(row) - row = crop(element, width) - else: - row += crop(element, width) - row += " " * max(0, (width - len(row))) + + if lrow + wl > width: + # last slot extends outside grid, move to next line + row += " " * (width - lrow) rows.append(row) + row = crop(element, width) + ic = 0 elif ic >= aver_per_row - 1: # last slot on the line if ic == 0: @@ -1796,6 +1791,10 @@ def format_grid(elements, width=78, sep=" "): row += element + " " * max(0, averlen - wl) ic += 1 + if ie >= nelements - 1: + # last element, make sure to store + rows.append(row) + return "\n".join(rows)