piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Cosmetics

Browse Source
This commit is contained in:
Bertrand Songis
2019-12-09 17:28:59 +01:00
parent eb927f4be2
commit d4e7058b12
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/thirdparty/libopenui
Vendored
+1 -1
Submodule radio/src/thirdparty/libopenui updated: 88e8884155...08ebd5c62e
tools/build-font-bitmap.py
+8 -10
View File
@@ -88,28 +88,26 @@ class FontBitmap:
def generate(self, filename, generate_coords_file=True): def generate(self, filename, generate_coords_file=True):
coords = [] 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 width = 0
for c in self.chars: for c in self.chars:
coords.append(width) coords.append(width)
if c in extra_chars: if c == " ":
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 == " ":
width += 4 width += 4
elif c in special_chars["cn"]: elif c in special_chars["cn"]:
width += self.draw_char(image, width, c, self.cjk_font) 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) width += self.draw_char(image, width, c, self.font)
coords.append(width) coords.append(width)
_, top, _, bottom = self.get_real_size(image) _, 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)) image = image.crop((0, top, width, bottom))
coords.insert(0, bottom - top) coords.insert(0, bottom - top)