Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-16 21:06:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix an issue with adding an empty column to an EvTable

Browse source 
There seems to be an issue with adding an empty column (i.e. a column
with empty data) to an EvTable that has already been set up.  It seems
that the column with empty data is added with one extra row than the
rest of the table, and when a new call to add_rows() is made to EvTable,
the data in the column that was added previously is offset by 1.

This change fixes that by calculating the size of the new column to take
into account the headers BEFORE making the calculation on whether to
expand the column to match the table's size or not.
This commit is contained in:
Scyfris Talivinsky 2017-10-15 13:36:08 -07:00
parent 1f54d464a9
commit 9d10ca4f39
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
evennia/utils/evtable.py
View file

@ -1421,8 +1421,21 @@ class EvTable(object):
column = EvColumn(*args, **options)
wtable = self.ncols
htable = self.nrows
excess = len(column) - htable
header = kwargs.get("header", None)
if header:
column.add_rows(unicode(header), ypos=0, **options)
self.header = True
elif self.header:
# we have a header already. Offset
column.add_rows("", ypos=0, **options)
# Calculate whether the new column needs to expand to the
# current table size, or if the table needs to expand to
# the column size.
# This needs to happen after the header rows have already been
# added to the column in order for the size calculations to match.
excess = len(column) - htable
if excess > 0:
# we need to add new rows to table
for col in self.table:
@ -1435,13 +1448,6 @@ class EvTable(object):
column.add_rows(*empty_rows, **options)
self.nrows -= excess
header = kwargs.get("header", None)
if header:
column.add_rows(unicode(header), ypos=0, **options)
self.header = True
elif self.header:
# we have a header already. Offset
column.add_rows("", ypos=0, **options)
if xpos is None or xpos > wtable - 1:
# add to the end
self.table.append(column)