python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-08-21 04:34:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix multiline text line height calculation

Browse Source
This commit is contained in:
FeeeeK 2021-10-09 00:05:03 +03:00
parent 2d7c487cf8
commit b388329f92
No known key found for this signature in database
GPG Key ID: 65E637682349DD13
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/PIL/ImageDraw.py
View File

@ -489,24 +489,23 @@ class ImageDraw:
raise ValueError("anchor not supported for multiline text") raise ValueError("anchor not supported for multiline text")
widths = [] widths = []
heighs = []
max_width = 0 max_width = 0
lines = self._multiline_split(text) lines = self._multiline_split(text)
line_spacing = (
self.textsize("A", font=font, stroke_width=stroke_width)[1] + spacing
)
for line in lines: for line in lines:
line_width = self.textlength( line_width, line_height = self.textsize(
line, font, direction=direction, features=features, language=language line, font, direction=direction, features=features, language=language
) )
widths.append(line_width) widths.append(line_width)
heighs.append(line_height + spacing)
max_width = max(max_width, line_width) max_width = max(max_width, line_width)
top = xy[1] top = xy[1]
if anchor[1] == "m": if anchor[1] == "m":
top -= (len(lines) - 1) * line_spacing / 2.0 top -= sum(heighs) / 2.0
elif anchor[1] == "d": elif anchor[1] == "d":
top -= (len(lines) - 1) * line_spacing top -= sum(heighs)
for idx, line in enumerate(lines): for idx, line in enumerate(lines):
left = xy[0] left = xy[0]
width_difference = max_width - widths[idx] width_difference = max_width - widths[idx]
@ -540,7 +539,7 @@ class ImageDraw:
stroke_fill=stroke_fill, stroke_fill=stroke_fill,
embedded_color=embedded_color, embedded_color=embedded_color,
) )
top += line_spacing top += heighs[idx]
def textsize( def textsize(
self, self,
@ -573,16 +572,16 @@ class ImageDraw:
stroke_width=0, stroke_width=0,
): ):
max_width = 0 max_width = 0
all_height = 0
lines = self._multiline_split(text) lines = self._multiline_split(text)
line_spacing = (
self.textsize("A", font=font, stroke_width=stroke_width)[1] + spacing
)
for line in lines: for line in lines:
line_width, line_height = self.textsize( line_width, line_height = self.textsize(
line, font, spacing, direction, features, language, stroke_width line, font, spacing, direction, features, language, stroke_width
) )
max_width = max(max_width, line_width) max_width = max(max_width, line_width)
return max_width, len(lines) * line_spacing - spacing all_height += line_height + spacing
return max_width, all_height - spacing
def textlength( def textlength(
self, self,
@ -680,13 +679,11 @@ class ImageDraw:
raise ValueError("anchor not supported for multiline text") raise ValueError("anchor not supported for multiline text")
widths = [] widths = []
heighs = []
max_width = 0 max_width = 0
lines = self._multiline_split(text) lines = self._multiline_split(text)
line_spacing = (
self.textsize("A", font=font, stroke_width=stroke_width)[1] + spacing
)
for line in lines: for line in lines:
line_width = self.textlength( line_width, line_height = self.textsize(
line, line,
font, font,
direction=direction, direction=direction,
@ -695,13 +692,14 @@ class ImageDraw:
embedded_color=embedded_color, embedded_color=embedded_color,
) )
widths.append(line_width) widths.append(line_width)
heighs.append(line_height + spacing)
max_width = max(max_width, line_width) max_width = max(max_width, line_width)
top = xy[1] top = xy[1]
if anchor[1] == "m": if anchor[1] == "m":
top -= (len(lines) - 1) * line_spacing / 2.0 top -= sum(heighs) / 2.0
elif anchor[1] == "d": elif anchor[1] == "d":
top -= (len(lines) - 1) * line_spacing top -= sum(heighs)
bbox = None bbox = None
@ -746,7 +744,7 @@ class ImageDraw:
max(bbox[3], bbox_line[3]), max(bbox[3], bbox_line[3]),
) )
top += line_spacing top += heighs[idx]
if bbox is None: if bbox is None:
return xy[0], xy[1], xy[0], xy[1] return xy[0], xy[1], xy[0], xy[1]

5
src/PIL/ImageFont.py
View File

@ -485,15 +485,16 @@ class FreeTypeFont:
:return: (width, height) :return: (width, height)
""" """
max_width = 0 max_width = 0
all_height = 0
lines = self._multiline_split(text) lines = self._multiline_split(text)
line_spacing = self.getsize("A", stroke_width=stroke_width)[1] + spacing
for line in lines: for line in lines:
line_width, line_height = self.getsize( line_width, line_height = self.getsize(
line, direction, features, language, stroke_width line, direction, features, language, stroke_width
) )
max_width = max(max_width, line_width) max_width = max(max_width, line_width)
all_height += line_height + spacing
return max_width, len(lines) * line_spacing - spacing return max_width, all_height - spacing
def getoffset(self, text): def getoffset(self, text):
""" """