python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-09-21 03:18:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Allowed textsize method to pass on multiline_textsize method specific arguments

Browse Source
This commit is contained in:
Andrew Murray 2016-01-06 17:13:16 +11:00
parent 89e3758fb8
commit a653afb10d
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PIL/ImageDraw.py
View File

@ -288,9 +288,9 @@ class ImageDraw(object):
## ##
# Get the size of a given string, in pixels. # Get the size of a given string, in pixels.
def textsize(self, text, font=None): def textsize(self, text, font=None, *args, **kwargs):
if self._multiline_check(text): if self._multiline_check(text):
return self.multiline_textsize(text, font) return self.multiline_textsize(text, font, *args, **kwargs)
if font is None: if font is None:
font = self.getfont() font = self.getfont()

12
Tests/test_imagefont.py
View File

@ -121,6 +121,7 @@ try:
size = draw.textsize(txt, ttf) size = draw.textsize(txt, ttf)
draw.text((10, 10), txt, font=ttf) draw.text((10, 10), txt, font=ttf)
draw.rectangle((10, 10, 10 + size[0], 10 + size[1])) draw.rectangle((10, 10, 10 + size[0], 10 + size[1]))
del draw
target = 'Tests/images/rectangle_surrounding_text.png' target = 'Tests/images/rectangle_surrounding_text.png'
target_img = Image.open(target) target_img = Image.open(target)
@ -199,6 +200,12 @@ try:
self.assertEqual(draw.textsize(TEST_TEXT, font=ttf), self.assertEqual(draw.textsize(TEST_TEXT, font=ttf),
draw.multiline_textsize(TEST_TEXT, font=ttf)) draw.multiline_textsize(TEST_TEXT, font=ttf))
# Test that textsize() can pass on additional arguments
# to multiline_textsize()
draw.textsize(TEST_TEXT, font=ttf, spacing=4)
draw.textsize(TEST_TEXT, ttf, 4)
del draw
def test_multiline_width(self): def test_multiline_width(self):
ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE) ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
im = Image.new(mode='RGB', size=(300, 100)) im = Image.new(mode='RGB', size=(300, 100))
@ -207,6 +214,7 @@ try:
self.assertEqual(draw.textsize("longest line", font=ttf)[0], self.assertEqual(draw.textsize("longest line", font=ttf)[0],
draw.multiline_textsize("longest line\nline", draw.multiline_textsize("longest line\nline",
font=ttf)[0]) font=ttf)[0])
del draw
def test_multiline_spacing(self): def test_multiline_spacing(self):
ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE) ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
@ -214,6 +222,7 @@ try:
im = Image.new(mode='RGB', size=(300, 100)) im = Image.new(mode='RGB', size=(300, 100))
draw = ImageDraw.Draw(im) draw = ImageDraw.Draw(im)
draw.multiline_text((0, 0), TEST_TEXT, font=ttf, spacing=10) draw.multiline_text((0, 0), TEST_TEXT, font=ttf, spacing=10)
del draw
target = 'Tests/images/multiline_text_spacing.png' target = 'Tests/images/multiline_text_spacing.png'
target_img = Image.open(target) target_img = Image.open(target)
@ -237,6 +246,7 @@ try:
# Rotated font # Rotated font
draw.font = transposed_font draw.font = transposed_font
box_size_b = draw.textsize(word) box_size_b = draw.textsize(word)
del draw
# Check (w,h) of box a is (h,w) of box b # Check (w,h) of box a is (h,w) of box b
self.assertEqual(box_size_a[0], box_size_b[1]) self.assertEqual(box_size_a[0], box_size_b[1])
@ -259,6 +269,7 @@ try:
# Rotated font # Rotated font
draw.font = transposed_font draw.font = transposed_font
box_size_b = draw.textsize(word) box_size_b = draw.textsize(word)
del draw
# Check boxes a and b are same size # Check boxes a and b are same size
self.assertEqual(box_size_a, box_size_b) self.assertEqual(box_size_a, box_size_b)
@ -354,6 +365,7 @@ try:
# Act # Act
default_font = ImageFont.load_default() default_font = ImageFont.load_default()
draw.text((10, 10), txt, font=default_font) draw.text((10, 10), txt, font=default_font)
del draw
# Assert # Assert
self.assert_image_equal(im, target_img) self.assert_image_equal(im, target_img)