refactor(color): UI layout logic to better handle different screen sizes and orientations (#6134)
|
Before Width: | Height: | Size: 6.9 KiB After Width: | Height: | Size: 9.2 KiB |
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 5.8 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 862 B |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 422 B After Width: | Height: | Size: 446 B |
|
Before Width: | Height: | Size: 382 B After Width: | Height: | Size: 393 B |
|
Before Width: | Height: | Size: 455 B After Width: | Height: | Size: 476 B |
|
Before Width: | Height: | Size: 623 B After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 600 B After Width: | Height: | Size: 713 B |
|
Before Width: | Height: | Size: 671 B After Width: | Height: | Size: 784 B |
|
Before Width: | Height: | Size: 555 B After Width: | Height: | Size: 597 B |
|
Before Width: | Height: | Size: 654 B After Width: | Height: | Size: 772 B |
|
Before Width: | Height: | Size: 649 B After Width: | Height: | Size: 734 B |
|
Before Width: | Height: | Size: 618 B After Width: | Height: | Size: 645 B |
|
Before Width: | Height: | Size: 614 B After Width: | Height: | Size: 689 B |
|
Before Width: | Height: | Size: 641 B After Width: | Height: | Size: 748 B |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 568 B After Width: | Height: | Size: 626 B |
|
Before Width: | Height: | Size: 565 B After Width: | Height: | Size: 670 B |
|
Before Width: | Height: | Size: 590 B After Width: | Height: | Size: 666 B |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 655 B After Width: | Height: | Size: 764 B |
|
Before Width: | Height: | Size: 624 B After Width: | Height: | Size: 729 B |
|
Before Width: | Height: | Size: 651 B After Width: | Height: | Size: 755 B |
|
Before Width: | Height: | Size: 653 B After Width: | Height: | Size: 772 B |
|
Before Width: | Height: | Size: 547 B After Width: | Height: | Size: 585 B |
|
Before Width: | Height: | Size: 592 B After Width: | Height: | Size: 660 B |
|
Before Width: | Height: | Size: 987 B After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 7.3 KiB |
|
Before Width: | Height: | Size: 733 B After Width: | Height: | Size: 832 B |
|
Before Width: | Height: | Size: 667 B After Width: | Height: | Size: 722 B |
|
Before Width: | Height: | Size: 668 B After Width: | Height: | Size: 728 B |
|
Before Width: | Height: | Size: 671 B After Width: | Height: | Size: 734 B |
|
Before Width: | Height: | Size: 668 B After Width: | Height: | Size: 735 B |
|
Before Width: | Height: | Size: 595 B After Width: | Height: | Size: 626 B |
|
Before Width: | Height: | Size: 441 B After Width: | Height: | Size: 483 B |
|
Before Width: | Height: | Size: 441 B After Width: | Height: | Size: 483 B |
|
Before Width: | Height: | Size: 672 B After Width: | Height: | Size: 743 B |
|
Before Width: | Height: | Size: 551 B After Width: | Height: | Size: 647 B |
|
Before Width: | Height: | Size: 551 B After Width: | Height: | Size: 647 B |
|
Before Width: | Height: | Size: 551 B After Width: | Height: | Size: 623 B |
|
Before Width: | Height: | Size: 587 B After Width: | Height: | Size: 660 B |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 654 B After Width: | Height: | Size: 742 B |
|
Before Width: | Height: | Size: 602 B After Width: | Height: | Size: 691 B |
|
Before Width: | Height: | Size: 637 B After Width: | Height: | Size: 735 B |
|
Before Width: | Height: | Size: 676 B After Width: | Height: | Size: 784 B |
|
Before Width: | Height: | Size: 683 B After Width: | Height: | Size: 769 B |
|
Before Width: | Height: | Size: 612 B After Width: | Height: | Size: 714 B |
|
Before Width: | Height: | Size: 505 B After Width: | Height: | Size: 546 B |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 565 B After Width: | Height: | Size: 611 B |
|
Before Width: | Height: | Size: 554 B After Width: | Height: | Size: 612 B |
|
Before Width: | Height: | Size: 666 B After Width: | Height: | Size: 723 B |
|
Before Width: | Height: | Size: 654 B After Width: | Height: | Size: 753 B |
|
Before Width: | Height: | Size: 481 B After Width: | Height: | Size: 519 B |
|
Before Width: | Height: | Size: 485 B After Width: | Height: | Size: 555 B |
|
Before Width: | Height: | Size: 546 B After Width: | Height: | Size: 584 B |
|
Before Width: | Height: | Size: 517 B After Width: | Height: | Size: 534 B |
|
Before Width: | Height: | Size: 605 B After Width: | Height: | Size: 615 B |
|
Before Width: | Height: | Size: 785 B After Width: | Height: | Size: 863 B |
|
Before Width: | Height: | Size: 623 B After Width: | Height: | Size: 674 B |
|
Before Width: | Height: | Size: 645 B After Width: | Height: | Size: 704 B |
|
Before Width: | Height: | Size: 628 B After Width: | Height: | Size: 659 B |
|
Before Width: | Height: | Size: 644 B After Width: | Height: | Size: 702 B |
|
Before Width: | Height: | Size: 659 B After Width: | Height: | Size: 727 B |
|
Before Width: | Height: | Size: 584 B After Width: | Height: | Size: 618 B |
|
Before Width: | Height: | Size: 673 B After Width: | Height: | Size: 738 B |
|
Before Width: | Height: | Size: 479 B After Width: | Height: | Size: 506 B |
|
Before Width: | Height: | Size: 513 B After Width: | Height: | Size: 556 B |
|
Before Width: | Height: | Size: 668 B After Width: | Height: | Size: 783 B |
|
Before Width: | Height: | Size: 416 B After Width: | Height: | Size: 420 B |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 775 B After Width: | Height: | Size: 888 B |
|
Before Width: | Height: | Size: 577 B After Width: | Height: | Size: 649 B |
|
Before Width: | Height: | Size: 428 B After Width: | Height: | Size: 462 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 37 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
@@ -1,7 +1,7 @@
|
||||
/*******************************************************************************
|
||||
* Size: 24 px
|
||||
* Bpp: 1
|
||||
* Opts: --no-prefilter --bpp 1 --size 24 --no-compress --font ../Roboto/Roboto-Regular.ttf -r 0x20-0x7F --font ../../thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61671,63650,63426,61453,61787,61452,61931,62087 --format lvgl -o lrg/lv_font_bl.c --force-fast-kern-format
|
||||
* Opts: --no-prefilter --bpp 1 --size 24 --no-compress --font ../Roboto/Roboto-Regular.ttf -r 0x20-0x7F --font ../../thirdparty/lvgl/scripts/built_in_font/FontAwesome5-Solid+Brands+Regular.woff -r 61671,63650,63426,61453,61787,61452,61931,62087 --format lvgl -o lrg/lv_font_bl.c --force-fast-kern-format --no-compress
|
||||
******************************************************************************/
|
||||
|
||||
#ifdef LV_LVGL_H_INCLUDE_SIMPLE
|
||||
@@ -941,12 +941,9 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes =
|
||||
* ALL CUSTOM DATA
|
||||
*--------------------*/
|
||||
|
||||
#if LVGL_VERSION_MAJOR == 8
|
||||
#if LV_VERSION_CHECK(8, 0, 0)
|
||||
/*Store all the custom data of the font*/
|
||||
static lv_font_fmt_txt_glyph_cache_t cache;
|
||||
#endif
|
||||
|
||||
#if LVGL_VERSION_MAJOR >= 8
|
||||
static const lv_font_fmt_txt_dsc_t font_dsc = {
|
||||
#else
|
||||
static lv_font_fmt_txt_dsc_t font_dsc = {
|
||||
@@ -960,19 +957,18 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
|
||||
.bpp = 1,
|
||||
.kern_classes = 1,
|
||||
.bitmap_format = 0,
|
||||
#if LVGL_VERSION_MAJOR == 8
|
||||
#if LV_VERSION_CHECK(8, 0, 0)
|
||||
.cache = &cache
|
||||
#endif
|
||||
};
|
||||
|
||||
|
||||
|
||||
/*-----------------
|
||||
* PUBLIC FONT
|
||||
*----------------*/
|
||||
|
||||
/*Initialize a public general font descriptor*/
|
||||
#if LVGL_VERSION_MAJOR >= 8
|
||||
#if LV_VERSION_CHECK(8, 0, 0)
|
||||
const lv_font_t lv_font_bl = {
|
||||
#else
|
||||
lv_font_t lv_font_bl = {
|
||||
@@ -988,11 +984,7 @@ lv_font_t lv_font_bl = {
|
||||
.underline_position = -2,
|
||||
.underline_thickness = 1,
|
||||
#endif
|
||||
.dsc = &font_dsc, /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
|
||||
#if LV_VERSION_CHECK(8, 2, 0) || LVGL_VERSION_MAJOR >= 9
|
||||
.fallback = NULL,
|
||||
#endif
|
||||
.user_data = NULL,
|
||||
.dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */
|
||||
};
|
||||
|
||||
|
||||
|
||||