mirror of
https://github.com/InfiniTimeOrg/InfiniTime.git
synced 2024-10-22 23:21:53 +02:00
Merge 2b601a2303
into 3a0d673df4
This commit is contained in:
commit
6c21331112
|
@ -18,8 +18,10 @@ class Source(object):
|
||||||
self.symbols = d.get('symbols')
|
self.symbols = d.get('symbols')
|
||||||
|
|
||||||
|
|
||||||
def gen_lvconv_line(lv_font_conv: str, dest: str, size: int, bpp: int, sources: typing.List[Source], compress:bool=False):
|
def gen_lvconv_line(lv_font_conv: str, dest: str, size: int, bpp: int, sources: typing.List[Source], compress:bool=False, subpixel:bool=False):
|
||||||
args = [lv_font_conv, '--size', str(size), '--output', dest, '--bpp', str(bpp), '--format', 'lvgl']
|
args = [lv_font_conv, '--size', str(size), '--output', dest, '--bpp', str(bpp), '--format', 'lvgl']
|
||||||
|
if subpixel:
|
||||||
|
args.append('--lcd')
|
||||||
if not compress:
|
if not compress:
|
||||||
args.append('--no-compress')
|
args.append('--no-compress')
|
||||||
for source in sources:
|
for source in sources:
|
||||||
|
|
|
@ -432,7 +432,7 @@ typedef void* lv_indev_drv_user_data_t; /*Type of user data in the in
|
||||||
#define LV_USE_FONT_COMPRESSED 1
|
#define LV_USE_FONT_COMPRESSED 1
|
||||||
|
|
||||||
/* Enable subpixel rendering */
|
/* Enable subpixel rendering */
|
||||||
#define LV_USE_FONT_SUBPX 0
|
#define LV_USE_FONT_SUBPX 1
|
||||||
#if LV_USE_FONT_SUBPX
|
#if LV_USE_FONT_SUBPX
|
||||||
/* Set the pixel order of the display.
|
/* Set the pixel order of the display.
|
||||||
* Important only if "subpx fonts" are used.
|
* Important only if "subpx fonts" are used.
|
||||||
|
|
|
@ -18,11 +18,13 @@ class Source(object):
|
||||||
self.symbols = d.get('symbols')
|
self.symbols = d.get('symbols')
|
||||||
|
|
||||||
|
|
||||||
def gen_lvconv_line(lv_font_conv: str, dest: str, size: int, bpp: int, format: str, sources: typing.List[Source], compress:bool=False):
|
def gen_lvconv_line(lv_font_conv: str, dest: str, size: int, bpp: int, format: str, sources: typing.List[Source], compress:bool=False, subpixel: bool=False):
|
||||||
if format != "lvgl" and format != "bin":
|
if format != "lvgl" and format != "bin":
|
||||||
format = "bin" if dest.lower().endswith(".bin") else "lvgl"
|
format = "bin" if dest.lower().endswith(".bin") else "lvgl"
|
||||||
|
|
||||||
args = [lv_font_conv, '--size', str(size), '--output', dest, '--bpp', str(bpp), '--format', format]
|
args = [lv_font_conv, '--size', str(size), '--output', dest, '--bpp', str(bpp), '--format', format]
|
||||||
|
if subpixel:
|
||||||
|
args.append('--lcd')
|
||||||
if not compress:
|
if not compress:
|
||||||
args.append('--no-compress')
|
args.append('--no-compress')
|
||||||
for source in sources:
|
for source in sources:
|
||||||
|
|
Loading…
Reference in a new issue