Kozea/WeasyPrint
1
1
Fork 0
mirror of https://github.com/Kozea/WeasyPrint.git synced 2024-10-05 08:27:22 +03:00
Code Issues Projects Releases Wiki Activity

Handle align-content

Browse Source
This commit is contained in:
Guillaume Ayoub 2018-01-12 00:12:06 +01:00
parent 0821148124
commit 91685e1422
3 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
weasyprint/css/properties.py
View File

@ -177,6 +177,7 @@ INITIAL_VALUES = {
'overflow_wrap': 'normal',
# Flexible Box Layout Module 1 (CR): https://www.w3.org/TR/css-flexbox-1/
'align_content': 'stretch',
'align_items': 'stretch',
'align_self': 'auto',
'flex_basis': 'auto',

9
weasyprint/css/validation.py
View File

@ -1416,6 +1416,15 @@ def align_self(keyword):
'auto', 'flex-start', 'flex-end', 'center', 'baseline', 'stretch')
@validator()
@single_keyword
def align_content(keyword):
"""``align-content`` property validation."""
return keyword in (
'flex-start', 'flex-end', 'center', 'space-between', 'space-around',
'stretch')
@validator(unstable=True)
@single_keyword
def image_rendering(keyword):

25
weasyprint/layout/flex.py
View File

@ -117,11 +117,12 @@ def flex_layout(context, box, max_position_y, skip_stack, containing_block,
if line:
flex_lines.append(FlexLine(line))
line = [child]
line_width = child.hypothetical_main_size
else:
line.append(child)
flex_lines.append(FlexLine(line))
line = []
line_width = 0
line_width = 0
else:
line.append(child)
if line:
@ -417,7 +418,27 @@ def flex_layout(context, box, max_position_y, skip_stack, containing_block,
# TODO: handle min-max
box.height = sum(line.height for line in flex_lines)
# TODO: Step 16
# Step 16
elif len(flex_lines) > 1:
extra_height = box.height - sum(line.height for line in flex_lines)
if extra_height > 0:
y_translate = 0
for line in flex_lines:
for child in line:
if child.is_flex_item:
child.translate(dy=y_translate)
if box.style['align_content'] == 'flex-end':
child.translate(dy=extra_height)
elif box.style['align_content'] == 'center':
child.translate(dy=extra_height / 2)
elif box.style['align_content'] == 'space-around':
child.translate(
dy=extra_height / len(flex_lines) / 2)
if box.style['align_content'] == 'space-between':
y_translate += extra_height / (len(flex_lines) - 1)
elif box.style['align_content'] == 'space-around':
y_translate += extra_height / len(flex_lines)
# TODO: what about stretch?
# TODO: don't use block_level_layout, see TODOs in Step 14 and
# build.flex_children.