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

Fix border style

Browse Source
This commit is contained in:
Guillaume Ayoub 2020-04-19 07:52:32 +02:00
parent 98570cc095
commit 5cd62f4d31
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
weasyprint/draw.py
View File

@ -643,20 +643,19 @@ def clip_border_segment(context, style, width, side, border_box,
line_length = bbw - px1 + px2 line_length = bbw - px1 + px2
length = bbw length = bbw
context.move_to(bbx + bbw, main_offset) context.move_to(bbx + bbw, main_offset)
context.rel_line_to(-bbw, 0) context.line_to(bbx, main_offset)
context.rel_line_to(px1, py1) context.line_to(bbx + px1, main_offset + py1)
context.rel_line_to(-px1 + bbw + px2, -py1 + py2) context.line_to(bbx + bbw + px2, main_offset + py2)
elif side in ('left', 'right'): elif side in ('left', 'right'):
a1, b1 = -way * px1 - width / 2, py1 - bt / 2 a1, b1 = -way * px1 - width / 2, py1 - bt / 2
a2, b2 = -way * px2 - width / 2, -py2 - bb / 2 a2, b2 = -way * px2 - width / 2, -py2 - bb / 2
line_length = bbh - py1 + py2 line_length = bbh - py1 + py2
length = bbh length = bbh
context.move_to(main_offset, bby + bbh) context.move_to(main_offset, bby + bbh)
context.rel_line_to(0, -bbh) context.line_to(main_offset, bby)
context.rel_line_to(px1, py1) context.line_to(main_offset + px1, bby + py1)
context.rel_line_to(-px1 + px2, -py1 + bbh + py2) context.line_to(main_offset + px2, bby + bbh + py2)
# context.set_fill_rule(cairo.FILL_RULE_EVEN_ODD)
if style in ('dotted', 'dashed'): if style in ('dotted', 'dashed'):
dash = width if style == 'dotted' else 3 * width dash = width if style == 'dotted' else 3 * width
if rounded1 or rounded2: if rounded1 or rounded2:
@ -735,7 +734,8 @@ def clip_border_segment(context, style, width, side, border_box,
context.rectangle(x1, y1, x2 - x1, y2 - y1) context.rectangle(x1, y1, x2 - x1, y2 - y1)
else: else:
# 2x + 1 dashes # 2x + 1 dashes
context.clip() context.clip(even_odd=True)
context.end()
dash = length / ( dash = length / (
round(length / dash) - (round(length / dash) + 1) % 2) or 1 round(length / dash) - (round(length / dash) + 1) % 2) or 1
for i in range(0, int(round(length / dash)), 2): for i in range(0, int(round(length / dash)), 2):
@ -751,7 +751,8 @@ def clip_border_segment(context, style, width, side, border_box,
elif side == 'left': elif side == 'left':
context.rectangle( context.rectangle(
bbx, bby + i * dash, width, dash) bbx, bby + i * dash, width, dash)
context.clip() context.clip(even_odd=True)
context.end()
def draw_rounded_border(context, box, style, color): def draw_rounded_border(context, box, style, color):