tyler.durden/powerline
1
0
Fork 0
mirror of https://github.com/powerline/powerline.git synced 2025-07-31 01:35:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use less precise algorythm for width computations under stress

Browse Source 
Makes #1047 far less bad
This commit is contained in:
ZyX 2014-09-05 08:57:54 +04:00
parent 60fb311463
commit f916fe819f
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
powerline/renderer.py
View File

@ -266,20 +266,32 @@ class Renderer(object):
for segment in chain(segments_priority, no_priority_segments): for segment in chain(segments_priority, no_priority_segments):
if segment['truncate'] is not None: if segment['truncate'] is not None:
segment['contents'] = segment['truncate'](self.pl, current_width - width, segment) segment['contents'] = segment['truncate'](self.pl, current_width - width, segment)
for segment in segments_priority:
if current_width <= width: segments_priority = iter(segments_priority)
break if current_width > width and len(segments) > 100:
segments.remove(segment) # When there are too many segments use faster, but less correct
# algorythm for width computation
diff = current_width - width
for segment in segments_priority:
segments.remove(segment)
diff -= segment['_len']
if diff <= 0:
break
current_width = self._render_length(theme, segments, divider_widths) current_width = self._render_length(theme, segments, divider_widths)
if current_width > width:
# When there are not too much use more precise, but much slower
# width computation. It also finishes computations in case
# previous variant did not free enough space.
for segment in segments_priority:
segments.remove(segment)
current_width = self._render_length(theme, segments, divider_widths)
if current_width <= width:
break
del segments_priority
# Distribute the remaining space on spacer segments # Distribute the remaining space on spacer segments
segments_spacers = [segment for segment in segments if segment['expand'] is not None] segments_spacers = [segment for segment in segments if segment['expand'] is not None]
if segments_spacers: if segments_spacers:
if not segments_priority:
# Update segment['_len'] and current_width if not already done
# (is not done in shells where there is nothing to remove
# because “priority” key is not specified)
current_width = self._render_length(theme, segments, divider_widths)
distribute_len, distribute_len_remainder = divmod(width - current_width, len(segments_spacers)) distribute_len, distribute_len_remainder = divmod(width - current_width, len(segments_spacers))
for segment in segments_spacers: for segment in segments_spacers:
segment['contents'] = ( segment['contents'] = (