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

Resolve merge conflicts

Browse source
This commit is contained in:
Griatch 2019-06-09 11:29:37 +02:00
commit 4bcadc96a0
3 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
evennia/utils/evmenu.py
View file

@ -1006,13 +1006,13 @@ class EvMenu(object):
else:
# add a default white color to key
table.append(" |lc%s|lt|w%s|n|le%s" % (raw_key, raw_key, desc_string))
ncols = (_MAX_TEXT_WIDTH // table_width_max) # number of ncols
ncols = (_MAX_TEXT_WIDTH // table_width_max) + 1 # number of ncols
if ncols <= 0:
if ncols < 0:
# no visible option at all
return ""
ncols = ncols + 1 if ncols == 0 else ncols
# get the amount of rows needed (start with 4 rows)
nrows = 4
while nrows * ncols < nlist: