Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug in EvTable for alternating row lengths. Resolve #2653

Browse source
This commit is contained in:
Griatch 2022-09-24 22:57:54 +02:00
parent 79d16b9ead
commit b4042641b1
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
evennia/utils/evtable.py
View file

@ -114,11 +114,13 @@ appear on both sides of the table string.
""" """
from django.conf import settings from copy import copy, deepcopy
from textwrap import TextWrapper from textwrap import TextWrapper
from copy import deepcopy, copy
from evennia.utils.utils import is_iter, display_len as d_len from django.conf import settings
from evennia.utils.ansi import ANSIString from evennia.utils.ansi import ANSIString
from evennia.utils.utils import display_len as d_len
from evennia.utils.utils import is_iter
_DEFAULT_WIDTH = settings.CLIENT_DEFAULT_WIDTH _DEFAULT_WIDTH = settings.CLIENT_DEFAULT_WIDTH
@ -1028,7 +1030,7 @@ class EvColumn(object):
self.column[index].reformat(**kwargs) self.column[index].reformat(**kwargs)
def __repr__(self): def __repr__(self):
return "<EvColumn\n %s>" % ("\n ".join([repr(cell) for cell in self.column])) return "<EvColumn\n %s>" % "\n ".join([repr(cell) for cell in self.column])
def __len__(self): def __len__(self):
return len(self.column) return len(self.column)
@ -1627,15 +1629,16 @@ class EvTable(object):
htable = self.nrows htable = self.nrows
excess = len(row) - wtable excess = len(row) - wtable
print(" len(row):", len(row), "wtable:", wtable, "excess:", excess)
if excess > 0: if excess > 0:
# we need to add new empty columns to table # we need to add new empty columns to table
empty_rows = ["" for _ in range(htable)] empty_rows = ["" for _ in range(htable)]
self.table.extend([EvColumn(*empty_rows, **options) for _ in range(excess)]) self.table.extend([EvColumn(*empty_rows, **options) for _ in range(excess)])
self.ncols += excess
elif excess < 0: elif excess < 0:
# we need to add more cells to row # we need to add more cells to row
row.extend(["" for _ in range(abs(excess))]) row.extend(["" for _ in range(abs(excess))])
self.ncols -= excess self.ncols = len(self.table)
if ypos is None or ypos > htable - 1: if ypos is None or ypos > htable - 1:
# add new row to the end # add new row to the end