1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-13 11:29:51 +03:00

Cosmetics

This commit is contained in:
Bertrand Songis 2019-12-09 17:28:35 +01:00
parent eb927f4be2
commit d4e7058b12
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
2 changed files with 9 additions and 11 deletions

View file

@ -88,28 +88,26 @@ class FontBitmap:
def generate(self, filename, generate_coords_file=True):
coords = []
image = Image.new("RGB", (len(self.chars) * self.font_size, self.font_size + 10), self.background)
image = Image.new("RGB", (len(self.chars) * self.font_size + 200, self.font_size + 20), self.background)
width = 0
for c in self.chars:
coords.append(width)
if c in extra_chars:
if self.extra_bitmap and c == extra_chars[0]:
if self.font_size == 16:
offset = 1
else:
offset = self.font_size % 2
image.paste(self.extra_bitmap.copy(), (width, offset))
elif c == " ":
if c == " ":
width += 4
elif c in special_chars["cn"]:
width += self.draw_char(image, width, c, self.cjk_font)
else:
elif c not in extra_chars:
width += self.draw_char(image, width, c, self.font)
coords.append(width)
_, top, _, bottom = self.get_real_size(image)
if self.extra_bitmap:
image.paste(self.extra_bitmap.copy(), (width, top))
width += self.extra_bitmap.width
image = image.crop((0, top, width, bottom))
coords.insert(0, bottom - top)