diff options
| author | Max Friedrich <minacode@users.noreply.github.com> | 2022-04-19 00:40:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-19 00:40:29 +0200 |
| commit | f84a0a38972e6b6d9a537dc9de2e2c416312f882 (patch) | |
| tree | 3ce9dab83f8b6af8e9df1c8d3aa0219f5a67acbe /src/displayapp/fonts/lv_font_navi_80.c | |
| parent | a1db9fca136493eef38e536abaa660dd6ce23e57 (diff) | |
| parent | ed91b5a9981898078ad8e4cf105b5d52c7b63dfe (diff) | |
Merge branch 'develop' into remove-nm-reference
Diffstat (limited to 'src/displayapp/fonts/lv_font_navi_80.c')
| -rw-r--r-- | src/displayapp/fonts/lv_font_navi_80.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/displayapp/fonts/lv_font_navi_80.c b/src/displayapp/fonts/lv_font_navi_80.c index d5a8400e..8fd3979f 100644 --- a/src/displayapp/fonts/lv_font_navi_80.c +++ b/src/displayapp/fonts/lv_font_navi_80.c @@ -2623,7 +2623,7 @@ lv_font_t lv_font_navi_80 = { #if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) .subpx = LV_FONT_SUBPX_NONE, #endif -#if LV_VERSION_CHECK(7, 4, 0) +#if LV_VERSION_CHECK(7, 4, 0) || LVGL_VERSION_MAJOR >= 8 .underline_position = 0, .underline_thickness = 0, #endif |