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

Added maxwidth argument to evtable, for restricting upper width of table, but allowing it to resize if narrower.

Browse source
This commit is contained in:
Griatch 2014-02-27 00:06:39 +01:00
parent 0d071ec75f
commit 7bde8afe66
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/commands/default/comms.py
View file

@ -799,7 +799,7 @@ class CmdIRC2Chan(MuxCommand):
ircbots = [bot.typeclass for bot in PlayerDB.objects.filter(db_is_bot=True)] ircbots = [bot.typeclass for bot in PlayerDB.objects.filter(db_is_bot=True)]
if ircbots: if ircbots:
from src.utils.evtable import EvTable from src.utils.evtable import EvTable
table = EvTable("dbid", "botname", "ev-channel", "irc-channel", width=78, border_width=1) table = EvTable("{wdbid{n", "{wbotname{n", "{wev-channel{n", "{wirc-channel{n", border="cells")
for ircbot in ircbots: for ircbot in ircbots:
ircinfo = "%s (%s:%s)" % (ircbot.db.irc_channel, ircbot.db.irc_network, ircbot.db.irc_port) ircinfo = "%s (%s:%s)" % (ircbot.db.irc_channel, ircbot.db.irc_network, ircbot.db.irc_port)
table.add_row(ircbot.id, ircbot.db.irc_botname, ircbot.db.ev_channel, ircinfo) table.add_row(ircbot.id, ircbot.db.irc_botname, ircbot.db.ev_channel, ircinfo)

16
src/utils/evtable.py
View file

@ -660,6 +660,10 @@ class EvTable(object):
Adjusts collumns to have as even width as Adjusts collumns to have as even width as
possible. This often looks best also for possible. This often looks best also for
mixed-length tables. mixed-length tables.
maxwidth - This will set a maximum width of the table
while allowing it to be smaller. Only if it
grows wider than this size will it be resized.
This has no meaning if width is set.
See Cell class for further kwargs. These will be passed See Cell class for further kwargs. These will be passed
to each cell in the table. to each cell in the table.
@ -707,6 +711,9 @@ class EvTable(object):
self.width = kwargs.pop("width", None) self.width = kwargs.pop("width", None)
self.height = kwargs.pop("height", None) self.height = kwargs.pop("height", None)
self.evenwidth = kwargs.pop("evenwidth", True) self.evenwidth = kwargs.pop("evenwidth", True)
self.maxwidth = kwargs.pop("maxwidth", None)
if self.maxwidth and self.width and self.maxwidth < self.width:
raise Exception("table maxwidth < table width!")
# size in cell cols/rows # size in cell cols/rows
self.ncols = 0 self.ncols = 0
self.nrows = 0 self.nrows = 0
@ -860,20 +867,23 @@ class EvTable(object):
# equalize widths within each column # equalize widths within each column
cwidths = [max(cell.get_width() for cell in col) for col in self.worktable] cwidths = [max(cell.get_width() for cell in col) for col in self.worktable]
if self.width: if self.width or self.maxwidth and self.maxwidth < sum(cwidths):
# we set a table width. Horizontal cells will be evenly distributed and # we set a table width. Horizontal cells will be evenly distributed and
# expand vertically as needed (unless self.height is set, see below) # expand vertically as needed (unless self.height is set, see below)
# use fixed width, or set to maxwidth
width = self.width if self.width else self.maxwidth
if ncols: if ncols:
# get minimum possible cell widths for each row # get minimum possible cell widths for each row
cwidths_min = [max(cell.get_min_width() for cell in col) for col in self.worktable] cwidths_min = [max(cell.get_min_width() for cell in col) for col in self.worktable]
cwmin = sum(cwidths_min) cwmin = sum(cwidths_min)
if cwmin > self.width: if cwmin > width:
# we cannot shrink any more # we cannot shrink any more
raise Exception("Cannot shrink table width to %s. Minimum size is %s." % (self.width, cwmin)) raise Exception("Cannot shrink table width to %s. Minimum size is %s." % (self.width, cwmin))
excess = self.width - cwmin excess = width - cwmin
if self.evenwidth: if self.evenwidth:
# make each collumn of equal width # make each collumn of equal width
for i in range(excess): for i in range(excess):