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

use object-position for layout of images

Browse Source
This commit is contained in:
Manuel Barkhau 2019-06-02 16:16:51 +02:00
parent 601b20864c
commit ce8ab0f4f0
2 changed files with 46 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
weasyprint/draw.py
View File

@ -969,41 +969,12 @@ def draw_collapsed_borders(context, table, enable_hinting):
styled_color(style, color, side))
def replacedbox_layout(box):
# TODO: respect box-sizing ?
object_fit = box.style['object_fit']
if object_fit == 'fill':
draw_width, draw_height = box.width, box.height
else:
image = box.replacement
intrinsic_width, intrinsic_height = image.get_intrinsic_size(
box.style['image_resolution'], box.style['font_size'])
if object_fit == 'contain' or object_fit == 'scale-down':
draw_width, draw_height = replaced.contain_constraint_image_sizing(
box.width, box.height, box.replacement.intrinsic_ratio)
elif object_fit == 'cover':
draw_width, draw_height = replaced.cover_constraint_image_sizing(
box.width, box.height, box.replacement.intrinsic_ratio)
else:
assert object_fit == 'none', object_fit
draw_width, draw_height = intrinsic_width, intrinsic_height
if object_fit == 'scale-down':
draw_width = min(draw_width, intrinsic_width)
draw_height = min(draw_height, intrinsic_height)
box_x, box_y = box.content_box_x(), box.content_box_y()
return draw_width, draw_height, box_x, box_y
def draw_replacedbox(context, box):
"""Draw the given :class:`boxes.ReplacedBox` to a ``cairo.context``."""
if box.style['visibility'] != 'visible' or not box.width or not box.height:
return
draw_width, draw_height, draw_pos_x, draw_pos_y = replacedbox_layout(box)
draw_width, draw_height, draw_pos_x, draw_pos_y = replaced.replacedbox_layout(box)
with stacked(context):
rounded_box_path(context, box.rounded_content_box())

45
weasyprint/layout/replaced.py
View File

@ -10,6 +10,8 @@
"""
from .. import calc
def image_marker_layout(box):
"""Layout the :class:`boxes.ImageMarkerBox` ``box``.
@ -97,3 +99,46 @@ def _constraint_image_sizing(
return constraint_height * intrinsic_ratio, constraint_height
else:
return constraint_width, constraint_width / intrinsic_ratio
def replacedbox_layout(box):
# TODO: respect box-sizing ?
object_fit = box.style['object_fit']
position = box.style['object_position']
image = box.replacement
iwidth, iheight = image.get_intrinsic_size(
box.style['image_resolution'], box.style['font_size'])
if object_fit == 'fill':
draw_width, draw_height = box.width, box.height
else:
if object_fit == 'contain' or object_fit == 'scale-down':
draw_width, draw_height = contain_constraint_image_sizing(
box.width, box.height, box.replacement.intrinsic_ratio)
elif object_fit == 'cover':
draw_width, draw_height = cover_constraint_image_sizing(
box.width, box.height, box.replacement.intrinsic_ratio)
else:
assert object_fit == 'none', object_fit
draw_width, draw_height = iwidth, iheight
if object_fit == 'scale-down':
draw_width = min(draw_width, iwidth)
draw_height = min(draw_height, iheight)
origin_x, position_x, origin_y, position_y = position[0]
ref_x = box.width - draw_width
ref_y = box.height - draw_height
position_x = calc.percentage(position_x, ref_x)
position_y = calc.percentage(position_y, ref_y)
if origin_x == 'right':
position_x = ref_x - position_x
if origin_y == 'bottom':
position_y = ref_y - position_y
position_x += box.content_box_x()
position_y += box.content_box_y()
return draw_width, draw_height, position_x, position_y