dece/Bebop
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

rendering: fix vspace issue with link/lists

Browse source
This commit is contained in:
dece 2021-03-08 23:42:18 +01:00
parent 84221a7816
commit 398f526b82
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
bebop/rendering.py
View file

@ -46,9 +46,12 @@ def format_elements(elements, width):
context = {"last_link_id": 0, "width": width} context = {"last_link_id": 0, "width": width}
separator = ({"type": LineType.NONE}, "") separator = ({"type": LineType.NONE}, "")
has_margins = False has_margins = False
thin_type = None
for index, element in enumerate(elements): for index, element in enumerate(elements):
previous_had_margins = has_margins previous_had_margins = has_margins
last_thin_type = thin_type
has_margins = False has_margins = False
thin_type = None
if isinstance(element, Title): if isinstance(element, Title):
element_metalines = format_title(element, context) element_metalines = format_title(element, context)
has_margins = True has_margins = True
@ -57,6 +60,7 @@ def format_elements(elements, width):
has_margins = True has_margins = True
elif isinstance(element, Link): elif isinstance(element, Link):
element_metalines = format_link(element, context) element_metalines = format_link(element, context)
thin_type = LineType.LINK
elif isinstance(element, Preformatted): elif isinstance(element, Preformatted):
element_metalines = format_preformatted(element, context) element_metalines = format_preformatted(element, context)
has_margins = True has_margins = True
@ -65,17 +69,21 @@ def format_elements(elements, width):
has_margins = True has_margins = True
elif isinstance(element, ListItem): elif isinstance(element, ListItem):
element_metalines = format_list_item(element, context) element_metalines = format_list_item(element, context)
thin_type = LineType.LIST_ITEM
else: else:
continue continue
# If current element requires margins and is not the first elements, # If current element requires margins and is not the first elements,
# separate from previous element. Also do it if the current element does # separate from previous element. Also do it if the current element does
# not require margins but follows an element that required it (e.g. link # not require margins but follows an element that required it (e.g. link
# after a paragraph). # after a paragraph). Also do it if both the current and previous
# elements do not require margins but differ in type.
if ( if (
(has_margins and index > 0) (has_margins and index > 0)
or (not has_margins and previous_had_margins) or (not has_margins and previous_had_margins)
or (not has_margins and thin_type != last_thin_type)
): ):
metalines.append(separator) metalines.append(separator)
# Append the element metalines now.
metalines += element_metalines metalines += element_metalines
return metalines return metalines
@ -240,7 +248,7 @@ def render_line(metaline, window, max_width):
line = line[:max_width - 1] line = line[:max_width - 1]
window.addstr(line, attributes) window.addstr(line, attributes)
if meta["type"] == LineType.LINK and "url" in meta: if meta["type"] == LineType.LINK and "url" in meta:
url_text = f' - {meta["url"]}' url_text = f' {meta["url"]}'
attributes = ( attributes = (
curses.color_pair(ColorPair.LINK_PREVIEW) curses.color_pair(ColorPair.LINK_PREVIEW)
| curses.A_DIM | curses.A_DIM