StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve behaviour when a spanning column makes table want to be wider than view

This commit is contained in:
Michael Hudson-Doyle 2018-07-06 14:45:41 +12:00
parent e3e5c7f760
commit d5f136c413
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
subiquitycore/ui/table.py
View File

@ -256,6 +256,8 @@ def _compute_widths_for_size(maxcol, table_rows, colspecs, default_spacing):
{2*user_i+1: cs.rpad for user_i, cs in colspecs.items()
if cs.rpad is not None})
widths_before = widths.copy()
# Make sure columns are big enough for cells that span mutiple
# columns.
for row in table_rows:
@ -271,6 +273,11 @@ def _compute_widths_for_size(maxcol, table_rows, colspecs, default_spacing):
# If that column has a min_width, see if we need to omit any columns
# to hit that target.
if total_width > maxcol or unpacked_user_indices:
for user_i in range(colcount):
if not colspecs[user_i].can_shrink and 2*user_i in widths:
widths[2*user_i] = widths_before[2*user_i]
for user_i in range(colcount):
if colspecs[user_i].can_shrink or not colspecs[user_i].pack:
if 2*user_i in widths: