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

Removed kwarg, now have align check for whether there's only a single whitespace.

Browse source
This commit is contained in:
Tehom 2016-10-21 05:12:17 -04:00
parent 5f5ffe4324
commit 242fb0e747
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
evennia/utils/evtable.py
View file

@ -427,7 +427,6 @@ class EvCell(object):
# alignments # alignments
self.align = kwargs.get("align", "l") self.align = kwargs.get("align", "l")
self.valign = kwargs.get("valign", "c") self.valign = kwargs.get("valign", "c")
self.justify = kwargs.get("justify", False)
#self.data = self._split_lines(unicode(data)) #self.data = self._split_lines(unicode(data))
self.data = self._split_lines(_to_ansi(data)) self.data = self._split_lines(_to_ansi(data))
@ -561,7 +560,9 @@ class EvCell(object):
def _align(self, data): def _align(self, data):
""" """
Align list of rows of cell. Align list of rows of cell. Whitespace characters will be stripped
if there is only one whitespace character - otherwise, it's assumed
the caller may be trying some manual formatting in the text.
Args: Args:
data (str): Text to align. data (str): Text to align.
@ -574,9 +575,9 @@ class EvCell(object):
hfill_char = self.hfill_char hfill_char = self.hfill_char
width = self.width width = self.width
if align == "l": if align == "l":
return [(line.lstrip() if self.justify else line) + hfill_char * (width - m_len(line)) for line in data] return [(line.lstrip() if line.startswith(" ") and not line.startswith(" ") else line) + hfill_char * (width - m_len(line)) for line in data]
elif align == "r": elif align == "r":
return [hfill_char * (width - m_len(line)) + (line.rstrip() if self.justify else line) for line in data] return [hfill_char * (width - m_len(line)) + (line.rstrip() if line.endswith(" ") and not line.endswith(" ") else line) for line in data]
else: # center, 'c' else: # center, 'c'
return [self._center(line, self.width, self.hfill_char) for line in data] return [self._center(line, self.width, self.hfill_char) for line in data]